|
 |
9ae3a8 |
From 39ffb75b89ae1a1be6e6ed5c03d4c22cc640e832 Mon Sep 17 00:00:00 2001
|
|
|
9ae3a8 |
From: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
9ae3a8 |
Date: Thu, 25 Jun 2015 19:31:22 +0200
|
|
|
9ae3a8 |
Subject: [PATCH 02/10] target-i386: fix cpuid leaf 0x0d
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Message-id: <1435260689-9556-2-git-send-email-ehabkost@redhat.com>
|
|
|
9ae3a8 |
Patchwork-id: 66499
|
|
|
9ae3a8 |
O-Subject: [RHEL-7.2 qemu-kvm PATCH 1/8] target-i386: fix cpuid leaf 0x0d
|
|
|
9ae3a8 |
Bugzilla: 1233350
|
|
|
9ae3a8 |
RH-Acked-by: Igor Mammedov <imammedo@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Bandan Das <bsd@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
From: Liu Jinsong <jinsong.liu@intel.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Fix cpuid leaf 0x0d which incorrectly parsed eax and ebx.
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
However, before this patch the CPUID worked fine -- the .offset
|
|
|
9ae3a8 |
field contained the size _and_ was stored in the register that
|
|
|
9ae3a8 |
is supposed to hold the size (eax), and likewise the .size field
|
|
|
9ae3a8 |
contained the offset _and_ was stored in the register trhat is
|
|
|
9ae3a8 |
supposed to hold the offset (ebx).
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Liu Jinsong <jinsong.liu@intel.com>
|
|
|
9ae3a8 |
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
9ae3a8 |
(cherry picked from commit 33f373d7c56350fd2ec3e31f4f2c46cb49464911)
|
|
|
9ae3a8 |
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
9ae3a8 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
target-i386/cpu.c | 6 +++---
|
|
|
9ae3a8 |
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
diff --git a/target-i386/cpu.c b/target-i386/cpu.c
|
|
|
9ae3a8 |
index b76719d..0fd100f 100644
|
|
|
9ae3a8 |
--- a/target-i386/cpu.c
|
|
|
9ae3a8 |
+++ b/target-i386/cpu.c
|
|
|
9ae3a8 |
@@ -223,7 +223,7 @@ typedef struct ExtSaveArea {
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
static const ExtSaveArea ext_save_areas[] = {
|
|
|
9ae3a8 |
[2] = { .feature = FEAT_1_ECX, .bits = CPUID_EXT_AVX,
|
|
|
9ae3a8 |
- .offset = 0x100, .size = 0x240 },
|
|
|
9ae3a8 |
+ .offset = 0x240, .size = 0x100 },
|
|
|
9ae3a8 |
};
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
const char *get_register_name_32(unsigned int reg)
|
|
|
9ae3a8 |
@@ -2191,8 +2191,8 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count,
|
|
|
9ae3a8 |
const ExtSaveArea *esa = &ext_save_areas[count];
|
|
|
9ae3a8 |
if ((env->features[esa->feature] & esa->bits) == esa->bits &&
|
|
|
9ae3a8 |
(kvm_mask & (1 << count)) != 0) {
|
|
|
9ae3a8 |
- *eax = esa->offset;
|
|
|
9ae3a8 |
- *ebx = esa->size;
|
|
|
9ae3a8 |
+ *eax = esa->size;
|
|
|
9ae3a8 |
+ *ebx = esa->offset;
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
break;
|
|
|
9ae3a8 |
--
|
|
|
9ae3a8 |
1.8.3.1
|
|
|
9ae3a8 |
|