From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51333) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Voxjy-0001dh-De for qemu-devel@nongnu.org; Fri, 06 Dec 2013 10:55:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Voxjs-00081z-93 for qemu-devel@nongnu.org; Fri, 06 Dec 2013 10:54:54 -0500 Received: from mail-ee0-x234.google.com ([2a00:1450:4013:c00::234]:45686) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Voxjs-00081o-2H for qemu-devel@nongnu.org; Fri, 06 Dec 2013 10:54:48 -0500 Received: by mail-ee0-f52.google.com with SMTP id d17so380217eek.25 for ; Fri, 06 Dec 2013 07:54:47 -0800 (PST) Sender: Paolo Bonzini From: Paolo Bonzini Date: Fri, 6 Dec 2013 16:54:36 +0100 Message-Id: <1386345276-9803-3-git-send-email-pbonzini@redhat.com> In-Reply-To: <1386345276-9803-1-git-send-email-pbonzini@redhat.com> References: <1386345276-9803-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PULL 3/3] target-i386: fix cpuid leaf 0x0d List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Liu Jinsong From: Liu Jinsong Fix cpuid leaf 0x0d which incorrectly parsed eax and ebx. However, before this patch the CPUID worked fine -- the .offset field contained the size _and_ was stored in the register that is supposed to hold the size (eax), and likewise the .size field contained the offset _and_ was stored in the register trhat is supposed to hold the offset (ebx). Signed-off-by: Liu Jinsong Signed-off-by: Paolo Bonzini --- target-i386/cpu.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 47af9a8..bb98f6d 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -335,7 +335,7 @@ typedef struct ExtSaveArea { static const ExtSaveArea ext_save_areas[] = { [2] = { .feature = FEAT_1_ECX, .bits = CPUID_EXT_AVX, - .offset = 0x100, .size = 0x240 }, + .offset = 0x240, .size = 0x100 }, }; const char *get_register_name_32(unsigned int reg) @@ -2227,8 +2227,8 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count, const ExtSaveArea *esa = &ext_save_areas[count]; if ((env->features[esa->feature] & esa->bits) == esa->bits && (kvm_mask & (1 << count)) != 0) { - *eax = esa->offset; - *ebx = esa->size; + *eax = esa->size; + *ebx = esa->offset; } } break; -- 1.7.1