From: "Michael S. Tsirkin" <mst@redhat.com>
To: qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>,
Eduardo Habkost <ehabkost@redhat.com>,
Markus Armbruster <armbru@redhat.com>,
Paolo Bonzini <pbonzini@redhat.com>,
Igor Mammedov <imammedo@redhat.com>,
Laszlo Ersek <lersek@redhat.com>,
Richard Henderson <rth@twiddle.net>
Subject: [Qemu-devel] [PULL 22/23] q35: Remove unused q35-acpi-dsdt.aml file
Date: Wed, 24 Feb 2016 22:36:24 +0200 [thread overview]
Message-ID: <1456343639-3471-23-git-send-email-mst@redhat.com> (raw)
In-Reply-To: <1456343639-3471-1-git-send-email-mst@redhat.com>
From: Eduardo Habkost <ehabkost@redhat.com>
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>
---
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 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 d71b3a328ced5ce2cb16d153cfa7cda0aca966a4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 7344
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
--
MST
next prev parent reply other threads:[~2016-02-24 20:36 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-24 20:35 [Qemu-devel] [PULL 00/23] vhost, virtio, pci, pc Michael S. Tsirkin
2016-02-24 20:35 ` [Qemu-devel] [PULL 01/23] bios-linker-loader: document+validate input Michael S. Tsirkin
2016-02-24 20:35 ` [Qemu-devel] [PULL 02/23] vhost-user: don't merge regions with different fds Michael S. Tsirkin
2016-02-24 20:35 ` [Qemu-devel] [PULL 03/23] move get_current_ram_size to virtio-balloon.c Michael S. Tsirkin
2016-02-24 20:35 ` [Qemu-devel] [PULL 04/23] pc-dimm: rename pc_dimm_built_list() Michael S. Tsirkin
2016-02-24 20:35 ` [Qemu-devel] [PULL 05/23] pc-dimm: add pc_dimm_build_list() Michael S. Tsirkin
2016-02-25 7:01 ` Vladimir Sementsov-Ogievskiy
2016-02-25 8:39 ` Michael S. Tsirkin
2016-02-25 8:55 ` Vladimir Sementsov-Ogievskiy
2016-02-25 9:11 ` Michael S. Tsirkin
2016-02-25 9:54 ` Vladimir Sementsov-Ogievskiy
2016-02-25 10:09 ` Paolo Bonzini
2016-02-25 10:12 ` Michael S. Tsirkin
2016-02-25 10:22 ` Michael S. Tsirkin
2016-02-26 9:08 ` Vladimir Sementsov-Ogievskiy
2016-02-26 9:08 ` Vladimir Sementsov-Ogievskiy
2016-02-24 20:35 ` [Qemu-devel] [PULL 06/23] virtio-balloon: rewrite get_current_ram_size() Michael S. Tsirkin
2016-02-24 20:35 ` [Qemu-devel] [PULL 07/23] balloon: Use only 'pc-dimm' type dimm for ballooning Michael S. Tsirkin
2016-02-24 20:35 ` [Qemu-devel] [PULL 08/23] pci core: function pci_host_bus_register() cleanup Michael S. Tsirkin
2016-02-24 20:35 ` [Qemu-devel] [PULL 09/23] pci core: function pci_bus_init() cleanup Michael S. Tsirkin
2016-02-24 20:35 ` [Qemu-devel] [PULL 10/23] block-migration: acquire AioContext as necessary Michael S. Tsirkin
2016-02-24 20:35 ` [Qemu-devel] [PULL 11/23] vring: make vring_enable_notification return void Michael S. Tsirkin
2016-02-24 20:35 ` [Qemu-devel] [PULL 12/23] virtio: add AioContext-specific function for host notifiers Michael S. Tsirkin
2016-02-24 20:35 ` [Qemu-devel] [PULL 13/23] virtio: export vring_notify as virtio_should_notify Michael S. Tsirkin
2016-02-24 20:35 ` [Qemu-devel] [PULL 14/23] virtio-blk: fix "disabled data plane" mode Michael S. Tsirkin
2016-02-24 20:35 ` [Qemu-devel] [PULL 15/23] virtio-blk: do not use vring in dataplane Michael S. Tsirkin
2016-02-24 20:36 ` [Qemu-devel] [PULL 16/23] virtio-scsi: " Michael S. Tsirkin
2016-02-24 20:36 ` [Qemu-devel] [PULL 17/23] vring: remove Michael S. Tsirkin
2016-02-24 20:36 ` [Qemu-devel] [PULL 18/23] tests/vhost-user-bridge: fix build on 32 bit systems Michael S. Tsirkin
2016-02-24 20:36 ` [Qemu-devel] [PULL 19/23] q35: Remove old machine versions Michael S. Tsirkin
2016-02-24 20:36 ` [Qemu-devel] [PULL 20/23] machine: Remove no_tco field Michael S. Tsirkin
2016-02-24 20:36 ` [Qemu-devel] [PULL 21/23] ich9: Remove enable_tco arguments from init functions Michael S. Tsirkin
2016-02-24 20:36 ` Michael S. Tsirkin [this message]
2016-02-24 20:36 ` [Qemu-devel] [PULL 23/23] q35: No need to check gigabyte_align Michael S. Tsirkin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1456343639-3471-23-git-send-email-mst@redhat.com \
--to=mst@redhat.com \
--cc=armbru@redhat.com \
--cc=ehabkost@redhat.com \
--cc=imammedo@redhat.com \
--cc=lersek@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=rth@twiddle.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).