mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xen: Fix xenpv machine initialisation

Browse Source 
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>
This commit is contained in:
Anthony PERARD 2016-11-08 14:07:22 +00:00 committed by Stefano Stabellini
parent 207faf24c5
commit 804ba7c10b
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
xen-common.c
View File

@ -9,7 +9,6 @@
*/ */
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "hw/i386/pc.h"
#include "hw/xen/xen_backend.h" #include "hw/xen/xen_backend.h"
#include "qmp-commands.h" #include "qmp-commands.h"
#include "sysemu/char.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) 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); xen_xc = xc_interface_open(0, 0, 0);
if (xen_xc == NULL) { if (xen_xc == NULL) {
xen_pv_printf(NULL, 0, "can't open xen interface\n"); xen_pv_printf(NULL, 0, "can't open xen interface\n");

4
xen-hvm.c
View File

@ -1316,6 +1316,10 @@ void xen_hvm_init(PCMachineState *pcms, MemoryRegion **ram_memory)
} }
xen_be_register_common(); xen_be_register_common();
xen_read_physmap(state); xen_read_physmap(state);
/* Disable ACPI build because Xen handles it */
pcms->acpi_build_enabled = false;
return; return;
err: err: