diff mbox series

[PATCH-for-9.1,13/18] hw/i386/pc: Remove PCMachineClass::resizable_acpi_blob

Message ID 20240305134221.30924-14-philmd@linaro.org
State Superseded
Headers show
Series [PATCH-for-9.1,01/18] hw/i386/pc: Remove deprecated pc-i440fx-2.0 machine | expand

Commit Message

Philippe Mathieu-Daudé March 5, 2024, 1:42 p.m. UTC 
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>
---
 include/hw/i386/pc.h | 3 ---
 hw/i386/acpi-build.c | 9 ---------
 hw/i386/pc.c         | 1 -
 3 files changed, 13 deletions(-)

Comments

Thomas Huth March 6, 2024, 5:09 p.m. UTC | #1 
On 05/03/2024 14.42, Philippe Mathieu-Daudé wrote:
> 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>
> ---
>   include/hw/i386/pc.h | 3 ---
>   hw/i386/acpi-build.c | 9 ---------
>   hw/i386/pc.c         | 1 -
>   3 files changed, 13 deletions(-)
> 
> diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
> index f7a5f4f283..be3a58c972 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 8c7fad92e9..a56ac8dc90 100644
> --- a/hw/i386/acpi-build.c
> +++ b/hw/i386/acpi-build.c
> @@ -2688,15 +2688,6 @@ void acpi_build(AcpiBuildTables *tables, MachineState *machine)
>        * All this is for PIIX4, since QEMU 2.0 didn't support Q35 migration.
>        */
>       /* Make sure we have a buffer in case we need to resize the tables. */

Should the above comment be removed now, too?

> -    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);

  Thomas
diff mbox series

Patch

diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index f7a5f4f283..be3a58c972 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 8c7fad92e9..a56ac8dc90 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -2688,15 +2688,6 @@  void acpi_build(AcpiBuildTables *tables, MachineState *machine)
      * All this is for PIIX4, since QEMU 2.0 didn't support Q35 migration.
      */
     /* 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 a762df7686..8139cd4a7d 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -1768,7 +1768,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;