From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LWYPB-0005U2-B3
	for qemu-devel@nongnu.org; Mon, 09 Feb 2009 10:50:41 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LWYP9-0005SE-6g
	for qemu-devel@nongnu.org; Mon, 09 Feb 2009 10:50:39 -0500
Received: from [199.232.76.173] (port=56405 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LWYP9-0005S6-0Y
	for qemu-devel@nongnu.org; Mon, 09 Feb 2009 10:50:39 -0500
Received: from savannah.gnu.org ([199.232.41.3]:58969 helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <INVALID.NOREPLY@gnu.org>)
	id 1LWYP8-00056g-9o
	for qemu-devel@nongnu.org; Mon, 09 Feb 2009 10:50:38 -0500
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1LWYP7-000789-Ce
	for qemu-devel@nongnu.org; Mon, 09 Feb 2009 15:50:37 +0000
Received: from aliguori by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <aliguori@savannah.gnu.org>) id 1LWYP7-000785-3Z
	for qemu-devel@nongnu.org; Mon, 09 Feb 2009 15:50:37 +0000
MIME-Version: 1.0
Errors-To: aliguori
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Anthony Liguori <anthony@codemonkey.ws>
Message-Id: <E1LWYP7-000785-3Z@cvs.savannah.gnu.org>
Date: Mon, 09 Feb 2009 15:50:37 +0000
Subject: [Qemu-devel] [6567] KVM: Get all cpuid values from function 2 (Amit
	Shah)
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

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: