diff options
| author | Stefan Hajnoczi | 2016-11-21 16:29:55 +0100 |
|---|---|---|
| committer | Stefan Hajnoczi | 2016-11-21 16:29:55 +0100 |
| commit | ab9125c021e0901794dca7c55702d8ee5efd75fa (patch) | |
| tree | da3d54a7d5b27bcba053078750c39718d16c53c7 | |
| parent | Merge remote-tracking branch 'mst/tags/for_upstream' into staging (diff) | |
| parent | xen: Fix xenpv machine initialisation (diff) | |
| download | qemu-ab9125c021e0901794dca7c55702d8ee5efd75fa.tar.gz qemu-ab9125c021e0901794dca7c55702d8ee5efd75fa.tar.xz qemu-ab9125c021e0901794dca7c55702d8ee5efd75fa.zip | |
Merge remote-tracking branch 'sstabellini/tags/xen-20161108-tag' into staging
Xen 2016/11/08
# gpg: Signature made Tue 08 Nov 2016 07:48:12 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-20161108-tag:
xen: Fix xenpv machine initialisation
Message-id: alpine.DEB.2.10.1611081150170.3491@sstabellini-ThinkPad-X260
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
| -rw-r--r-- | xen-common.c | 6 | ||||
| -rw-r--r-- | xen-hvm.c | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/xen-common.c b/xen-common.c index bacf962841..909976071c 100644 --- a/xen-common.c +++ b/xen-common.c @@ -9,7 +9,6 @@ */ #include "qemu/osdep.h" -#include "hw/i386/pc.h" #include "hw/xen/xen_backend.h" #include "qmp-commands.h" #include "sysemu/char.h" @@ -115,11 +114,6 @@ 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"); @@ -1316,6 +1316,10 @@ void xen_hvm_init(PCMachineState *pcms, MemoryRegion **ram_memory) } xen_be_register_common(); xen_read_physmap(state); + + /* Disable ACPI build because Xen handles it */ + pcms->acpi_build_enabled = false; + return; err: |