This patch cleans up Xsave and AVX feature exposure thru CPUID for both
PV and HVM guests.

Signed-off-by:	Shan Haitao <haitao.shan@intel.com>

diff -r 388c44a63613 tools/libxc/xc_cpuid_x86.c
--- a/tools/libxc/xc_cpuid_x86.c	Wed Nov 10 14:56:06 2010 +0000
+++ b/tools/libxc/xc_cpuid_x86.c	Thu Nov 11 11:25:19 2010 +0800
@@ -168,12 +168,24 @@ static void xc_cpuid_hvm_policy(
     xc_interface *xch, domid_t domid,
     const unsigned int *input, unsigned int *regs)
 {
+    DECLARE_DOMCTL;
     char brand[13];
     unsigned long pae;
-    int is_pae;
+    int is_pae, xsave_supported = 0;
 
     xc_get_hvm_param(xch, domid, HVM_PARAM_PAE_ENABLED, &pae);
     is_pae = !!pae;
+
+    /* Detecting Xen's atitude towards XSAVE */
+    memset(&domctl, 0, sizeof(domctl));
+    domctl.cmd = XEN_DOMCTL_getvcpuextstate;
+    domctl.domain = domid;
+    domctl.u.vcpuextstate.vcpu = 0;
+    domctl.u.vcpuextstate.size = 0;
+    domctl.u.vcpuextstate.xfeature_mask = 0;
+    do_domctl(xch, &domctl);
+    if ( domctl.u.vcpuextstate.xfeature_mask != 0 )
+        xsave_supported = 1;
 
     switch ( input[0] )
     {
@@ -195,7 +207,10 @@ static void xc_cpuid_hvm_policy(
                     bitmaskof(X86_FEATURE_SSE4_1) |
                     bitmaskof(X86_FEATURE_SSE4_2) |
                     bitmaskof(X86_FEATURE_POPCNT) |
-                    bitmaskof(X86_FEATURE_AES));
+                    bitmaskof(X86_FEATURE_AES) |
+                    (xsave_supported)?
+                     (bitmaskof(X86_FEATURE_AVX) |
+                      bitmaskof(X86_FEATURE_XSAVE)) : 0);
 
         regs[2] |= bitmaskof(X86_FEATURE_HYPERVISOR);
 
@@ -281,6 +296,7 @@ static void xc_cpuid_pv_policy(
 {
     DECLARE_DOMCTL;
     int guest_64bit, xen_64bit = hypervisor_is_64bit(xch);
+    int xsave_supported = 0;
     char brand[13];
 
     xc_cpuid_brand_get(brand);
@@ -290,6 +306,17 @@ static void xc_cpuid_pv_policy(
     domctl.cmd = XEN_DOMCTL_get_address_size;
     do_domctl(xch, &domctl);
     guest_64bit = (domctl.u.address_size.size == 64);
+
+    /* Detecting Xen's atitude towards XSAVE */
+    memset(&domctl, 0, sizeof(domctl));
+    domctl.cmd = XEN_DOMCTL_getvcpuextstate;
+    domctl.domain = domid;
+    domctl.u.vcpuextstate.vcpu = 0;
+    domctl.u.vcpuextstate.size = 0;
+    domctl.u.vcpuextstate.xfeature_mask = 0;
+    do_domctl(xch, &domctl);
+    if ( domctl.u.vcpuextstate.xfeature_mask != 0 )
+        xsave_supported = 1;
 
     if ( (input[0] & 0x7fffffff) == 1 )
     {
@@ -320,10 +347,14 @@ static void xc_cpuid_pv_policy(
         clear_bit(X86_FEATURE_TM2, regs[2]);
         if ( !guest_64bit )
             clear_bit(X86_FEATURE_CX16, regs[2]);
+        if ( !xsave_supported )
+        {
+            clear_bit(X86_FEATURE_XSAVE, regs[2]);
+            clear_bit(X86_FEATURE_AVX, regs[2]);
+        }
         clear_bit(X86_FEATURE_XTPR, regs[2]);
         clear_bit(X86_FEATURE_PDCM, regs[2]);
         clear_bit(X86_FEATURE_DCA, regs[2]);
-        clear_bit(X86_FEATURE_XSAVE, regs[2]);
         set_bit(X86_FEATURE_HYPERVISOR, regs[2]);
         break;
     case 0x80000001:
diff -r 388c44a63613 xen/arch/x86/hvm/hvm.c
--- a/xen/arch/x86/hvm/hvm.c	Wed Nov 10 14:56:06 2010 +0000
+++ b/xen/arch/x86/hvm/hvm.c	Thu Nov 11 11:23:06 2010 +0800
@@ -2089,15 +2089,10 @@ void hvm_cpuid(unsigned int input, unsig
         if ( vlapic_hw_disabled(vcpu_vlapic(v)) )
             __clear_bit(X86_FEATURE_APIC & 31, edx);
 
-        /* Fix up XSAVE and OSXSAVE. */
-        *ecx &= ~(bitmaskof(X86_FEATURE_XSAVE) |
-                  bitmaskof(X86_FEATURE_OSXSAVE));
+        /* Fix up OSXSAVE. */
         if ( cpu_has_xsave )
-        {
-            *ecx |= bitmaskof(X86_FEATURE_XSAVE);
             *ecx |= (v->arch.hvm_vcpu.guest_cr[4] & X86_CR4_OSXSAVE) ?
                      bitmaskof(X86_FEATURE_OSXSAVE) : 0;
-        }
         break;
     case 0xb:
         /* Fix the x2APIC identifier. */
diff -r 388c44a63613 xen/arch/x86/traps.c
--- a/xen/arch/x86/traps.c	Wed Nov 10 14:56:06 2010 +0000
+++ b/xen/arch/x86/traps.c	Thu Nov 11 11:27:00 2010 +0800
@@ -795,7 +795,11 @@ static void pv_cpuid(struct cpu_user_reg
         __clear_bit(X86_FEATURE_XTPR % 32, &c);
         __clear_bit(X86_FEATURE_PDCM % 32, &c);
         __clear_bit(X86_FEATURE_DCA % 32, &c);
-        __clear_bit(X86_FEATURE_XSAVE % 32, &c);
+        if ( !cpu_has_xsave )
+        {
+			__clear_bit(X86_FEATURE_XSAVE % 32, &c);
+			__clear_bit(X86_FEATURE_AVX % 32, &c);
+        }
         if ( !cpu_has_apic )
            __clear_bit(X86_FEATURE_X2APIC % 32, &c);
         __set_bit(X86_FEATURE_HYPERVISOR % 32, &c);
diff -r 388c44a63613 xen/include/asm-x86/cpufeature.h
--- a/xen/include/asm-x86/cpufeature.h	Wed Nov 10 14:56:06 2010 +0000
+++ b/xen/include/asm-x86/cpufeature.h	Thu Nov 11 11:28:24 2010 +0800
@@ -102,6 +102,7 @@
 #define X86_FEATURE_TSC_DEADLINE (4*32+24) /* "tdt" TSC Deadline Timer */
 #define X86_FEATURE_XSAVE	(4*32+26) /* XSAVE/XRSTOR/XSETBV/XGETBV */
 #define X86_FEATURE_OSXSAVE	(4*32+27) /* OSXSAVE */
+#define X86_FEATURE_AVX 	(4*32+28) /* OSXSAVE */
 #define X86_FEATURE_HYPERVISOR	(4*32+31) /* Running under some hypervisor */
 
 /* VIA/Cyrix/Centaur-defined CPU features, CPUID level 0xC0000001, word 5 */