|
|
ae23c9 |
From 0fc66274cc8e22929a39e17b8d2280b222f1ae63 Mon Sep 17 00:00:00 2001
|
|
|
ae23c9 |
From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
|
|
|
ae23c9 |
Date: Fri, 14 Dec 2018 18:20:56 +0000
|
|
|
ae23c9 |
Subject: [PATCH 4/5] pc: x-migrate-smi-count to PC_RHEL_COMPAT
|
|
|
ae23c9 |
|
|
|
ae23c9 |
RH-Author: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
|
ae23c9 |
Message-id: <20181214182056.20233-3-dgilbert@redhat.com>
|
|
|
ae23c9 |
Patchwork-id: 83521
|
|
|
ae23c9 |
O-Subject: [RHEL8 qemu-kvm PATCH 2/2] pc: x-migrate-smi-count to PC_RHEL_COMPAT
|
|
|
ae23c9 |
Bugzilla: 1659565
|
|
|
ae23c9 |
RH-Acked-by: Laurent Vivier <lvivier@redhat.com>
|
|
|
ae23c9 |
RH-Acked-by: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
ae23c9 |
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
ae23c9 |
|
|
|
ae23c9 |
From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
|
|
|
ae23c9 |
|
|
|
ae23c9 |
MSR_SMI_COUNT started being migrated in QEMU 2.12 and in the 2.12
|
|
|
ae23c9 |
release this broke back migration to earlier versions; however
|
|
|
ae23c9 |
that didn't cause a problem on RHEL because it also relied on newer
|
|
|
ae23c9 |
kernel features that RHEL 7.* doesn't have.
|
|
|
ae23c9 |
|
|
|
ae23c9 |
QEMU 3.0 got a fix (in PC_COMPAT_2_11) to fix the 2.12->earlier
|
|
|
ae23c9 |
breakage, but given the kernel dependency, it makes more sense
|
|
|
ae23c9 |
for us to tie it to 8.* machine types and keep the feature off for
|
|
|
ae23c9 |
all 7.* machine types.
|
|
|
ae23c9 |
|
|
|
ae23c9 |
In the 2.12 world we're doing this in PC_RHEL_COMPAT.
|
|
|
ae23c9 |
|
|
|
ae23c9 |
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
|
ae23c9 |
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
|
|
ae23c9 |
---
|
|
|
ae23c9 |
include/hw/i386/pc.h | 5 +++++
|
|
|
ae23c9 |
1 file changed, 5 insertions(+)
|
|
|
ae23c9 |
|
|
|
ae23c9 |
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
|
|
|
ae23c9 |
index dd473ca..244d7b5 100644
|
|
|
ae23c9 |
--- a/include/hw/i386/pc.h
|
|
|
ae23c9 |
+++ b/include/hw/i386/pc.h
|
|
|
ae23c9 |
@@ -976,6 +976,11 @@ extern void igd_passthrough_isa_bridge_create(PCIBus *bus, uint16_t gpu_dev_id);
|
|
|
ae23c9 |
.driver = "vfio-pci",\
|
|
|
ae23c9 |
.property = "x-no-geforce-quirks",\
|
|
|
ae23c9 |
.value = "on",\
|
|
|
ae23c9 |
+ },\
|
|
|
ae23c9 |
+ { /* PC_RHEL_COMPAT from PC_COMPAT_2_11 bz 1659565 */ \
|
|
|
ae23c9 |
+ .driver = TYPE_X86_CPU,\
|
|
|
ae23c9 |
+ .property = "x-migrate-smi-count",\
|
|
|
ae23c9 |
+ .value = "off",\
|
|
|
ae23c9 |
},
|
|
|
ae23c9 |
|
|
|
ae23c9 |
/* Similar to PC_COMPAT_2_11 + PC_COMPAT_2_10, but:
|
|
|
ae23c9 |
--
|
|
|
ae23c9 |
1.8.3.1
|
|
|
ae23c9 |
|