OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

acpi-build: disable with -no-acpi

Browse Source 
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 <chao.zhou@intel.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Michael S. Tsirkin 2013-11-07 14:12:05 +02:00
parent 6b9b8758c1
commit 81adc51315
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hw/i386/acpi-build.c
View File

@ -1182,6 +1182,11 @@ void acpi_setup(PcGuestInfo *guest_info)
return; return;
} }
if (!acpi_enabled) {
ACPI_BUILD_DPRINTF(3, "ACPI disabled. Bailing out.\n");
return;
}
build_state = g_malloc0(sizeof *build_state); build_state = g_malloc0(sizeof *build_state);
build_state->guest_info = guest_info; build_state->guest_info = guest_info;