From 021746c131cdfeab9d82ff918795a9f18d20d7ae Mon Sep 17 00:00:00 2001 From: Wei Liu Date: Tue, 1 Nov 2016 17:44:16 +0000 Subject: PCMachineState: introduce acpi_build_enabled field Introduce this field to control whether ACPI build is enabled by a particular machine or accelerator. It defaults to true if the machine itself supports ACPI build. Xen accelerator will disable it because Xen is in charge of building ACPI tables for the guest. Signed-off-by: Wei Liu Signed-off-by: Stefano Stabellini Reviewed-by: Stefano Stabellini Reviewed-by: Eduardo Habkost Tested-by: Sander Eikelenboom --- xen-common.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'xen-common.c') diff --git a/xen-common.c b/xen-common.c index 909976071c..bacf962841 100644 --- a/xen-common.c +++ b/xen-common.c @@ -9,6 +9,7 @@ */ #include "qemu/osdep.h" +#include "hw/i386/pc.h" #include "hw/xen/xen_backend.h" #include "qmp-commands.h" #include "sysemu/char.h" @@ -114,6 +115,11 @@ static void xen_change_state_handler(void *opaque, int running, static int xen_init(MachineState *ms) { + PCMachineState *pcms = PC_MACHINE(ms); + + /* Disable ACPI build because Xen handles it */ + pcms->acpi_build_enabled = false; + xen_xc = xc_interface_open(0, 0, 0); if (xen_xc == NULL) { xen_pv_printf(NULL, 0, "can't open xen interface\n"); -- cgit 1.4.1