Commit 804ba7c1 authored by Anthony PERARD's avatar Anthony PERARD Committed by Stefano Stabellini
Browse files

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 021746c1.

Signed-off-by: default avatarAnthony PERARD <anthony.perard@citrix.com>
Signed-off-by: default avatarStefano Stabellini <sstabellini@kernel.org>
Reviewed-by: default avatarEduardo Habkost <ehabkost@redhat.com>
Reviewed-by: default avatarStefano Stabellini <sstabellini@kernel.org>
parent 207faf24

xen-common.c

+0 −6
Original line number Diff line number Diff line
@@ -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");

xen-hvm.c

+4 −0
Original line number Diff line number Diff line
@@ -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: