diff options
| author | Anthony PERARD <anthony.perard@citrix.com> | 2016-11-08 14:07:22 +0000 |
|---|---|---|
| committer | Stefano Stabellini <sstabellini@kernel.org> | 2016-11-08 11:17:30 -0800 |
| commit | 804ba7c10bbc66bb8a8aa73ecc60f620da7423d5 (patch) | |
| tree | 2258272459dec9243cbb45c28e39787c51f444aa /xen-common.c | |
| parent | 207faf24c58859f5240f66bf6decc33b87a1776e (diff) | |
| download | qemu-804ba7c10bbc66bb8a8aa73ecc60f620da7423d5.zip qemu-804ba7c10bbc66bb8a8aa73ecc60f620da7423d5.tar.gz qemu-804ba7c10bbc66bb8a8aa73ecc60f620da7423d5.tar.bz2 | |
xen: Fix xenpv machine initialisation
When using QEMU for Xen PV guest, QEMU abort with:
xen-common.c:118:xen_init: Object 0x7f2b8325dcb0 is not an instance of type generic-pc-machine
This is because the machine 'xenpv' also use accel=xen. Moving the code
to xen_hvm_init() fix the issue.
This fix 021746c131cdfeab9d82ff918795a9f18d20d7ae.
Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
Signed-off-by: Stefano Stabellini <sstabellini@kernel.org>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
Diffstat (limited to 'xen-common.c')
| -rw-r--r-- | xen-common.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/xen-common.c b/xen-common.c index bacf962..9099760 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"); |