diff options
| author | Eduardo Habkost <ehabkost@redhat.com> | 2008-11-17 19:03:21 -0200 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2008-12-31 16:52:30 +0200 |
| commit | 2c8dceebb238680d5577500f8283397d41ca5590 (patch) | |
| tree | 5b96cfa8c5f89a79e0da1e8be91d5eb1a9b51fa4 | |
| parent | 63d1142f8f69e39468bc6079ab2239e902828134 (diff) | |
KVM: SVM: move svm_hardware_disable() code to asm/virtext.h
Create cpu_svm_disable() function.
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
| -rw-r--r-- | arch/x86/include/asm/virtext.h | 14 | ||||
| -rw-r--r-- | arch/x86/kvm/svm.c | 6 |
2 files changed, 15 insertions, 5 deletions
diff --git a/arch/x86/include/asm/virtext.h b/arch/x86/include/asm/virtext.h index 6f0d409c368..2cfe363729c 100644 --- a/arch/x86/include/asm/virtext.h +++ b/arch/x86/include/asm/virtext.h @@ -107,4 +107,18 @@ static inline int cpu_has_svm(const char **msg) 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 */ diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c index 0667c6d13d3..1452851ae25 100644 --- a/arch/x86/kvm/svm.c +++ b/arch/x86/kvm/svm.c @@ -259,11 +259,7 @@ static int has_svm(void) static void svm_hardware_disable(void *garbage) { - uint64_t efer; - - wrmsrl(MSR_VM_HSAVE_PA, 0); - rdmsrl(MSR_EFER, efer); - wrmsrl(MSR_EFER, efer & ~MSR_EFER_SVME_MASK); + cpu_svm_disable(); } static void svm_hardware_enable(void *garbage) |