[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 17/22] hw/i386/pc: Remove PCMachineClass::resizable_acpi_blob
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH v4 17/22] hw/i386/pc: Remove PCMachineClass::resizable_acpi_blob |
Date: |
Tue, 16 Apr 2024 20:59:33 +0200 |
PCMachineClass::resizable_acpi_blob was only used by the
pc-i440fx-2.2 machine, which got removed. It is now always
true. Remove it, simplifying acpi_build().
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Zhao Liu <zhao1.liu@intel.com>
---
include/hw/i386/pc.h | 3 ---
hw/i386/acpi-build.c | 10 ----------
hw/i386/pc.c | 1 -
3 files changed, 14 deletions(-)
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index df97df6ca7..10a8ffa0de 100644
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -124,9 +124,6 @@ struct PCMachineClass {
/* create kvmclock device even when KVM PV features are not exposed */
bool kvmclock_create_always;
- /* resizable acpi blob compat */
- bool resizable_acpi_blob;
-
/*
* whether the machine type implements broken 32-bit address space bound
* check for memory.
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index a6f8203460..ab2d4d8dcb 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -2688,16 +2688,6 @@ void acpi_build(AcpiBuildTables *tables, MachineState
*machine)
* keep the table size stable for all (max_cpus, max_memory_slots)
* combinations.
*/
- /* Make sure we have a buffer in case we need to resize the tables. */
- if ((tables_blob->len > ACPI_BUILD_TABLE_SIZE / 2) &&
- !pcmc->resizable_acpi_blob) {
- /* As of QEMU 2.1, this fires with 160 VCPUs and 255 memory slots. */
- warn_report("ACPI table size %u exceeds %d bytes,"
- " migration may not work",
- tables_blob->len, ACPI_BUILD_TABLE_SIZE / 2);
- error_printf("Try removing CPUs, NUMA nodes, memory slots"
- " or PCI bridges.\n");
- }
acpi_align_size(tables_blob, ACPI_BUILD_TABLE_SIZE);
acpi_align_size(tables->linker->cmd_blob, ACPI_BUILD_ALIGN_SIZE);
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index 18bef7c85e..c4a7885a3b 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -1755,7 +1755,6 @@ static void pc_machine_class_init(ObjectClass *oc, void
*data)
pcmc->acpi_data_size = 0x20000 + 0x8000;
pcmc->pvh_enabled = true;
pcmc->kvmclock_create_always = true;
- pcmc->resizable_acpi_blob = true;
x86mc->apic_xrupt_override = true;
assert(!mc->get_hotplug_handler);
mc->get_hotplug_handler = pc_get_hotplug_handler;
--
2.41.0
- [PATCH v4 08/22] hw/i386/pc: Remove deprecated pc-i440fx-2.1 machine, (continued)
- [PATCH v4 08/22] hw/i386/pc: Remove deprecated pc-i440fx-2.1 machine, 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 10/22] hw/i386/pc: Remove PCMachineClass::smbios_uuid_encoded, Philippe Mathieu-Daudé, 2024/04/16
- [PATCH v4 09/22] target/i386/kvm: Remove x86_cpu_change_kvm_default() and 'kvm-cpu.h', 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 20/22] hw/i386/pc: Remove deprecated pc-i440fx-2.3 machine, 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é <=
- [PATCH v4 18/22] hw/i386/pc: Remove PCMachineClass::rsdp_in_ram, Philippe Mathieu-Daudé, 2024/04/16
- [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
- [PATCH v4 21/22] target/i386: Remove X86CPU::kvm_no_smi_migration field, 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