mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

target-i386: fix cpuid leaf 0x0d

Browse Source 
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 <jinsong.liu@intel.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Liu Jinsong 2013-12-03 04:17:50 +08:00 committed by Paolo Bonzini
parent ef36fa1492
commit 33f373d7c5
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
target-i386/cpu.c
View File

@ -335,7 +335,7 @@ typedef struct ExtSaveArea {
static const ExtSaveArea ext_save_areas[] = { static const ExtSaveArea ext_save_areas[] = {
[2] = { .feature = FEAT_1_ECX, .bits = CPUID_EXT_AVX, [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) 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]; const ExtSaveArea *esa = &ext_save_areas[count];
if ((env->features[esa->feature] & esa->bits) == esa->bits && if ((env->features[esa->feature] & esa->bits) == esa->bits &&
(kvm_mask & (1 << count)) != 0) { (kvm_mask & (1 << count)) != 0) {
*eax = esa->offset; *eax = esa->size;
*ebx = esa->size; *ebx = esa->offset;
} }
} }
break; break;