From 0fc66274cc8e22929a39e17b8d2280b222f1ae63 Mon Sep 17 00:00:00 2001
From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
Date: Fri, 14 Dec 2018 18:20:56 +0000
Subject: [PATCH 4/5] pc: x-migrate-smi-count to PC_RHEL_COMPAT

RH-Author: Dr. David Alan Gilbert <dgilbert@redhat.com>
Message-id: <20181214182056.20233-3-dgilbert@redhat.com>
Patchwork-id: 83521
O-Subject: [RHEL8 qemu-kvm PATCH 2/2] pc: x-migrate-smi-count to PC_RHEL_COMPAT
Bugzilla: 1659565
RH-Acked-by: Laurent Vivier <lvivier@redhat.com>
RH-Acked-by: Eduardo Habkost <ehabkost@redhat.com>
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>

From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>

MSR_SMI_COUNT started being migrated in QEMU 2.12 and in the 2.12
release this broke back migration to earlier versions;  however
that didn't cause a problem on RHEL because it also relied on newer
kernel features that RHEL 7.* doesn't have.

QEMU 3.0 got a fix (in PC_COMPAT_2_11) to fix the 2.12->earlier
breakage, but given the kernel dependency, it makes more sense
for us to tie it to 8.* machine types and keep the feature off for
all 7.* machine types.

In the 2.12 world we're doing this in PC_RHEL_COMPAT.

Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
---
 include/hw/i386/pc.h | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index dd473ca..244d7b5 100644
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -976,6 +976,11 @@ extern void igd_passthrough_isa_bridge_create(PCIBus *bus, uint16_t gpu_dev_id);
             .driver = "vfio-pci",\
             .property = "x-no-geforce-quirks",\
             .value = "on",\
+        },\
+        { /* PC_RHEL_COMPAT from PC_COMPAT_2_11 bz 1659565 */ \
+            .driver   = TYPE_X86_CPU,\
+            .property = "x-migrate-smi-count",\
+            .value    = "off",\
         },
 
 /* Similar to PC_COMPAT_2_11 + PC_COMPAT_2_10, but:
-- 
1.8.3.1