yeahuh / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone
218e99
From 78fbb36235f35484e0ae0a124269b35288dd472b Mon Sep 17 00:00:00 2001
218e99
From: Eduardo Habkost <ehabkost@redhat.com>
218e99
Date: Tue, 20 Aug 2013 15:09:49 +0200
218e99
Subject: [PATCH 21/28] pc: set compat CPUID[0x80000001].EDX bits on Westmere for rhel6.x
218e99
218e99
RH-Author: Eduardo Habkost <ehabkost@redhat.com>
218e99
Message-id: <1377011392-9336-5-git-send-email-ehabkost@redhat.com>
218e99
Patchwork-id: 53611
218e99
O-Subject: [RHEL7 PATCH 4/7] pc: set compat CPUID[0x80000001].EDX bits on Westmere for rhel6.x
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
On RHEL-6 the Westmere CPU model has many CPU feature alias bits
218e99
incorrectly set on CPUID[0x80000001].EDX. This is a RHEL-6 bug (that
218e99
doesn't cause problems because those bits are documented as reserved on
218e99
Intel CPUs), but we need to keep exactly the same bits for compatibility
218e99
on the rhel6.x machine-types.
218e99
218e99
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
218e99
---
218e99
 hw/i386/pc_piix.c | 6 ++++++
218e99
 1 file changed, 6 insertions(+)
218e99
218e99
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
218e99
---
218e99
 hw/i386/pc_piix.c |    6 ++++++
218e99
 1 files changed, 6 insertions(+), 0 deletions(-)
218e99
218e99
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
218e99
index c5d82ab..d5dc04d 100644
218e99
--- a/hw/i386/pc_piix.c
218e99
+++ b/hw/i386/pc_piix.c
218e99
@@ -868,6 +868,12 @@ static void pc_init_rhel650(QEMUMachineInitArgs *args)
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
+    x86_cpu_compat_set_features("Westmere", FEAT_8000_0001_EDX,
218e99
+             CPUID_EXT2_FXSR | CPUID_EXT2_MMX | CPUID_EXT2_PAT |
218e99
+             CPUID_EXT2_CMOV | CPUID_EXT2_PGE | CPUID_EXT2_APIC |
218e99
+             CPUID_EXT2_CX8 | CPUID_EXT2_MCE | CPUID_EXT2_PAE | CPUID_EXT2_MSR |
218e99
+             CPUID_EXT2_TSC | CPUID_EXT2_PSE | CPUID_EXT2_DE | CPUID_EXT2_FPU,
218e99
+             0);
218e99
     pc_init_rhel700(args);
218e99
 }
218e99
 
218e99
-- 
218e99
1.7.1
218e99