lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

KVM: SVM: move svm_hardware_disable() code to asm/virtext.h

Browse Source 
Create cpu_svm_disable() function.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
This commit is contained in:
Eduardo Habkost
2008-11-17 19:03:21 -02:00
committed by Avi Kivity
parent 63d1142f8f
commit 2c8dceebb2
2 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
arch/x86/include/asm/virtext.h
View File

@@ -107,4 +107,18 @@ static inline int cpu_has_svm(const char **msg)
return 1; return 1;
} }
/** Disable SVM on the current CPU
*
* You should call this only if cpu_has_svm() returned true.
*/
static inline void cpu_svm_disable(void)
{
uint64_t efer;
wrmsrl(MSR_VM_HSAVE_PA, 0);
rdmsrl(MSR_EFER, efer);
wrmsrl(MSR_EFER, efer & ~MSR_EFER_SVME_MASK);
}
#endif /* _ASM_X86_VIRTEX_H */ #endif /* _ASM_X86_VIRTEX_H */

6
arch/x86/kvm/svm.c
View File

@@ -259,11 +259,7 @@ static int has_svm(void)
static void svm_hardware_disable(void *garbage) static void svm_hardware_disable(void *garbage)
{ {
uint64_t efer; cpu_svm_disable();
wrmsrl(MSR_VM_HSAVE_PA, 0);
rdmsrl(MSR_EFER, efer);
wrmsrl(MSR_EFER, efer & ~MSR_EFER_SVME_MASK);
} }
static void svm_hardware_enable(void *garbage) static void svm_hardware_enable(void *garbage)