From 39ffb75b89ae1a1be6e6ed5c03d4c22cc640e832 Mon Sep 17 00:00:00 2001 From: Eduardo Habkost Date: Thu, 25 Jun 2015 19:31:22 +0200 Subject: [PATCH 02/10] target-i386: fix cpuid leaf 0x0d Message-id: <1435260689-9556-2-git-send-email-ehabkost@redhat.com> Patchwork-id: 66499 O-Subject: [RHEL-7.2 qemu-kvm PATCH 1/8] target-i386: fix cpuid leaf 0x0d Bugzilla: 1233350 RH-Acked-by: Igor Mammedov RH-Acked-by: Bandan Das RH-Acked-by: Paolo Bonzini 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 (cherry picked from commit 33f373d7c56350fd2ec3e31f4f2c46cb49464911) Signed-off-by: Eduardo Habkost Signed-off-by: Miroslav Rezanina --- target-i386/cpu.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index b76719d..0fd100f 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -223,7 +223,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) @@ -2191,8 +2191,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.8.3.1