[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 24/55] q35: skip q35-acpi-dsdt.aml load if not needed
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 24/55] q35: skip q35-acpi-dsdt.aml load if not needed |
Date: |
Tue, 22 Dec 2015 18:53:48 +0200 |
From: Gerd Hoffmann <address@hidden>
Only old machine types which don't use the acpi builder (qemu 1.7 + older)
have to load that file for proper acpi support.
Signed-off-by: Gerd Hoffmann <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
hw/i386/pc_q35.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
index 342e9cf..942ef7e 100644
--- a/hw/i386/pc_q35.c
+++ b/hw/i386/pc_q35.c
@@ -117,7 +117,10 @@ static void pc_q35_init(MachineState *machine)
}
pc_cpus_init(pcms);
- pc_acpi_init("q35-acpi-dsdt.aml");
+ if (!pcmc->has_acpi_build) {
+ /* only machine types 1.7 & older need this */
+ pc_acpi_init("q35-acpi-dsdt.aml");
+ }
kvmclock_create();
--
MST
- [Qemu-devel] [PULL 15/55] ipmi: Add an external connection simulation interface, (continued)
- [Qemu-devel] [PULL 15/55] ipmi: Add an external connection simulation interface, Michael S. Tsirkin, 2015/12/22
- [Qemu-devel] [PULL 14/55] ipmi: Add a local BMC simulation, Michael S. Tsirkin, 2015/12/22
- [Qemu-devel] [PULL 17/55] ipmi: Add a BT low-level interface, Michael S. Tsirkin, 2015/12/22
- [Qemu-devel] [PULL 16/55] ipmi: Add an ISA KCS low-level interface, Michael S. Tsirkin, 2015/12/22
- [Qemu-devel] [PULL 18/55] ipmi: Add tests, Michael S. Tsirkin, 2015/12/22
- [Qemu-devel] [PULL 20/55] ipmi: Add migration capability to the IPMI devices., Michael S. Tsirkin, 2015/12/22
- [Qemu-devel] [PULL 19/55] ipmi: Add documentation, Michael S. Tsirkin, 2015/12/22
- [Qemu-devel] [PULL 23/55] ipmi: Add a force off function, Michael S. Tsirkin, 2015/12/22
- [Qemu-devel] [PULL 22/55] ipmi: Add firmware registration to the ISA interface, Michael S. Tsirkin, 2015/12/22
- [Qemu-devel] [PULL 21/55] ipmi: Add a firmware configuration repository, Michael S. Tsirkin, 2015/12/22
- [Qemu-devel] [PULL 24/55] q35: skip q35-acpi-dsdt.aml load if not needed,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 25/55] pc: Remove redundant code from pc-*-2.3 machine classes, Michael S. Tsirkin, 2015/12/22
- [Qemu-devel] [PULL 26/55] pc: Add pc-*-2.6 machine classes, Michael S. Tsirkin, 2015/12/22
- [Qemu-devel] [PULL 27/55] pc: Change indentation of PC_COMPAT_* to 4 spaces, Michael S. Tsirkin, 2015/12/22
- [Qemu-devel] [PULL 28/55] hw/compat.h: Change indentation of HW_COMPAT_* to 4 spaces, Michael S. Tsirkin, 2015/12/22
- [Qemu-devel] [PULL 30/55] nvdimm: implement NVDIMM device abstract, Michael S. Tsirkin, 2015/12/22
- [Qemu-devel] [PULL 29/55] docs/pci_expander_bridge: fix typo, Michael S. Tsirkin, 2015/12/22
- [Qemu-devel] [PULL 31/55] acpi: support specified oem table id for build_header, Michael S. Tsirkin, 2015/12/22
- [Qemu-devel] [PULL 32/55] nvdimm acpi: build ACPI NFIT table, Michael S. Tsirkin, 2015/12/22
- [Qemu-devel] [PULL 33/55] nvdimm acpi: build ACPI nvdimm devices, Michael S. Tsirkin, 2015/12/22
- [Qemu-devel] [PULL 34/55] nvdimm: add maintain info, Michael S. Tsirkin, 2015/12/22