[Qemu-devel] [PATCH] Make CPUID 4 work again

[Alexander Graf <agraf@suse.de>]

[-- Attachment #1: Type: text/plain, Size: 313 bytes --]

The recent split of the CPUID helper function broke CPUID 4, which
relies on ECX information.
This patch writes ECX into the ecx variable, which is used by
cpu_x86_cpuid to enumerate the current index.

Using this patch booting Linux with -cpu core2duo works again.

Signed-off-by: Alexander Graf <agraf@suse.de>

[-- Attachment #2: qemu-cpuid4.patch --]
[-- Type: text/x-patch, Size: 382 bytes --]

Index: target-i386/op_helper.c
===================================================================
--- target-i386/op_helper.c	(revision 6082)
+++ target-i386/op_helper.c	(working copy)
@@ -1898,6 +1898,7 @@
 
     helper_svm_check_intercept_param(SVM_EXIT_CPUID, 0);
 
+    ecx = ECX;
     cpu_x86_cpuid(env, (uint32_t)EAX, &eax, &ebx, &ecx, &edx);
     EAX = eax;
     EBX = ebx;