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