acpi-build: disable with -no-acpi
PATCH 1/1 acpi-build: disable with -no-acpi
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 <[email protected]>
Signed-off-by Michael S. Tsirkin <[email protected]>
--- hw/i386/acpi-build.c | 5 +++++ 1 file changed, 5 insertions(+)
hw/i386/acpi-build.c +5 -0
@@ -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;
Signature · 1 line
MST
hw/i386/acpi-build.c void acpi_setup(PcGuestInfo *guest_info) · line 1188
Quoted 4 lines · Michael S. Tsirkin
hw/i386/acpi-build.c +4
-0+if (!acpi_enabled) { +ACPI_BUILD_DPRINTF (3 ,"ACPI disabled. Bailing out.\n" ); +return ; + }
Reviewed-by Gerd Hoffmann <[email protected]>
cheers,
Gerd
Quoted 7 lines · Gerd Hoffmann
hw/i386/acpi-build.c void acpi_setup(PcGuestInfo *guest_info) · line 1188
Quoted 4 lines · Michael S. Tsirkin
hw/i386/acpi-build.c +4
-0+if (!acpi_enabled) { +ACPI_BUILD_DPRINTF (3 ,"ACPI disabled. Bailing out.\n" ); +return ; + }Reviewed-by Gerd Hoffmann <[email protected]>
Apropos, long term if someone's inclined it's possible to look at enabling acpi on stripped down systems without pm or pci.
Probably not a high priority project ...
Quoted 3 lines
cheers,
Gerd