016a62
From 76abda27a42dfe08598b38582210f7aeb31e6685 Mon Sep 17 00:00:00 2001
016a62
From: Paolo Bonzini <pbonzini@redhat.com>
016a62
Date: Fri, 22 Nov 2019 11:53:46 +0000
016a62
Subject: [PATCH 13/16] target/i386: adjust for missing VMX features
016a62
016a62
RH-Author: Paolo Bonzini <pbonzini@redhat.com>
016a62
Message-id: <20191122115348.25000-14-pbonzini@redhat.com>
016a62
Patchwork-id: 92611
016a62
O-Subject: [RHEL8.2/rhel qemu-kvm PATCH 13/15] target/i386: adjust for missing VMX features
016a62
Bugzilla: 1689270
016a62
RH-Acked-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
016a62
RH-Acked-by: Eduardo Habkost <ehabkost@redhat.com>
016a62
RH-Acked-by: Maxim Levitsky <mlevitsk@redhat.com>
016a62
016a62
vmx-exit-load-perf-global-ctrl and vmx-entry-load-perf-global-ctrl
016a62
have only been added to kernel 5.4, so disable them in RHEL until
016a62
we add them to the kernel.  At that point, they could be added back
016a62
to a new machine type.
016a62
016a62
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
016a62
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
016a62
---
016a62
 include/hw/i386/pc.h | 10 ++++++++++
016a62
 1 file changed, 10 insertions(+)
016a62
016a62
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
016a62
index 88ffd40..b546aed 100644
016a62
--- a/include/hw/i386/pc.h
016a62
+++ b/include/hw/i386/pc.h
016a62
@@ -968,6 +968,16 @@ extern void igd_passthrough_isa_bridge_create(PCIBus *bus, uint16_t gpu_dev_id);
016a62
 #define PC_RHEL_COMPAT \
016a62
         { /* PC_RHEL_COMPAT */ \
016a62
             .driver = TYPE_X86_CPU,\
016a62
+            .property = "vmx-exit-load-perf-global-ctrl",\
016a62
+            .value = "off",\
016a62
+        },\
016a62
+        { /* PC_RHEL_COMPAT */ \
016a62
+            .driver = TYPE_X86_CPU,\
016a62
+            .property = "vmx-entry-load-perf-global-ctrl",\
016a62
+            .value = "off",\
016a62
+        },\
016a62
+        { /* PC_RHEL_COMPAT */ \
016a62
+            .driver = TYPE_X86_CPU,\
016a62
             .property = "host-phys-bits",\
016a62
             .value = "on",\
016a62
         },\
016a62
-- 
016a62
1.8.3.1
016a62