From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LfIp2-0004gt-3o
	for qemu-devel@nongnu.org; Thu, 05 Mar 2009 14:01:32 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LfIp0-0004gD-KB
	for qemu-devel@nongnu.org; Thu, 05 Mar 2009 14:01:31 -0500
Received: from [199.232.76.173] (port=51465 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LfIp0-0004g1-CI
	for qemu-devel@nongnu.org; Thu, 05 Mar 2009 14:01:30 -0500
Received: from savannah.gnu.org ([199.232.41.3]:55901 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 <anthony@codemonkey.ws>)
	id 1LfIoz-0004vE-Lm
	for qemu-devel@nongnu.org; Thu, 05 Mar 2009 14:01:29 -0500
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.69)
	(envelope-from <anthony@codemonkey.ws>) id 1LfIoz-0007Za-3F
	for qemu-devel@nongnu.org; Thu, 05 Mar 2009 19:01:29 +0000
Received: from aliguori by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <aliguori@savannah.gnu.org>) id 1LfIoy-0007ZW-R6
	for qemu-devel@nongnu.org; Thu, 05 Mar 2009 19:01:28 +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: <E1LfIoy-0007ZW-R6@cvs.savannah.gnu.org>
Date: Thu, 05 Mar 2009 19:01:28 +0000
Subject: [Qemu-devel] [6689] Fix cpuid KVM crash on i386 (Lubomir Rintel)
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: 6689
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6689
Author:   aliguori
Date:     2009-03-05 19:01:28 +0000 (Thu, 05 Mar 2009)
Log Message:
-----------
Fix cpuid KVM crash on i386 (Lubomir Rintel)

Cpuid should return into vec, not overwrite past address in count.
Changeset 6565 broke this.

Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

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

Modified: trunk/target-i386/helper.c
===================================================================
--- trunk/target-i386/helper.c	2009-03-05 19:01:21 UTC (rev 6688)
+++ trunk/target-i386/helper.c	2009-03-05 19:01:28 UTC (rev 6689)
@@ -1421,10 +1421,10 @@
 #else
     asm volatile("pusha \n\t"
                  "cpuid \n\t"
-                 "mov %%eax, 0(%1) \n\t"
-                 "mov %%ebx, 4(%1) \n\t"
-                 "mov %%ecx, 8(%1) \n\t"
-                 "mov %%edx, 12(%1) \n\t"
+                 "mov %%eax, 0(%2) \n\t"
+                 "mov %%ebx, 4(%2) \n\t"
+                 "mov %%ecx, 8(%2) \n\t"
+                 "mov %%edx, 12(%2) \n\t"
                  "popa"
                  : : "a"(function), "c"(count), "S"(vec)
                  : "memory", "cc");