From 75fb3d286eae1b0f7a93897be2d67f42dc466e8e Mon Sep 17 00:00:00 2001 From: Eduardo Habkost Date: Sat, 23 Jan 2016 14:02:12 -0200 Subject: [PATCH] q35: Remove unused q35-acpi-dsdt.aml file The file was used only by older machine-types, and it is not needed anymore. Signed-off-by: Eduardo Habkost Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin Reviewed-by: Laszlo Ersek Reviewed-by: Markus Armbruster Reviewed-by: Igor Mammedov --- Makefile | 2 +- hw/i386/pc_q35.c | 4 ---- pc-bios/q35-acpi-dsdt.aml | Bin 7344 -> 0 bytes 3 files changed, 1 insertion(+), 5 deletions(-) delete mode 100644 pc-bios/q35-acpi-dsdt.aml diff --git a/Makefile b/Makefile index 16db398c6f..70e3ebcd50 100644 --- a/Makefile +++ b/Makefile @@ -391,7 +391,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 \ +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 \ diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 06a5f9524c..da28d7774b 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -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(); diff --git a/pc-bios/q35-acpi-dsdt.aml b/pc-bios/q35-acpi-dsdt.aml deleted file mode 100644 index d71b3a328ced5ce2cb16d153cfa7cda0aca966a4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7344 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 -- 2.50.1