|
 |
d81766 |
From 733f45c8f379e10a13b964dafb787853887f73a4 Mon Sep 17 00:00:00 2001
|
|
|
d81766 |
From: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
d81766 |
Date: Tue, 20 Aug 2013 15:09:48 +0200
|
|
|
d81766 |
Subject: pc: rhel6.x has x2apic present on Conroe/Penryn/Nehalem CPU models
|
|
|
d81766 |
|
|
|
d81766 |
RH-Author: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
d81766 |
Message-id: <1377011392-9336-4-git-send-email-ehabkost@redhat.com>
|
|
|
d81766 |
Patchwork-id: 53613
|
|
|
d81766 |
O-Subject: [RHEL7 PATCH 3/7] pc: rhel6.x has x2apic present on Conroe/Penryn/Nehalem CPU models
|
|
|
d81766 |
Bugzilla: 918907
|
|
|
d81766 |
RH-Acked-by: Markus Armbruster <armbru@redhat.com>
|
|
|
d81766 |
RH-Acked-by: Bandan Das <bsd@redhat.com>
|
|
|
d81766 |
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
d81766 |
|
|
|
d81766 |
Bugzilla: 918907
|
|
|
d81766 |
Upstream status: not applicable
|
|
|
d81766 |
|
|
|
d81766 |
The Conroe/Penryn/Nehalem CPU models all have x2apic enabled on rhel6.x
|
|
|
d81766 |
(added by RHEL-6 commit 19ab65a663cfdfa8365f3ec324af6b0ab26be5a1). Add
|
|
|
d81766 |
compat bits to make sure they are set on the rhel6.x machine-types.
|
|
|
d81766 |
|
|
|
d81766 |
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
d81766 |
|
|
|
d81766 |
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
|
|
|
d81766 |
index 779e76d..fec4a7d 100644
|
|
|
d81766 |
--- a/hw/i386/pc_piix.c
|
|
|
d81766 |
+++ b/hw/i386/pc_piix.c
|
|
|
d81766 |
@@ -1027,6 +1027,10 @@ static QEMUMachine pc_machine_rhel700 = {
|
|
|
d81766 |
|
|
|
d81766 |
static void pc_init_rhel650(MachineState *machine)
|
|
|
d81766 |
{
|
|
|
d81766 |
+ x86_cpu_compat_set_features("Conroe", FEAT_1_ECX, CPUID_EXT_X2APIC, 0);
|
|
|
d81766 |
+ x86_cpu_compat_set_features("Penryn", FEAT_1_ECX, CPUID_EXT_X2APIC, 0);
|
|
|
d81766 |
+ x86_cpu_compat_set_features("Nehalem", FEAT_1_ECX, CPUID_EXT_X2APIC, 0);
|
|
|
d81766 |
+ x86_cpu_compat_set_features("Westmere", FEAT_1_ECX, CPUID_EXT_X2APIC, 0);
|
|
|
d81766 |
pc_init_rhel700(machine);
|
|
|
d81766 |
}
|
|
|
d81766 |
|