| Message ID | 20240617071118.60464-23-philmd@linaro.org (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | hw/i386: Remove deprecated pc-i440fx-2.0 -> 2.3 machines | expand |
On Mon, 17 Jun 2024 09:11:17 +0200 Philippe Mathieu-Daudé <philmd@linaro.org> wrote: > X86CPU::kvm_no_smi_migration was only used by the > pc-i440fx-2.3 machine, which got removed. Remove it > and simplify kvm_put_vcpu_events(). > > Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> > Reviewed-by: Zhao Liu <zhao1.liu@intel.com> > Reviewed-by: Thomas Huth <thuth@redhat.com> Reviewed-by: Igor Mammedov <imammedo@redhat.com> > --- > target/i386/cpu.h | 3 --- > target/i386/cpu.c | 2 -- > target/i386/kvm/kvm.c | 7 +------ > 3 files changed, 1 insertion(+), 11 deletions(-) > > diff --git a/target/i386/cpu.h b/target/i386/cpu.h > index 8fe28b67e0..bba1d73aed 100644 > --- a/target/i386/cpu.h > +++ b/target/i386/cpu.h > @@ -2107,9 +2107,6 @@ struct ArchCPU { > /* if set, limit maximum value for phys_bits when host_phys_bits is true */ > uint8_t host_phys_bits_limit; > > - /* Stop SMI delivery for migration compatibility with old machines */ > - bool kvm_no_smi_migration; > - > /* Forcefully disable KVM PV features not exposed in guest CPUIDs */ > bool kvm_pv_enforce_cpuid; > > diff --git a/target/i386/cpu.c b/target/i386/cpu.c > index 7466217d5e..a5af56405b 100644 > --- a/target/i386/cpu.c > +++ b/target/i386/cpu.c > @@ -8283,8 +8283,6 @@ static Property x86_cpu_properties[] = { > DEFINE_PROP_BOOL("x-vendor-cpuid-only", X86CPU, vendor_cpuid_only, true), > DEFINE_PROP_BOOL("lmce", X86CPU, enable_lmce, false), > DEFINE_PROP_BOOL("l3-cache", X86CPU, enable_l3_cache, true), > - DEFINE_PROP_BOOL("kvm-no-smi-migration", X86CPU, kvm_no_smi_migration, > - false), > DEFINE_PROP_BOOL("kvm-pv-enforce-cpuid", X86CPU, kvm_pv_enforce_cpuid, > false), > DEFINE_PROP_BOOL("vmware-cpuid-freq", X86CPU, vmware_cpuid_freq, true), > diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c > index 912f5d5a6b..7ad8072748 100644 > --- a/target/i386/kvm/kvm.c > +++ b/target/i386/kvm/kvm.c > @@ -4474,6 +4474,7 @@ static int kvm_put_vcpu_events(X86CPU *cpu, int level) > events.sipi_vector = env->sipi_vector; > > if (has_msr_smbase) { > + events.flags |= KVM_VCPUEVENT_VALID_SMM; > events.smi.smm = !!(env->hflags & HF_SMM_MASK); > events.smi.smm_inside_nmi = !!(env->hflags2 & HF2_SMM_INSIDE_NMI_MASK); > if (kvm_irqchip_in_kernel()) { > @@ -4488,12 +4489,6 @@ static int kvm_put_vcpu_events(X86CPU *cpu, int level) > events.smi.pending = 0; > events.smi.latched_init = 0; > } > - /* Stop SMI delivery on old machine types to avoid a reboot > - * on an inward migration of an old VM. > - */ > - if (!cpu->kvm_no_smi_migration) { > - events.flags |= KVM_VCPUEVENT_VALID_SMM; > - } > } > > if (level >= KVM_PUT_RESET_STATE) {
diff --git a/target/i386/cpu.h b/target/i386/cpu.h index 8fe28b67e0..bba1d73aed 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -2107,9 +2107,6 @@ struct ArchCPU { /* if set, limit maximum value for phys_bits when host_phys_bits is true */ uint8_t host_phys_bits_limit; - /* Stop SMI delivery for migration compatibility with old machines */ - bool kvm_no_smi_migration; - /* Forcefully disable KVM PV features not exposed in guest CPUIDs */ bool kvm_pv_enforce_cpuid; diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 7466217d5e..a5af56405b 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -8283,8 +8283,6 @@ static Property x86_cpu_properties[] = { DEFINE_PROP_BOOL("x-vendor-cpuid-only", X86CPU, vendor_cpuid_only, true), DEFINE_PROP_BOOL("lmce", X86CPU, enable_lmce, false), DEFINE_PROP_BOOL("l3-cache", X86CPU, enable_l3_cache, true), - DEFINE_PROP_BOOL("kvm-no-smi-migration", X86CPU, kvm_no_smi_migration, - false), DEFINE_PROP_BOOL("kvm-pv-enforce-cpuid", X86CPU, kvm_pv_enforce_cpuid, false), DEFINE_PROP_BOOL("vmware-cpuid-freq", X86CPU, vmware_cpuid_freq, true), diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c index 912f5d5a6b..7ad8072748 100644 --- a/target/i386/kvm/kvm.c +++ b/target/i386/kvm/kvm.c @@ -4474,6 +4474,7 @@ static int kvm_put_vcpu_events(X86CPU *cpu, int level) events.sipi_vector = env->sipi_vector; if (has_msr_smbase) { + events.flags |= KVM_VCPUEVENT_VALID_SMM; events.smi.smm = !!(env->hflags & HF_SMM_MASK); events.smi.smm_inside_nmi = !!(env->hflags2 & HF2_SMM_INSIDE_NMI_MASK); if (kvm_irqchip_in_kernel()) { @@ -4488,12 +4489,6 @@ static int kvm_put_vcpu_events(X86CPU *cpu, int level) events.smi.pending = 0; events.smi.latched_init = 0; } - /* Stop SMI delivery on old machine types to avoid a reboot - * on an inward migration of an old VM. - */ - if (!cpu->kvm_no_smi_migration) { - events.flags |= KVM_VCPUEVENT_VALID_SMM; - } } if (level >= KVM_PUT_RESET_STATE) {