Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=1e9931...
Commit: 1e9931146c748420343aeefadb3bb17bd1c14a37
Parent: 6210e37b122583643da335c0389f74098713e5ca
Author: Eduardo Habkost <ehabkost@redhat.com>
AuthorDate: Mon Nov 17 19:03:17 2008 -0200
Committer: Avi Kivity <avi@redhat.com>
CommitDate: Wed Dec 31 16:52:29 2008 +0200
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>
---
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 */
--
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
