update some cpuid comments and add a couple of values

diff --git a/libs/xc/xc_cpuid.h b/libs/xc/xc_cpuid.h
index df22a855abc9ecfd628b736ea814715c9bcd8ad8..feba45a2c045f538d3d10d6ba80d08c851b5a590 100644 (file)
--- a/libs/xc/xc_cpuid.h
+++ b/libs/xc/xc_cpuid.h
@@ -114,12 +114,13 @@ static void do_hvm_cpuid_policy(int xc, int domid, uint32_t input, uint32_t regs
                regs[0] &= 0x0000ffffu;
                regs[1] = regs[2] = regs[3] = 0;
                break;
-       case 0x00000002:
-       case 0x00000004:
-       case 0x80000002:
-       case 0x80000003:
-       case 0x80000004:
-       case 0x80000006:
+       case 0x00000002: /* Intel cache info (dumped by AMD policy) */
+       case 0x00000004: /* Intel cache info (dumped by AMD policy) */
+       case 0x80000002: /* Processor name string */
+       case 0x80000003: /* ... continued         */
+       case 0x80000004: /* ... continued         */
+       case 0x80000005: /* AMD L1 cache/TLB info (dumped by Intel policy) */
+       case 0x80000006: /* AMD L2/3 cache/TLB info ; Intel L2 cache features */
                break;
        default:
                regs[0] = regs[1] = regs[2] = regs[3] = 0;
@@ -190,6 +191,11 @@ static void do_hvm_cpuid_policy(int xc, int domid, uint32_t input, uint32_t regs
                                        (is_64bit ? bitmaskof(X86_FEATURE_SYSCALL) : 0));
                        break;
                        }
+               case 0x80000005:
+                       {
+                       regs[0] = regs[1] = regs[2] = 0;
+                       break;
+                       }
                }
        }
 }