From patchwork Mon Nov 7 15:05:04 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 9415371 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3C16560512 for ; Mon, 7 Nov 2016 15:08:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 30A1E28BCB for ; Mon, 7 Nov 2016 15:08:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 25B7528BCE; Mon, 7 Nov 2016 15:08:15 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id AEBE628BCB for ; Mon, 7 Nov 2016 15:08:14 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1c3lUO-00012B-Jx; Mon, 07 Nov 2016 15:05:36 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1c3lUM-00011z-Pn for xen-devel@lists.xen.org; Mon, 07 Nov 2016 15:05:34 +0000 Received: from [85.158.143.35] by server-8.bemta-6.messagelabs.com id 6A/EC-19686-E3890285; Mon, 07 Nov 2016 15:05:34 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrOLMWRWlGSWpSXmKPExsXitHSDva7tDIU Ig1dPlC2WfFzM4sDocXT3b6YAxijWzLyk/IoE1oyjn5MK2jgrFnX0MDYw7mbvYuTkkBDwl+i7 080IYrMJGEismH4VzBYRkJbon9MOVMPFwSxwiFFi6eb3QAkODmEBM4mLL+VBTBYBFYmpE5VAy nkFbCXuv7/CCDFSXmLh+SNMILaQgJrEjYXLWCBqBCVOznwCZjMLSEgcfPGCGaKeW+L26anMEx h5ZiEpm4WkbAEj0ypGjeLUorLUIl1jA72kosz0jJLcxMwcXUMDM73c1OLixPTUnMSkYr3k/Nx NjMAAYQCCHYx/1wYeYpTkYFIS5b0aqxAhxJeUn1KZkVicEV9UmpNafIhRhoNDSYL31jSgnGBR anpqRVpmDjBUYdISHDxKIrzC04HSvMUFibnFmekQqVOMilLivPdB+gRAEhmleXBtsPi4xCgrJ czLCHSIEE9BalFuZgmq/CtGcQ5GJWFeC5DxPJl5JXDTXwEtZgJaXBUDtrgkESEl1cBYKPlXzG N3w5U1i435zt4vevx3p0Zk8VSu/OJVkdv3yKhWaJyc/L/5SXClLK/t7t83WR5YeLgLXg75Omf J83IZb/2gG4u9Oq+lPv7TZyK7aK386tN2SW0xs+ZVKyxeWtd8ck92zN/vJbJPXLgmz9wh9rvH mEusoXp1mvu+HT87d1WwzdxfE/ZCiaU4I9FQi7moOBEA5w/nE4oCAAA= X-Env-Sender: prvs=112260614=anthony.perard@citrix.com X-Msg-Ref: server-11.tower-21.messagelabs.com!1478531131!41998131!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 9.0.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 52462 invoked from network); 7 Nov 2016 15:05:33 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-11.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 7 Nov 2016 15:05:33 -0000 X-IronPort-AV: E=Sophos;i="5.31,606,1473120000"; d="scan'208";a="396819325" From: Anthony PERARD To: Date: Mon, 7 Nov 2016 15:05:04 +0000 Message-ID: <20161107150504.6567-1-anthony.perard@citrix.com> X-Mailer: git-send-email 2.10.2 MIME-Version: 1.0 X-DLP: MIA2 Cc: Anthony PERARD , Stefano Stabellini , Wei Liu , Eduardo Habkost , xen-devel@lists.xen.org Subject: [Xen-devel] [PATCH] xen: Fix xenpv machine initialisation X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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) {