218e99
From da27199bd3f4ec0e616330bcf7b4fb818eae50ab Mon Sep 17 00:00:00 2001
218e99
From: Eduardo Habkost <ehabkost@redhat.com>
218e99
Date: Tue, 20 Aug 2013 15:09:52 +0200
218e99
Subject: [PATCH 24/28] pc: Haswell doesn't have rdtscp on rhel6.x
218e99
218e99
RH-Author: Eduardo Habkost <ehabkost@redhat.com>
218e99
Message-id: <1377011392-9336-8-git-send-email-ehabkost@redhat.com>
218e99
Patchwork-id: 53615
218e99
O-Subject: [RHEL7 PATCH 7/7] pc: Haswell doesn't have rdtscp on 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
This adds compat code to disable rdtscp on the rhel6.x machine-types, to
218e99
match the features found on RHEL-6.
218e99
218e99
Signed-off-by: Eduardo Habkost <ehabkost@raisama.net>
218e99
---
218e99
 hw/i386/pc_piix.c | 2 ++
218e99
 1 file changed, 2 insertions(+)
218e99
218e99
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
218e99
---
218e99
 hw/i386/pc_piix.c |    2 ++
218e99
 1 files changed, 2 insertions(+), 0 deletions(-)
218e99
218e99
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
218e99
index fb5256e..da7701c 100644
218e99
--- a/hw/i386/pc_piix.c
218e99
+++ b/hw/i386/pc_piix.c
218e99
@@ -877,6 +877,8 @@ static void pc_init_rhel650(QEMUMachineInitArgs *args)
218e99
              0);
218e99
     x86_cpu_compat_set_features("SandyBridge", FEAT_8000_0001_EDX,
218e99
                                 0, CPUID_EXT2_RDTSCP);
218e99
+    x86_cpu_compat_set_features("Haswell", FEAT_8000_0001_EDX,
218e99
+                                0, CPUID_EXT2_RDTSCP);
218e99
     pc_init_rhel700(args);
218e99
 }
218e99
 
218e99
-- 
218e99
1.7.1
218e99