218e99
From 0bc3adc3b0a24625b1f8217abc1a50d7ce741191 Mon Sep 17 00:00:00 2001
218e99
From: Eduardo Habkost <ehabkost@redhat.com>
218e99
Date: Fri, 2 Aug 2013 14:08:53 +0200
218e99
Subject: pc: set compat "pmu" property for rhel6.x machine-types
218e99
218e99
RH-Author: Eduardo Habkost <ehabkost@redhat.com>
218e99
Message-id: <1375452533-12507-4-git-send-email-ehabkost@redhat.com>
218e99
Patchwork-id: 52934
218e99
O-Subject: [RHEL-7 PATCH 3/3] pc: set compat "pmu" property for rhel6.x machine-types
218e99
Bugzilla: 853101
218e99
RH-Acked-by: Bandan Das <bsd@redhat.com>
218e99
RH-Acked-by: Markus Armbruster <armbru@redhat.com>
218e99
RH-Acked-by: Gleb Natapov <gleb@redhat.com>
218e99
218e99
Bugzilla: 853101
218e99
Upstream status: not applicable
218e99
218e99
This adds compatibility values to the rhel6.* machine-types for the
218e99
"pmu" property on X86CPU:
218e99
218e99
 * rhel6.2 and older doesn't have vPMU support
218e99
 * rhel6.3 has the broken passthrough-mode vPMU enabled
218e99
 * rhel6.4 and newer have vPMU disabled by default
218e99
218e99
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
218e99
218e99
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
218e99
index e1bedec..bc67633 100644
218e99
--- a/hw/i386/pc_piix.c
218e99
+++ b/hw/i386/pc_piix.c
218e99
@@ -942,6 +942,10 @@ static QEMUMachine pc_machine_rhel640 = {
218e99
         .driver   = "virtio-scsi-pci",\
218e99
         .property = "param_change",\
218e99
         .value    = "off",\
218e99
+    },{\
218e99
+        .driver = TYPE_X86_CPU,\
218e99
+        .property = "pmu",\
218e99
+        .value = "on",\
218e99
     }
218e99
 
218e99
 static void pc_init_rhel630(QEMUMachineInitArgs *args)
218e99
@@ -964,7 +968,12 @@ static QEMUMachine pc_machine_rhel630 = {
218e99
 };
218e99
 
218e99
 #define PC_RHEL6_2_COMPAT \
218e99
-    PC_RHEL6_3_COMPAT
218e99
+    PC_RHEL6_3_COMPAT,\
218e99
+    {\
218e99
+        .driver = TYPE_X86_CPU,\
218e99
+        .property = "pmu",\
218e99
+        .value = "off",\
218e99
+    }
218e99
 
218e99
 static void pc_init_rhel620(QEMUMachineInitArgs *args)
218e99
 {