diff options
author | Eduardo Habkost <ehabkost@redhat.com> | 2008-11-17 16:03:19 -0500 |
---|---|---|
committer | Avi Kivity <avi@redhat.com> | 2008-12-31 09:52:29 -0500 |
commit | 6aa07a0d77f6aafbe69e4e8609ffaf2b7ee1b591 (patch) | |
tree | 02b6a3a17840804fd3331e1920cdb671a63f4169 /arch | |
parent | 710ff4a855d0f3bf74b5b4a20328e2858a8a2968 (diff) |
x86: cpu_emergency_vmxoff() function
Add cpu_emergency_vmxoff() and its friends: cpu_vmx_enabled() and
__cpu_emergency_vmxoff().
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/x86/include/asm/virtext.h | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/arch/x86/include/asm/virtext.h b/arch/x86/include/asm/virtext.h index 7dee5b59930e..6bcf0acb4ef1 100644 --- a/arch/x86/include/asm/virtext.h +++ b/arch/x86/include/asm/virtext.h | |||
@@ -43,4 +43,27 @@ static inline void cpu_vmxoff(void) | |||
43 | write_cr4(read_cr4() & ~X86_CR4_VMXE); | 43 | write_cr4(read_cr4() & ~X86_CR4_VMXE); |
44 | } | 44 | } |
45 | 45 | ||
46 | static inline int cpu_vmx_enabled(void) | ||
47 | { | ||
48 | return read_cr4() & X86_CR4_VMXE; | ||
49 | } | ||
50 | |||
51 | /** Disable VMX if it is enabled on the current CPU | ||
52 | * | ||
53 | * You shouldn't call this if cpu_has_vmx() returns 0. | ||
54 | */ | ||
55 | static inline void __cpu_emergency_vmxoff(void) | ||
56 | { | ||
57 | if (cpu_vmx_enabled()) | ||
58 | cpu_vmxoff(); | ||
59 | } | ||
60 | |||
61 | /** Disable VMX if it is supported and enabled on the current CPU | ||
62 | */ | ||
63 | static inline void cpu_emergency_vmxoff(void) | ||
64 | { | ||
65 | if (cpu_has_vmx()) | ||
66 | __cpu_emergency_vmxoff(); | ||
67 | } | ||
68 | |||
46 | #endif /* _ASM_X86_VIRTEX_H */ | 69 | #endif /* _ASM_X86_VIRTEX_H */ |