diff options
| author | Eduardo Habkost <ehabkost@redhat.com> | 2008-11-17 19:03:17 -0200 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2008-12-31 16:52:29 +0200 |
| commit | 1e9931146c748420343aeefadb3bb17bd1c14a37 (patch) | |
| tree | 79fbd36489a004694c8bed03458808d1d3851c29 | |
| parent | 6210e37b122583643da335c0389f74098713e5ca (diff) | |
| download | op-kernel-dev-1e9931146c748420343aeefadb3bb17bd1c14a37.zip op-kernel-dev-1e9931146c748420343aeefadb3bb17bd1c14a37.tar.gz | |
x86: asm/virtext.h: add cpu_vmxoff() inline function
Unfortunately we can't use exactly the same code from vmx
hardware_disable(), because the KVM function uses the
__kvm_handle_fault_on_reboot() tricks.
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 | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/arch/x86/include/asm/virtext.h b/arch/x86/include/asm/virtext.h index 298b6a0..7dee5b5 100644 --- a/arch/x86/include/asm/virtext.h +++ b/arch/x86/include/asm/virtext.h @@ -18,6 +18,8 @@ #include <asm/processor.h> #include <asm/system.h> +#include <asm/vmx.h> + /* * VMX functions: */ @@ -28,4 +30,17 @@ static inline int cpu_has_vmx(void) return test_bit(5, &ecx); /* CPUID.1:ECX.VMX[bit 5] -> VT */ } + +/** Disable VMX on the current CPU + * + * vmxoff causes a undefined-opcode exception if vmxon was not run + * on the CPU previously. Only call this function if you know VMX + * is enabled. + */ +static inline void cpu_vmxoff(void) +{ + asm volatile (ASM_VMX_VMXOFF : : : "cc"); + write_cr4(read_cr4() & ~X86_CR4_VMXE); +} + #endif /* _ASM_X86_VIRTEX_H */ |
