summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorShane Wang <shane.wang@intel.com>2010-04-29 12:09:01 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2010-07-05 11:16:14 -0700
commit5c8f6e37b6b7ce451bb3fc25a7699c720bbcbbba (patch)
treeb1e650521d17642e407e940dedad355ee8e47852 /include
parente5085dda9c31aada430b3b57ce78ec102e934e9c (diff)
KVM: VMX: enable VMXON check with SMX enabled (Intel TXT)
Per document, for feature control MSR: Bit 1 enables VMXON in SMX operation. If the bit is clear, execution of VMXON in SMX operation causes a general-protection exception. Bit 2 enables VMXON outside SMX operation. If the bit is clear, execution of VMXON outside SMX operation causes a general-protection exception. This patch is to enable this kind of check with SMX for VMXON in KVM. Signed-off-by: Shane Wang <shane.wang@intel.com> Signed-off-by: Avi Kivity <avi@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> (cherry picked from commit cafd66595d92591e4bd25c3904e004fc6f897e2d)
Diffstat (limited to 'include')
-rw-r--r--include/linux/tboot.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/tboot.h b/include/linux/tboot.h
index bf2a0c748878..1dba6ee55203 100644
--- a/include/linux/tboot.h
+++ b/include/linux/tboot.h
@@ -150,6 +150,7 @@ extern int tboot_force_iommu(void);
#else
+#define tboot_enabled() 0
#define tboot_probe() do { } while (0)
#define tboot_shutdown(shutdown_type) do { } while (0)
#define tboot_sleep(sleep_state, pm1a_control, pm1b_control) \