cryptospore / rpms / qemu-kvm

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