diff options
| author | Wei Liu <wei.liu2@citrix.com> | 2016-11-01 17:44:16 +0000 |
|---|---|---|
| committer | Stefano Stabellini <sstabellini@kernel.org> | 2016-11-02 12:26:12 -0700 |
| commit | 021746c131cdfeab9d82ff918795a9f18d20d7ae (patch) | |
| tree | 1c214de35643642fee2682fc697060f2ec9796d1 /xen-common.c | |
| parent | b5863634181a655bd2201cf51a363ac94a43f145 (diff) | |
| download | qemu-021746c131cdfeab9d82ff918795a9f18d20d7ae.tar.gz | |
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 <wei.liu2@citrix.com>
Signed-off-by: Stefano Stabellini <sstabellini@kernel.org>
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Tested-by: Sander Eikelenboom <linux@eikelenboom.it>
Diffstat (limited to 'xen-common.c')
| -rw-r--r-- | xen-common.c | 6 |
1 files changed, 6 insertions, 0 deletions
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"); |