[Qemu-devel] [6567] KVM: Get all cpuid values from function 2 (Amit Shah)

[Anthony Liguori <anthony@codemonkey.ws>]

Revision: 6567
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6567
Author:   aliguori
Date:     2009-02-09 15:50:36 +0000 (Mon, 09 Feb 2009)

Log Message:
-----------
KVM: Get all cpuid values from function 2 (Amit Shah)

cpuid function 2 can have multiple values to describe cache behaviour.
Loop till we have fetched all the values.

Signed-off-by: Amit Shah <amit.shah@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

Modified Paths:
--------------
    trunk/target-i386/kvm.c

Modified: trunk/target-i386/kvm.c
===================================================================
--- trunk/target-i386/kvm.c	2009-02-09 15:50:31 UTC (rev 6566)
+++ trunk/target-i386/kvm.c	2009-02-09 15:50:36 UTC (rev 6567)
@@ -51,6 +51,32 @@
         struct kvm_cpuid_entry2 *c = &cpuid_data.entries[cpuid_i++];
 
         switch (i) {
+        case 2: {
+            /* Keep reading function 2 till all the input is received */
+            int times;
+
+            cpu_x86_cpuid(env, i, 0, &eax, &ebx, &ecx, &edx);
+            times = eax & 0xff;
+
+            c->function = i;
+            c->flags |= KVM_CPUID_FLAG_STATEFUL_FUNC;
+            c->flags |= KVM_CPUID_FLAG_STATE_READ_NEXT;
+            c->eax = eax;
+            c->ebx = ebx;
+            c->ecx = ecx;
+            c->edx = edx;
+
+            for (j = 1; j < times; ++j) {
+                cpu_x86_cpuid(env, i, 0, &eax, &ebx, &ecx, &edx);
+                c->function = i;
+                c->flags |= KVM_CPUID_FLAG_STATEFUL_FUNC;
+                c->eax = eax;
+                c->ebx = ebx;
+                c->ecx = ecx;
+                c->edx = edx;
+            }
+            break;
+        }
         case 4:
         case 0xb:
         case 0xd: