hvm: Extend the CPUID whitelist to include Intel's AES-NI intructions

Signed-off-by: Tim Deegan <Tim.Deegan@citrix.com>

diff --git a/tools/libxc/xc_cpufeature.h b/tools/libxc/xc_cpufeature.h
index b5ab901c6846fcba508492d4c87cee497a868074..397cfbcb15a185f4a1bfa66b3e6a6945e1eb3c71 100644 (file)
--- 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 4df212ebbe4d3d0f72ff1b0d9be5d9421267215c..54174a297d54efee68e852c73661d53169332b99 100644 (file)
--- 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);