yeahuh / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone
218e99
From 7d9e001ea97e762782e6875d220cc50269c1005f Mon Sep 17 00:00:00 2001
218e99
From: Eduardo Habkost <ehabkost@redhat.com>
218e99
Date: Tue, 20 Aug 2013 15:09:48 +0200
218e99
Subject: [PATCH 20/28] pc: rhel6.x has x2apic present on Conroe/Penryn/Nehalem CPU models
218e99
218e99
RH-Author: Eduardo Habkost <ehabkost@redhat.com>
218e99
Message-id: <1377011392-9336-4-git-send-email-ehabkost@redhat.com>
218e99
Patchwork-id: 53613
218e99
O-Subject: [RHEL7 PATCH 3/7] pc: rhel6.x has x2apic present on Conroe/Penryn/Nehalem CPU models
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 Conroe/Penryn/Nehalem CPU models all have x2apic enabled on rhel6.x
218e99
(added by RHEL-6 commit 19ab65a663cfdfa8365f3ec324af6b0ab26be5a1). Add
218e99
compat bits to make sure they are set on the rhel6.x machine-types.
218e99
218e99
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
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 a11a4b0..c5d82ab 100644
218e99
--- a/hw/i386/pc_piix.c
218e99
+++ b/hw/i386/pc_piix.c
218e99
@@ -864,6 +864,10 @@ static QEMUMachine pc_machine_rhel700 = {
218e99
 
218e99
 static void pc_init_rhel650(QEMUMachineInitArgs *args)
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
+    x86_cpu_compat_set_features("Westmere", FEAT_1_ECX, CPUID_EXT_X2APIC, 0);
218e99
     pc_init_rhel700(args);
218e99
 }
218e99
 
218e99
-- 
218e99
1.7.1
218e99