[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 3/6] acpi-build: disable with -no-acpi
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 3/6] acpi-build: disable with -no-acpi |
Date: |
Mon, 11 Nov 2013 18:06:22 +0200 |
QEMU will currently crash if started with -no-acpi flag
since acpi build code probes the PM device which isn't present
in this configuration.
To fix, don't expose ACPI tables to guest when acpi has been
disabled from command line.
Fixes LP# 1248854
https://bugs.launchpad.net/qemu/+bug/1248854
Reported-by: chao zhou <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Gerd Hoffmann <address@hidden>
---
hw/i386/acpi-build.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index 6cfa044..486e705 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -1182,6 +1182,11 @@ void acpi_setup(PcGuestInfo *guest_info)
return;
}
+ if (!acpi_enabled) {
+ ACPI_BUILD_DPRINTF(3, "ACPI disabled. Bailing out.\n");
+ return;
+ }
+
build_state = g_malloc0(sizeof *build_state);
build_state->guest_info = guest_info;
--
MST
- [Qemu-devel] [PULL 0/6] pci, pc, virtio bug fixes for 1.7, Michael S. Tsirkin, 2013/11/11
- [Qemu-devel] [PULL 1/6] Fix pc migration from qemu <= 1.5, Michael S. Tsirkin, 2013/11/11
- [Qemu-devel] [PULL 2/6] virtio-net: only delete bh that existed, Michael S. Tsirkin, 2013/11/11
- [Qemu-devel] [PULL 3/6] acpi-build: disable with -no-acpi,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 4/6] loader: drop return value for rom_add_blob_fixed, Michael S. Tsirkin, 2013/11/11
- [Qemu-devel] [PULL 5/6] Revert "hw/pci: partially handle pci master abort", Michael S. Tsirkin, 2013/11/11
- [Qemu-devel] [PULL 6/6] Revert "exec: limit system memory size", Michael S. Tsirkin, 2013/11/11