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

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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@xxxxxxxxxx>
---
  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





[Index of Archives]     [KVM ARM]     [KVM ia64]     [KVM ppc]     [Virtualization Tools]     [Spice Development]     [Libvirt]     [Libvirt Users]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite Questions]     [Linux Kernel]     [Linux SCSI]     [XFree86]

  Powered by Linux