Commit 81adc513 authored by Michael S. Tsirkin's avatar Michael S. Tsirkin
Browse files

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: default avatarchao zhou <chao.zhou@intel.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Reviewed-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent 6b9b8758

hw/i386/acpi-build.c

+5 −0
Original line number Diff line number Diff line
@@ -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;