[Qemu-devel] [6689] Fix cpuid KVM crash on i386 (Lubomir Rintel)

[Qemu-devel] [6689] Fix cpuid KVM crash on i386 (Lubomir Rintel)

[Anthony Liguori]

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");