From d625effaaebcc744531947209db5a4ec5aca0b0a Mon Sep 17 00:00:00 2001 From: "Dr. David Alan Gilbert" Date: Fri, 14 Dec 2018 18:20:55 +0000 Subject: [PATCH 3/5] i386: do not migrate MSR_SMI_COUNT on machine types <2.12 RH-Author: Dr. David Alan Gilbert Message-id: <20181214182056.20233-2-dgilbert@redhat.com> Patchwork-id: 83520 O-Subject: [RHEL8 qemu-kvm PATCH 1/2] i386: do not migrate MSR_SMI_COUNT on machine types <2.12 Bugzilla: 1659565 RH-Acked-by: Laurent Vivier RH-Acked-by: Eduardo Habkost RH-Acked-by: Paolo Bonzini From: Paolo Bonzini MSR_SMI_COUNT started being migrated in QEMU 2.12. Do not migrate it on older machine types, or the subsection causes a load failure for guests that use SMM. Signed-off-by: Paolo Bonzini (cherry picked from commit 990e0be2603511560168e1ad61f68294d951c39e) Signed-off-by: Danilo C. L. de Paula --- include/hw/i386/pc.h | 4 ++++ target/i386/cpu.c | 2 ++ target/i386/cpu.h | 1 + target/i386/machine.c | 2 +- 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index c29176d..dd473ca 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -311,6 +311,10 @@ bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *); #define PC_COMPAT_2_11 \ HW_COMPAT_2_11 \ {\ + .driver = TYPE_X86_CPU,\ + .property = "x-migrate-smi-count",\ + .value = "off",\ + },{\ .driver = "Skylake-Server" "-" TYPE_X86_CPU,\ .property = "clflushopt",\ .value = "off",\ diff --git a/target/i386/cpu.c b/target/i386/cpu.c index c37cd1e..c979feb 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -5398,6 +5398,8 @@ static Property x86_cpu_properties[] = { false), DEFINE_PROP_BOOL("vmware-cpuid-freq", X86CPU, vmware_cpuid_freq, true), DEFINE_PROP_BOOL("tcg-cpuid", X86CPU, expose_tcg, true), + DEFINE_PROP_BOOL("x-migrate-smi-count", X86CPU, migrate_smi_count, + true), /* * lecacy_cache defaults to true unless the CPU model provides its * own cache information (see x86_cpu_load_def()). diff --git a/target/i386/cpu.h b/target/i386/cpu.h index 58d5430..fb6caf4 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -1369,6 +1369,7 @@ struct X86CPU { bool expose_kvm; bool expose_tcg; bool migratable; + bool migrate_smi_count; bool max_features; /* Enable all supported features automatically */ uint32_t apic_id; diff --git a/target/i386/machine.c b/target/i386/machine.c index 5e9a19b..2a85c91 100644 --- a/target/i386/machine.c +++ b/target/i386/machine.c @@ -400,7 +400,7 @@ static bool msr_smi_count_needed(void *opaque) X86CPU *cpu = opaque; CPUX86State *env = &cpu->env; - return env->msr_smi_count != 0; + return cpu->migrate_smi_count && env->msr_smi_count != 0; } static const VMStateDescription vmstate_msr_smi_count = { -- 1.8.3.1