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