218e99
From ddcaa23c15a4881a882686961d99fc26abb45357 Mon Sep 17 00:00:00 2001
218e99
From: Eduardo Habkost <ehabkost@redhat.com>
218e99
Date: Mon, 16 Sep 2013 20:39:55 +0200
218e99
Subject: [PATCH 06/25] pc: rhel6 doesn't have APIC on pentium* CPU models
218e99
218e99
RH-Author: Eduardo Habkost <ehabkost@redhat.com>
218e99
Message-id: <1379363997-11783-3-git-send-email-ehabkost@redhat.com>
218e99
Patchwork-id: 54400
218e99
O-Subject: [RHEL7 PATCH 2/4] pc: rhel6 doesn't have APIC on pentium* CPU models
218e99
Bugzilla: 918907
218e99
RH-Acked-by: Bandan Das <bsd@redhat.com>
218e99
RH-Acked-by: Markus Armbruster <armbru@redhat.com>
218e99
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
218e99
218e99
From: Eduardo Habkost <ehabkost@raisama.net>
218e99
218e99
Bugzilla: 918907
218e99
Upstream status: not applicable
218e99
  (pc-0.12 already have CPUID_APIC enabled for almost 4 years)
218e99
Brew build: http://brewweb.devel.redhat.com/brew/taskinfo?taskID=6290888
218e99
218e99
QEMU v0.13 and newer has CPUID_APIC set on pentium, pentium2, and
218e99
pentium3 CPU models[1], but v0.12 (and RHEL-6) don't have it. We need to
218e99
disable the flag on pc_init_rhel650() to keep compatibility.
218e99
218e99
[1] Upstream commit c84bd4f104098861e162be848a00d64c1fa76ed4
218e99
218e99
Signed-off-by: Eduardo Habkost <ehabkost@raisama.net>
218e99
---
218e99
 hw/i386/pc_piix.c | 4 ++++
218e99
 1 file changed, 4 insertions(+)
218e99
218e99
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
218e99
---
218e99
 hw/i386/pc_piix.c |    4 ++++
218e99
 1 files changed, 4 insertions(+), 0 deletions(-)
218e99
218e99
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
218e99
index 39be127..6fe6ba0 100644
218e99
--- a/hw/i386/pc_piix.c
218e99
+++ b/hw/i386/pc_piix.c
218e99
@@ -872,6 +872,10 @@ static QEMUMachine pc_machine_rhel700 = {
218e99
 
218e99
 static void pc_init_rhel650(QEMUMachineInitArgs *args)
218e99
 {
218e99
+    x86_cpu_compat_set_features("pentium", FEAT_1_EDX, 0, CPUID_APIC);
218e99
+    x86_cpu_compat_set_features("pentium2", FEAT_1_EDX, 0, CPUID_APIC);
218e99
+    x86_cpu_compat_set_features("pentium3", FEAT_1_EDX, 0, CPUID_APIC);
218e99
+
218e99
     x86_cpu_compat_set_features("Conroe", FEAT_1_ECX, CPUID_EXT_X2APIC, 0);
218e99
     x86_cpu_compat_set_features("Penryn", FEAT_1_ECX, CPUID_EXT_X2APIC, 0);
218e99
     x86_cpu_compat_set_features("Nehalem", FEAT_1_ECX, CPUID_EXT_X2APIC, 0);
218e99
-- 
218e99
1.7.1
218e99