From patchwork Tue Nov 8 14:07:22 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 9417557 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 7D9DD60585 for ; Tue, 8 Nov 2016 14:10:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6FC8128A46 for ; Tue, 8 Nov 2016 14:10:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 62CF028A51; Tue, 8 Nov 2016 14:10:09 +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 6F9A128A46 for ; Tue, 8 Nov 2016 14:10:07 +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 1c4742-0003ql-TQ; Tue, 08 Nov 2016 14:07:50 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1c4742-0003qe-4p for xen-devel@lists.xen.org; Tue, 08 Nov 2016 14:07:50 +0000 Received: from [85.158.137.68] by server-7.bemta-3.messagelabs.com id F8/FF-22495-53CD1285; Tue, 08 Nov 2016 14:07:49 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrJLMWRWlGSWpSXmKPExsXitHRDpK7JHcU Ig13PLCyWfFzM4sDocXT3b6YAxijWzLyk/IoE1ozj76+xFRznqbjy9zdrA+N2ri5GTg4JAX+J M5t2s4PYbAIGEiumX2UEsUUEpCX657QDxbk4mAUOMUos3fweLCEsYCnxevs11i5GDg4WARWJ3 78lQcK8AnYSy9c+YISYKS+x8PwRJhBbSEBN4sbCZSwQNYISJ2c+AbOZBSQkDr54wQxRzy1x+/ RU5gmMPLOQlM1CUraAkWkVo0ZxalFZapGuoaFeUlFmekZJbmJmjq6hgbFebmpxcWJ6ak5iUrF ecn7uJkZgkDAAwQ7G1b+dDjFKcjApifK+L1CMEOJLyk+pzEgszogvKs1JLT7EKMPBoSTB634b KCdYlJqeWpGWmQMMV5i0BAePkgjvs1tAad7igsTc4sx0iNQpRkUpcd4LIAkBkERGaR5cGyxGL jHKSgnzMgIdIsRTkFqUm1mCKv+KUZyDUUmY9y/IFJ7MvBK46a+AFjMBLa6KUQBZXJKIkJJqYD T0mDUn6KnOxfXrJs+64y10e97u3fNkhZk2cLzbufG2bPm97o8NzElhfxvjLvbMEbhaeMaNT+3 e5b+JezSjv+5/dmDqv3X7xWtCVpxf7WqmKLMkWDbX/q/hkRr1n+Eqvwq/zH0mHV6xaNVnt5gA txMJb88s1e0UuHli7eezjYoP32WJv/x79V6cEktxRqKhFnNRcSIAjQqTeowCAAA= X-Env-Sender: prvs=113866832=anthony.perard@citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1478614065!11732305!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAyMDMwMDc=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 9.0.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 46245 invoked from network); 8 Nov 2016 14:07:47 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-4.tower-31.messagelabs.com with RC4-SHA encrypted SMTP; 8 Nov 2016 14:07:47 -0000 X-IronPort-AV: E=Sophos;i="5.31,462,1473120000"; d="scan'208";a="388374012" From: Anthony PERARD To: Date: Tue, 8 Nov 2016 14:07:22 +0000 Message-ID: <20161108140722.25194-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 v2] 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. Moving the code to xen_hvm_init() fix the issue. This fix 021746c131cdfeab9d82ff918795a9f18d20d7ae. Signed-off-by: Anthony PERARD Reviewed-by: Eduardo Habkost Reviewed-by: Stefano Stabellini --- CC: Wei Liu CC: Eduardo Habkost --- 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: