On Tue, 8 Nov 2016, Anthony PERARD wrote:
> 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.per...@citrix.com>
Reviewed-by: Stefano Stabellini <sstabell...@kernel.org>
> CC: Wei Liu <wei.l...@citrix.com>
> CC: Eduardo Habkost <ehabk...@redhat.com>
> ---
> xen-common.c | 6 ------
> xen-hvm.c | 4 ++++
> 2 files changed, 4 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");
> diff --git a/xen-hvm.c b/xen-hvm.c
> index 2f348ed..150c7e7 100644
> --- a/xen-hvm.c
> +++ b/xen-hvm.c
> @@ -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:
> --
> Anthony PERARD
>
