pc: drop AML files

This is a lightly tested patchset that shows how it's possible to clean out old bits without breaking any user configs. It's quite a lot of bits, too, since we are dealing with binaries here. Will test later if this is received favorably. As a bonus, seabios will be able to drop q35-acpi-dsdt.dsl if it wants to.

Michael S. Tsirkin (4):
pc/piix: drop acpi-dsdt.aml
pc/q35: drop compatiility with old bios types
pc/q35: drop dsdt aml
configure: don't install aml links

 configure                 |   1 -
 Makefile                  |   1 -
 hw/i386/pc_q35.c          |   8 --------
 pc-bios/acpi-dsdt.aml     | Bin 4405 -> 0 bytes
 pc-bios/q35-acpi-dsdt.aml | Bin 7344 -> 0 bytes
 5 files changed, 9 deletions(-)
 delete mode 100644 pc-bios/acpi-dsdt.aml
 delete mode 100644 pc-bios/q35-acpi-dsdt.aml

MST

commit 9fb7aaaf4c58c9108327f0ae4766087e3e496b47 ("pc: drop external DSDT loading") removes the only use of acpi-dsdt.aml. It's safe to drop it from QEMU source.

---
 Makefile              |   2 +-
 pc-bios/acpi-dsdt.aml | Bin 4405 -> 0 bytes
 2 files changed, 1 insertion(+), 1 deletion(-)
 delete mode 100644 pc-bios/acpi-dsdt.aml

index d0de2d4..fa36a48 100644
@@ -390,7 +390,7 @@ bepo    cz
 ifdef INSTALL_BLOBS
 BLOBS=bios.bin bios-256k.bin sgabios.bin vgabios.bin vgabios-cirrus.bin \
 vgabios-stdvga.bin vgabios-vmware.bin vgabios-qxl.bin vgabios-virtio.bin \
-acpi-dsdt.aml q35-acpi-dsdt.aml \
+q35-acpi-dsdt.aml \
 ppc_rom.bin openbios-sparc32 openbios-sparc64 openbios-ppc QEMU,tcx.bin QEMU,cgthree.bin \
 pxe-e1000.rom pxe-eepro100.rom pxe-ne2k_pci.rom \
 pxe-pcnet.rom pxe-rtl8139.rom pxe-virtio.rom \

deleted file mode 100644
index 558c10f51ccbbf9ec2f47a4a998a7055059a8963..0000000000000000000000000000000000000000
GIT binary patch

MST

We don't ship bios without support for loading ACPI anymore, and old q35 machine types don't allow migrating such bios. Drop it, as well as has_*mr flags that are there for migration compatibility.

---
 hw/i386/pc_q35.c | 8 --------
 1 file changed, 8 deletions(-)

index 208a224..22a0fdc 100644
@@ -116,10 +116,6 @@ static void pc_q35_init(MachineState *machine)
     }
 
     pc_cpus_init(pcms);
-    if (!pcmc->has_acpi_build) {
-        /* only machine types 1.7 & older need this */
-        pc_acpi_init("q35-acpi-dsdt.aml");
-    }
 
     kvmclock_create();
 

@@ -435,7 +431,6 @@ static void pc_q35_1_7_machine_options(MachineClass *m)
     pc_q35_2_0_machine_options(m);
     m->hw_version = "1.7.0";
     m->default_machine_opts = NULL;
-    m->option_rom_has_mr = true;
     SET_MACHINE_COMPAT(m, PC_COMPAT_1_7);
     pcmc->smbios_defaults = false;
     pcmc->gigabyte_align = false;

@@ -447,12 +442,9 @@ DEFINE_Q35_MACHINE(v1_7, "pc-q35-1.7", pc_compat_1_7,
 
 static void pc_q35_1_6_machine_options(MachineClass *m)
 {
-    PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
     pc_q35_machine_options(m);
     m->hw_version = "1.6.0";
-    m->rom_file_has_mr = false;
     SET_MACHINE_COMPAT(m, PC_COMPAT_1_6);
-    pcmc->has_acpi_build = false;
 }
 
 DEFINE_Q35_MACHINE(v1_6, "pc-q35-1.6", pc_compat_1_6,

MST

Wouldn't that break migration between 2.5 and 2.6 with -M q35-1.6 ? It's also a guest-visible change as acpi tables change ...

I'm all for cleaning up this old cruft, but I think it would be cleaner to just drop the old (pre-migration support) q35 machine types instead of changing them in subtle ways ...

cheers,
Gerd

I think I said this somewhere but I'll repeat it here: I think we should just mark the old machine types non migrateable.

acpi tables change yes but not too much - there are just bugfixes. We change acpi tables without versioning within reason.
For example, recent change by Igor completely removed SSDT and affected old machine types too.

Easier, sure. Not sure about the cleaner ...

MST

If you are making changes that break migration, I believe you need to mark the machines as non-migratable before making those changes.

...or we could stop wasting time changing those old machines and remove them.

Eduardo

Madness.

Yup.

DSDT AML binary is now unused, drop it.

---
 Makefile                  |   1 -
 pc-bios/q35-acpi-dsdt.aml | Bin 7344 -> 0 bytes
 2 files changed, 1 deletion(-)
 delete mode 100644 pc-bios/q35-acpi-dsdt.aml

index fa36a48..bc9444a 100644
@@ -390,7 +390,6 @@ bepo    cz
 ifdef INSTALL_BLOBS
 BLOBS=bios.bin bios-256k.bin sgabios.bin vgabios.bin vgabios-cirrus.bin \
 vgabios-stdvga.bin vgabios-vmware.bin vgabios-qxl.bin vgabios-virtio.bin \
-q35-acpi-dsdt.aml \
 ppc_rom.bin openbios-sparc32 openbios-sparc64 openbios-ppc QEMU,tcx.bin QEMU,cgthree.bin \
 pxe-e1000.rom pxe-eepro100.rom pxe-ne2k_pci.rom \
 pxe-pcnet.rom pxe-rtl8139.rom pxe-virtio.rom \

deleted file mode 100644
index d71b3a328ced5ce2cb16d153cfa7cda0aca966a4..0000000000000000000000000000000000000000
GIT binary patch

MST

There aren't any left.

---
 configure | 1 -
 1 file changed, 1 deletion(-)

index d4411a1..06cb815 100755
@@ -5967,7 +5967,6 @@ FILES="$FILES roms/seabios/Makefile roms/vgabios/Makefile"
 FILES="$FILES pc-bios/qemu-icon.bmp"
 for bios_file in \
     $source_path/pc-bios/*.bin \
-    $source_path/pc-bios/*.aml \
     $source_path/pc-bios/*.rom \
     $source_path/pc-bios/*.dtb \
     $source_path/pc-bios/*.img \

MST