|
 |
9ae3a8 |
commit 2b70aa524d7d12a8662cf9fcf9d6ca6d0264b5a6
|
|
|
9ae3a8 |
Author: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
9ae3a8 |
Date: Thu Jun 27 15:57:43 2013 +0200
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
target-i386: Set level=4 on Conroe/Penryn/Nehalem
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
RH-Author: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
9ae3a8 |
Message-id: <1372348663-1706-4-git-send-email-ehabkost@redhat.com>
|
|
|
9ae3a8 |
Patchwork-id: 52253
|
|
|
9ae3a8 |
O-Subject: [PATCH v2 3/3] target-i386: Set level=4 on Conroe/Penryn/Nehalem
|
|
|
9ae3a8 |
Bugzilla: 861210
|
|
|
9ae3a8 |
RH-Acked-by: Bandan Das <bsd@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Markus Armbruster <armbru@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Bugzilla: 861210
|
|
|
9ae3a8 |
(cherry picked from commit 6b11322e0f724eb0649fdc324a44288b783023ad)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
The CPUID level value on Conroe, Penryn, and Nehalem are too low. This
|
|
|
9ae3a8 |
causes at least one known problem: the -smp "threads" option doesn't
|
|
|
9ae3a8 |
work as expect if level is < 4, because thread count information is
|
|
|
9ae3a8 |
provided to the guest on CPUID[EAX=4,ECX=2].EAX
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
9ae3a8 |
Signed-off-by: Andreas Färber <afaerber@suse.de>
|
|
|
9ae3a8 |
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
include/hw/i386/pc.h | 12 ++++++++++++
|
|
|
9ae3a8 |
target-i386/cpu.c | 6 +++---
|
|
|
9ae3a8 |
2 files changed, 15 insertions(+), 3 deletions(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
|
|
|
9ae3a8 |
index 4d6c9bf..6692728 100644
|
|
|
9ae3a8 |
--- a/include/hw/i386/pc.h
|
|
|
9ae3a8 |
+++ b/include/hw/i386/pc.h
|
|
|
9ae3a8 |
@@ -192,13 +192,25 @@ int e820_add_entry(uint64_t, uint64_t, uint32_t);
|
|
|
9ae3a8 |
.property = "model",\
|
|
|
9ae3a8 |
.value = stringify(2),\
|
|
|
9ae3a8 |
},{\
|
|
|
9ae3a8 |
+ .driver = "Conroe-" TYPE_X86_CPU,\
|
|
|
9ae3a8 |
+ .property = "level",\
|
|
|
9ae3a8 |
+ .value = stringify(2),\
|
|
|
9ae3a8 |
+ },{\
|
|
|
9ae3a8 |
.driver = "Penryn-" TYPE_X86_CPU,\
|
|
|
9ae3a8 |
.property = "model",\
|
|
|
9ae3a8 |
.value = stringify(2),\
|
|
|
9ae3a8 |
},{\
|
|
|
9ae3a8 |
+ .driver = "Penryn-" TYPE_X86_CPU,\
|
|
|
9ae3a8 |
+ .property = "level",\
|
|
|
9ae3a8 |
+ .value = stringify(2),\
|
|
|
9ae3a8 |
+ },{\
|
|
|
9ae3a8 |
.driver = "Nehalem-" TYPE_X86_CPU,\
|
|
|
9ae3a8 |
.property = "model",\
|
|
|
9ae3a8 |
.value = stringify(2),\
|
|
|
9ae3a8 |
+ },{\
|
|
|
9ae3a8 |
+ .driver = "Nehalem-" TYPE_X86_CPU,\
|
|
|
9ae3a8 |
+ .property = "level",\
|
|
|
9ae3a8 |
+ .value = stringify(2),\
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
#define PC_COMPAT_1_4 \
|
|
|
9ae3a8 |
diff --git a/target-i386/cpu.c b/target-i386/cpu.c
|
|
|
9ae3a8 |
index 012819a..4b2da0d 100644
|
|
|
9ae3a8 |
--- a/target-i386/cpu.c
|
|
|
9ae3a8 |
+++ b/target-i386/cpu.c
|
|
|
9ae3a8 |
@@ -669,7 +669,7 @@ static x86_def_t builtin_x86_defs[] = {
|
|
|
9ae3a8 |
},
|
|
|
9ae3a8 |
{
|
|
|
9ae3a8 |
.name = "Conroe",
|
|
|
9ae3a8 |
- .level = 2,
|
|
|
9ae3a8 |
+ .level = 4,
|
|
|
9ae3a8 |
.vendor = CPUID_VENDOR_INTEL,
|
|
|
9ae3a8 |
.family = 6,
|
|
|
9ae3a8 |
.model = 15,
|
|
|
9ae3a8 |
@@ -691,7 +691,7 @@ static x86_def_t builtin_x86_defs[] = {
|
|
|
9ae3a8 |
},
|
|
|
9ae3a8 |
{
|
|
|
9ae3a8 |
.name = "Penryn",
|
|
|
9ae3a8 |
- .level = 2,
|
|
|
9ae3a8 |
+ .level = 4,
|
|
|
9ae3a8 |
.vendor = CPUID_VENDOR_INTEL,
|
|
|
9ae3a8 |
.family = 6,
|
|
|
9ae3a8 |
.model = 23,
|
|
|
9ae3a8 |
@@ -714,7 +714,7 @@ static x86_def_t builtin_x86_defs[] = {
|
|
|
9ae3a8 |
},
|
|
|
9ae3a8 |
{
|
|
|
9ae3a8 |
.name = "Nehalem",
|
|
|
9ae3a8 |
- .level = 2,
|
|
|
9ae3a8 |
+ .level = 4,
|
|
|
9ae3a8 |
.vendor = CPUID_VENDOR_INTEL,
|
|
|
9ae3a8 |
.family = 6,
|
|
|
9ae3a8 |
.model = 26,
|