From 76abda27a42dfe08598b38582210f7aeb31e6685 Mon Sep 17 00:00:00 2001

From: Paolo Bonzini <pbonzini@redhat.com>

Date: Fri, 22 Nov 2019 11:53:46 +0000

Subject: [PATCH 13/16] target/i386: adjust for missing VMX features

RH-Author: Paolo Bonzini <pbonzini@redhat.com>

Message-id: <20191122115348.25000-14-pbonzini@redhat.com>

Patchwork-id: 92611

O-Subject: [RHEL8.2/rhel qemu-kvm PATCH 13/15] target/i386: adjust for missing VMX features

Bugzilla: 1689270

RH-Acked-by: Dr. David Alan Gilbert <dgilbert@redhat.com>

RH-Acked-by: Eduardo Habkost <ehabkost@redhat.com>

RH-Acked-by: Maxim Levitsky <mlevitsk@redhat.com>

vmx-exit-load-perf-global-ctrl and vmx-entry-load-perf-global-ctrl

have only been added to kernel 5.4, so disable them in RHEL until

we add them to the kernel.  At that point, they could be added back

to a new machine type.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>

---

 include/hw/i386/pc.h | 10 ++++++++++

 1 file changed, 10 insertions(+)

diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h

index 88ffd40..b546aed 100644

--- a/include/hw/i386/pc.h

+++ b/include/hw/i386/pc.h

@@ -968,6 +968,16 @@ extern void igd_passthrough_isa_bridge_create(PCIBus *bus, uint16_t gpu_dev_id);

 #define PC_RHEL_COMPAT \

         { /* PC_RHEL_COMPAT */ \

             .driver = TYPE_X86_CPU,\

+            .property = "vmx-exit-load-perf-global-ctrl",\

+            .value = "off",\

+        },\

+        { /* PC_RHEL_COMPAT */ \

+            .driver = TYPE_X86_CPU,\

+            .property = "vmx-entry-load-perf-global-ctrl",\

+            .value = "off",\

+        },\

+        { /* PC_RHEL_COMPAT */ \

+            .driver = TYPE_X86_CPU,\

             .property = "host-phys-bits",\

             .value = "on",\

         },\

-- 

1.8.3.1