cryptospore / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone
218e99
From f28b055b5d576b9e5e87aa18bf655b53eff1571c Mon Sep 17 00:00:00 2001
218e99
From: Eduardo Habkost <ehabkost@redhat.com>
218e99
Date: Tue, 20 Aug 2013 15:09:51 +0200
218e99
Subject: [PATCH 23/28] pc: SandyBridge rhel6.x compat fixes
218e99
218e99
RH-Author: Eduardo Habkost <ehabkost@redhat.com>
218e99
Message-id: <1377011392-9336-7-git-send-email-ehabkost@redhat.com>
218e99
Patchwork-id: 53614
218e99
O-Subject: [RHEL7 PATCH 6/7] pc: SandyBridge rhel6.x compat fixes
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
This patch implements the following changes, to match the SandyBridge
218e99
CPU features on RHEL-6:
218e99
218e99
 * rhel6.3.0 and older don't have tsc-deadline on SandyBridge
218e99
   (commit 10ce057)
218e99
 * rhel6.5.0 and older don't have rdtscp on SandyBridge
218e99
218e99
Signed-off-by: Eduardo Habkost <ehabkost@raisama.net>
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 846e2ce..fb5256e 100644
218e99
--- a/hw/i386/pc_piix.c
218e99
+++ b/hw/i386/pc_piix.c
218e99
@@ -875,6 +875,8 @@ static void pc_init_rhel650(QEMUMachineInitArgs *args)
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
+    x86_cpu_compat_set_features("SandyBridge", FEAT_8000_0001_EDX,
218e99
+                                0, CPUID_EXT2_RDTSCP);
218e99
     pc_init_rhel700(args);
218e99
 }
218e99
 
218e99
@@ -961,6 +963,8 @@ static void pc_init_rhel630(QEMUMachineInitArgs *args)
218e99
 {
218e99
     disable_kvm_pv_eoi();
218e99
     enable_compat_apic_id_mode();
218e99
+    x86_cpu_compat_set_features("SandyBridge", FEAT_1_ECX,
218e99
+                                0, CPUID_EXT_TSC_DEADLINE_TIMER);
218e99
     pc_init_rhel640(args);
218e99
 }
218e99
 
218e99
-- 
218e99
1.7.1
218e99