|
 |
9ae3a8 |
From c24fbe335c22ced933edb7d72f03adaf64000056 Mon Sep 17 00:00:00 2001
|
|
|
9ae3a8 |
From: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
9ae3a8 |
Date: Tue, 20 Aug 2013 15:09:47 +0200
|
|
|
9ae3a8 |
Subject: [PATCH 19/28] pc: Remove incorrect rhel6.x compat "model" value for Conroe/Penryn/Nehalem
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
RH-Author: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
9ae3a8 |
Message-id: <1377011392-9336-3-git-send-email-ehabkost@redhat.com>
|
|
|
9ae3a8 |
Patchwork-id: 53610
|
|
|
9ae3a8 |
O-Subject: [RHEL7 PATCH 2/7] pc: Remove incorrect rhel6.x compat "model" value for Conroe/Penryn/Nehalem
|
|
|
9ae3a8 |
Bugzilla: 918907
|
|
|
9ae3a8 |
RH-Acked-by: Markus Armbruster <armbru@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Bandan Das <bsd@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Bugzilla: 918907
|
|
|
9ae3a8 |
Upstream status: not applicable
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
The series that introduced the rhel6.x machine-types added compat
|
|
|
9ae3a8 |
"model" values for Conroe, Penryn and Nehalem that were copied from
|
|
|
9ae3a8 |
PC_COMPAT_1_5 but are not applicable to rhel6.x, as the CPU models had
|
|
|
9ae3a8 |
the correct model value since RHEL-6.0 (see RHEL-6 commit
|
|
|
9ae3a8 |
9a2e04fed8d1c4b44c4122b211e236a36a036cc7).
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
hw/i386/pc_piix.c | 12 ------------
|
|
|
9ae3a8 |
1 file changed, 12 deletions(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
hw/i386/pc_piix.c | 12 ------------
|
|
|
9ae3a8 |
1 files changed, 0 insertions(+), 12 deletions(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
|
|
|
9ae3a8 |
index 0dc52c4..a11a4b0 100644
|
|
|
9ae3a8 |
--- a/hw/i386/pc_piix.c
|
|
|
9ae3a8 |
+++ b/hw/i386/pc_piix.c
|
|
|
9ae3a8 |
@@ -910,26 +910,14 @@ static QEMUMachine pc_machine_rhel640 = {
|
|
|
9ae3a8 |
PC_RHEL6_4_COMPAT,\
|
|
|
9ae3a8 |
{\
|
|
|
9ae3a8 |
.driver = "Conroe-" TYPE_X86_CPU,\
|
|
|
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 |
1.7.1
|
|
|
9ae3a8 |
|