[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 21/22] target/i386: Remove X86CPU::kvm_no_smi_migration field
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH v4 21/22] target/i386: Remove X86CPU::kvm_no_smi_migration field |
Date: |
Tue, 16 Apr 2024 20:59:37 +0200 |
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>
---
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 6b05738079..5b016d6667 100644
--- a/target/i386/cpu.h
+++ b/target/i386/cpu.h
@@ -2018,9 +2018,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 33760a2ee1..f9991e7398 100644
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@ -7905,8 +7905,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 e68cbe9293..88f4a7da33 100644
--- a/target/i386/kvm/kvm.c
+++ b/target/i386/kvm/kvm.c
@@ -4337,6 +4337,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()) {
@@ -4351,12 +4352,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) {
--
2.41.0
- [PATCH v4 10/22] hw/i386/pc: Remove PCMachineClass::smbios_uuid_encoded, (continued)
- [PATCH v4 10/22] hw/i386/pc: Remove PCMachineClass::smbios_uuid_encoded, Philippe Mathieu-Daudé, 2024/04/16
- [PATCH v4 11/22] hw/smbios: Remove 'uuid_encoded' argument from smbios_set_defaults(), Philippe Mathieu-Daudé, 2024/04/16
- [PATCH v4 12/22] hw/smbios: Remove 'smbios_uuid_encoded', simplify smbios_encode_uuid(), Philippe Mathieu-Daudé, 2024/04/16
- [PATCH v4 13/22] hw/i386/pc: Remove PCMachineClass::enforce_aligned_dimm, Philippe Mathieu-Daudé, 2024/04/16
- [PATCH v4 14/22] hw/mem/pc-dimm: Remove legacy_align argument from pc_dimm_pre_plug(), Philippe Mathieu-Daudé, 2024/04/16
- [PATCH v4 15/22] hw/mem/memory-device: Remove legacy_align from memory_device_pre_plug(), Philippe Mathieu-Daudé, 2024/04/16
- [PATCH v4 16/22] hw/i386/pc: Remove deprecated pc-i440fx-2.2 machine, Philippe Mathieu-Daudé, 2024/04/16
- [PATCH v4 17/22] hw/i386/pc: Remove PCMachineClass::resizable_acpi_blob, Philippe Mathieu-Daudé, 2024/04/16
- [PATCH v4 18/22] hw/i386/pc: Remove PCMachineClass::rsdp_in_ram, Philippe Mathieu-Daudé, 2024/04/16
- [PATCH v4 20/22] hw/i386/pc: Remove deprecated pc-i440fx-2.3 machine, Philippe Mathieu-Daudé, 2024/04/16
- [PATCH v4 21/22] target/i386: Remove X86CPU::kvm_no_smi_migration field,
Philippe Mathieu-Daudé <=
- [PATCH v4 19/22] hw/i386/acpi: Remove AcpiBuildState::rsdp field, Philippe Mathieu-Daudé, 2024/04/16
- [PATCH v4 22/22] hw/i386/pc: Replace PCMachineClass::acpi_data_size by PC_ACPI_DATA_SIZE, Philippe Mathieu-Daudé, 2024/04/16
- Re: [PATCH v4 00/22] hw/i386: Remove deprecated pc-i440fx-2.0 -> 2.3 machines, Philippe Mathieu-Daudé, 2024/04/24