summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEduardo Habkost <ehabkost@redhat.com>2016-01-23 14:02:12 -0200
committerTimothy Pearson <tpearson@raptorengineering.com>2019-11-29 19:45:58 -0600
commit871c1c6aab66a186d83e6b11704a2bec2e55624d (patch)
tree9edc514eef1f7121143409962bcc45ddc7ca1317
parent982e56c6687bbbdbcf80288ceb1342b0012a6122 (diff)
downloadhqemu-871c1c6aab66a186d83e6b11704a2bec2e55624d.zip
hqemu-871c1c6aab66a186d83e6b11704a2bec2e55624d.tar.gz
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 <ehabkost@redhat.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Reviewed-by: Laszlo Ersek <lersek@redhat.com> Reviewed-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Igor Mammedov <imammedo@redhat.com>
-rw-r--r--Makefile2
-rw-r--r--hw/i386/pc_q35.c4
-rw-r--r--pc-bios/q35-acpi-dsdt.amlbin7344 -> 0 bytes
3 files changed, 1 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 16db398..70e3ebc 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 06a5f95..da28d77 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 d71b3a3..0000000
--- a/pc-bios/q35-acpi-dsdt.aml
+++ /dev/null
Binary files differ
OpenPOWER on IntegriCloud