# HG changeset patch
# User Tim Deegan <Tim.Deegan@xxxxxxxxxx>
# Date 1274798636 -3600
# Node ID e823c66bf4310c874a7a7158c42586f4d535687c
# Parent  a723c31e10d17de54a5cee1024e01f600ba031cd
Extend the HVM CPUID whitelist to include Intel's AES-NI intructions.

Signed-off-by: Tim Deegan <Tim.Deegan@xxxxxxxxxx>

diff -r a723c31e10d1 -r e823c66bf431 tools/libxc/xc_cpufeature.h
--- a/tools/libxc/xc_cpufeature.h	Tue May 25 15:43:51 2010 +0100
+++ b/tools/libxc/xc_cpufeature.h	Tue May 25 15:43:56 2010 +0100
@@ -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 -r a723c31e10d1 -r e823c66bf431 tools/libxc/xc_cpuid_x86.c
--- a/tools/libxc/xc_cpuid_x86.c	Tue May 25 15:43:51 2010 +0100
+++ b/tools/libxc/xc_cpuid_x86.c	Tue May 25 15:43:56 2010 +0100
@@ -190,7 +190,8 @@
                     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);