|
 |
958e1b |
From 2986c1070e031d290c268fba039e3eac97b28467 Mon Sep 17 00:00:00 2001
|
|
|
958e1b |
From: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
958e1b |
Date: Thu, 21 Aug 2014 19:58:17 +0200
|
|
|
958e1b |
Subject: [PATCH 2/3] pc: Add Broadwell CPUID compatibility bits
|
|
|
958e1b |
|
|
|
958e1b |
Message-id: <1408651097-24190-3-git-send-email-ehabkost@redhat.com>
|
|
|
958e1b |
Patchwork-id: 60671
|
|
|
958e1b |
O-Subject: [RHEL7.1 qemu-kvm PATCH 2/2] pc: Add Broadwell CPUID compatibility bits
|
|
|
958e1b |
Bugzilla: 1116117
|
|
|
958e1b |
RH-Acked-by: Bandan Das <bsd@redhat.com>
|
|
|
958e1b |
RH-Acked-by: Markus Armbruster <armbru@redhat.com>
|
|
|
958e1b |
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
958e1b |
|
|
|
958e1b |
On RHEL-6, the Broadwell CPU model won't have the RDTSCP and SMAP
|
|
|
958e1b |
features. Add compatibility code to ensure we stay compatible when
|
|
|
958e1b |
migrating from RHEL-6.
|
|
|
958e1b |
|
|
|
958e1b |
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
958e1b |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
958e1b |
---
|
|
|
958e1b |
hw/i386/pc_piix.c | 4 ++++
|
|
|
958e1b |
1 file changed, 4 insertions(+)
|
|
|
958e1b |
|
|
|
958e1b |
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
|
|
|
958e1b |
index 550acd8..4ea3f67 100644
|
|
|
958e1b |
--- a/hw/i386/pc_piix.c
|
|
|
958e1b |
+++ b/hw/i386/pc_piix.c
|
|
|
958e1b |
@@ -935,6 +935,10 @@ static void pc_compat_rhel650(QEMUMachineInitArgs *args)
|
|
|
958e1b |
CPUID_EXT2_CX8 | CPUID_EXT2_MCE | CPUID_EXT2_PAE | CPUID_EXT2_MSR |
|
|
|
958e1b |
CPUID_EXT2_TSC | CPUID_EXT2_PSE | CPUID_EXT2_DE | CPUID_EXT2_FPU,
|
|
|
958e1b |
0);
|
|
|
958e1b |
+ x86_cpu_compat_set_features("Broadwell", FEAT_8000_0001_EDX,
|
|
|
958e1b |
+ 0, CPUID_EXT2_RDTSCP);
|
|
|
958e1b |
+ x86_cpu_compat_set_features("Broadwell", FEAT_7_0_EBX,
|
|
|
958e1b |
+ 0, CPUID_7_0_EBX_SMAP);
|
|
|
958e1b |
|
|
|
958e1b |
/* RHEL-6 kernel never supported exposing RDTSCP */
|
|
|
958e1b |
x86_cpu_compat_set_features(NULL, FEAT_8000_0001_EDX, 0, CPUID_EXT2_RDTSCP);
|
|
|
958e1b |
--
|
|
|
958e1b |
1.8.3.1
|
|
|
958e1b |
|