diff options
| author | Stefan Hajnoczi <stefanha@redhat.com> | 2016-11-04 09:26:24 +0000 |
|---|---|---|
| committer | Stefan Hajnoczi <stefanha@redhat.com> | 2016-11-04 09:26:24 +0000 |
| commit | 9226682a401f34b10fd79dfe17ba334da0800747 (patch) | |
| tree | af3b43298cde18ae33b0ae2c90bc764a2ba7f191 /xen-common.c | |
| parent | 199a5bde46b0eab898ab1ec591f423000302569f (diff) | |
| parent | 021746c131cdfeab9d82ff918795a9f18d20d7ae (diff) | |
| download | focaccia-qemu-9226682a401f34b10fd79dfe17ba334da0800747.tar.gz focaccia-qemu-9226682a401f34b10fd79dfe17ba334da0800747.zip | |
Merge remote-tracking branch 'sstabellini/tags/xen-20161102-tag' into staging
Xen 2016/11/02 # gpg: Signature made Wed 02 Nov 2016 07:28:40 PM GMT # gpg: using RSA key 0x894F8F4870E1AE90 # gpg: Good signature from "Stefano Stabellini <sstabellini@kernel.org>" # gpg: aka "Stefano Stabellini <stefano.stabellini@eu.citrix.com>" # Primary key fingerprint: D04E 33AB A51F 67BA 07D3 0AEA 894F 8F48 70E1 AE90 * sstabellini/tags/xen-20161102-tag: PCMachineState: introduce acpi_build_enabled field hw/xen/xen_pvdev: Include qemu/log.h for qemu_log_vprintf() Message-id: alpine.DEB.2.10.1611021227530.19454@sstabellini-ThinkPad-X260 Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
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"); |