aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKeir Fraser <keir.fraser@citrix.com>2010-05-26 08:26:38 +0100
committerKeir Fraser <keir.fraser@citrix.com>2010-05-26 08:26:38 +0100
commit5fe0ff2d0726af396d14440327167b849bcc8624 (patch)
tree449f819276d2e1b5f3e5460a61258108d8dadaa7
parentb367b23e7f3dcef953250683f77826d9a6885d66 (diff)
downloadxen-5fe0ff2d0726af396d14440327167b849bcc8624.tar.gz
xen-5fe0ff2d0726af396d14440327167b849bcc8624.tar.bz2
xen-5fe0ff2d0726af396d14440327167b849bcc8624.zip
hvm: Extend the CPUID whitelist to include Intel's AES-NI intructions
Signed-off-by: Tim Deegan <Tim.Deegan@citrix.com> xen-unstable changeset: 21454:23291daa9da4 xen-unstable date: Wed May 26 08:02:33 2010 +0100
-rw-r--r--tools/libxc/xc_cpufeature.h1
-rw-r--r--tools/libxc/xc_cpuid_x86.c3
2 files changed, 3 insertions, 1 deletions
diff --git a/tools/libxc/xc_cpufeature.h b/tools/libxc/xc_cpufeature.h
index b5ab901c68..397cfbcb15 100644
--- a/tools/libxc/xc_cpufeature.h
+++ b/tools/libxc/xc_cpufeature.h
@@ -83,6 +83,7 @@
#define X86_FEATURE_SSE4_1 (4*32+19) /* Streaming SIMD Extensions 4.1 */
#define X86_FEATURE_SSE4_2 (4*32+20) /* Streaming SIMD Extensions 4.2 */
#define X86_FEATURE_POPCNT (4*32+23) /* POPCNT instruction */
+#define X86_FEATURE_AES (4*32+25) /* AES acceleration instructions */
#define X86_FEATURE_XSAVE (4*32+26) /* XSAVE/XRSTOR/XSETBV/XGETBV */
#define X86_FEATURE_HYPERVISOR (4*32+31) /* Running under some hypervisor */
diff --git a/tools/libxc/xc_cpuid_x86.c b/tools/libxc/xc_cpuid_x86.c
index 4df212ebbe..54174a297d 100644
--- a/tools/libxc/xc_cpuid_x86.c
+++ b/tools/libxc/xc_cpuid_x86.c
@@ -190,7 +190,8 @@ static void xc_cpuid_hvm_policy(
bitmaskof(X86_FEATURE_CX16) |
bitmaskof(X86_FEATURE_SSE4_1) |
bitmaskof(X86_FEATURE_SSE4_2) |
- bitmaskof(X86_FEATURE_POPCNT));
+ bitmaskof(X86_FEATURE_POPCNT) |
+ bitmaskof(X86_FEATURE_AES));
regs[2] |= bitmaskof(X86_FEATURE_HYPERVISOR);