From 4a7bdc0ff912b66f57b83de6ee63c96760a84d4c Mon Sep 17 00:00:00 2001 From: Eduardo Habkost Date: Mon, 16 Sep 2013 20:39:56 +0200 Subject: [PATCH 091/212] pc: RHEL-6 had x2apic set on Opteron_G[123] RH-Author: Eduardo Habkost Message-id: <1379363997-11783-4-git-send-email-ehabkost@redhat.com> Patchwork-id: 54401 O-Subject: [RHEL7 PATCH 3/4] pc: RHEL-6 had x2apic set on Opteron_G[123] Bugzilla: 918907 RH-Acked-by: Bandan Das RH-Acked-by: Markus Armbruster RH-Acked-by: Miroslav Rezanina From: Eduardo Habkost Bugzilla: 918907 Upstream status: not applicable (RHEL-6-only quirk that is not going to be included upstream) Brew build: http://brewweb.devel.redhat.com/brew/taskinfo?taskID=6290888 The Opteron_G[123] CPU models had x2apic set since they were first added to RHEL-6, but they don't have it set upstream. We need to explicitly set it on pc_init_rhel650() to keep compatibility. Signed-off-by: Eduardo Habkost --- hw/i386/pc_piix.c | 4 ++++ 1 file changed, 4 insertions(+) Signed-off-by: Miroslav Rezanina --- hw/i386/pc_piix.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 27b6504..5075187 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -1050,6 +1050,10 @@ static void pc_init_rhel650(MachineState *machine) 0, CPUID_EXT2_RDTSCP); x86_cpu_compat_set_features("Haswell", FEAT_8000_0001_EDX, 0, CPUID_EXT2_RDTSCP); + + x86_cpu_compat_set_features("Opteron_G1", FEAT_1_ECX, CPUID_EXT_X2APIC, 0); + x86_cpu_compat_set_features("Opteron_G2", FEAT_1_ECX, CPUID_EXT_X2APIC, 0); + x86_cpu_compat_set_features("Opteron_G3", FEAT_1_ECX, CPUID_EXT_X2APIC, 0); pc_init_rhel700(machine); } -- 1.7.1