Received: from eggs.gnu.org ([2001:4830:134:3::10]:59991) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c3lUP-0000Sj-C1 for qemu-devel@nongnu.org; Mon, 07 Nov 2016 10:05:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c3lUL-0006ML-I3 for qemu-devel@nongnu.org; Mon, 07 Nov 2016 10:05:37 -0500 Received: from smtp02.citrix.com ([66.165.176.63]:30959) by eggs.gnu.org with esmtps (TLS1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.71) (envelope-from ) id 1c3lUL-0006M6-Cb for qemu-devel@nongnu.org; Mon, 07 Nov 2016 10:05:33 -0500 From: Anthony PERARD Date: Mon, 7 Nov 2016 15:05:04 +0000 Message-ID: <20161107150504.6567-1-anthony.perard@citrix.com> MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [PATCH] xen: Fix xenpv machine initialisation List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Anthony PERARD , xen-devel@lists.xen.org, Wei Liu , Eduardo Habkost , Stefano Stabellini 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. This fix 021746c131cdfeab9d82ff918795a9f18d20d7ae Signed-off-by: Anthony PERARD --- CC: Wei Liu CC: Eduardo Habkost --- xen-common.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/xen-common.c b/xen-common.c index bacf962..22683b0 100644 --- a/xen-common.c +++ b/xen-common.c @@ -115,10 +115,12 @@ static void xen_change_state_handler(void *opaque, int running, static int xen_init(MachineState *ms) { - PCMachineState *pcms = PC_MACHINE(ms); + if (object_dynamic_cast(OBJECT(ms), TYPE_PC_MACHINE)) { + PCMachineState *pcms = PC_MACHINE(ms); - /* Disable ACPI build because Xen handles it */ - pcms->acpi_build_enabled = false; + /* Disable ACPI build because Xen handles it */ + pcms->acpi_build_enabled = false; + } xen_xc = xc_interface_open(0, 0, 0); if (xen_xc == NULL) { -- Anthony PERARD