From patchwork Sat Apr 15 00:39:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Stabellini X-Patchwork-Id: 9681971 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 481E060387 for ; Sat, 15 Apr 2017 00:40:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 247D628695 for ; Sat, 15 Apr 2017 00:40:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 072B1286A9; Sat, 15 Apr 2017 00:40:28 +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=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E866828695 for ; Sat, 15 Apr 2017 00:40:23 +0000 (UTC) Received: from localhost ([::1]:55045 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1czBlF-0004nP-JH for patchwork-qemu-devel@patchwork.kernel.org; Fri, 14 Apr 2017 20:40:21 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48088) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1czBke-0004nK-Iy for qemu-devel@nongnu.org; Fri, 14 Apr 2017 20:39:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1czBkb-000651-DY for qemu-devel@nongnu.org; Fri, 14 Apr 2017 20:39:44 -0400 Received: from mail.kernel.org ([198.145.29.136]:44384) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1czBkb-00064W-7c for qemu-devel@nongnu.org; Fri, 14 Apr 2017 20:39:41 -0400 Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 910CA202B8; Sat, 15 Apr 2017 00:39:38 +0000 (UTC) Received: from [10.149.184.130] (unknown [99.165.194.18]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 6AEA2202A1; Sat, 15 Apr 2017 00:39:37 +0000 (UTC) Date: Fri, 14 Apr 2017 17:39:35 -0700 (PDT) From: Stefano Stabellini X-X-Sender: sstabellini@sstabellini-ThinkPad-X260 To: Stefano Stabellini In-Reply-To: Message-ID: References: User-Agent: Alpine 2.10 (DEB 1266 2009-07-14) MIME-Version: 1.0 X-Virus-Scanned: ClamAV using ClamSMTP X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 198.145.29.136 Subject: Re: [Qemu-devel] QEMU build breakage on ARM against Xen 4.9 caused by libxendevicemodel X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: jgross@suse.com, wei.liu2@citrix.com, qemu-devel@nongnu.org, julien.grall@arm.com, paul.durrant@citrix.com, anthony.perard@citrix.com, xen-devel@lists.xenproject.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP On Fri, 14 Apr 2017, Stefano Stabellini wrote: > Hi Paul, > > The following commit in my qemu "next" branch breaks the build on arm > and arm64: > > commit 670271647ad15e9d937ced7a72c892349c709216 > Author: Paul Durrant > Date: Tue Mar 7 10:55:34 2017 +0000 > > xen: use libxendevicemodel when available > > See the appended build log. Sorry for not realizing it sooner. As I imagined, this bug is easy to solve. It is reproducible on x86 too, if you pass -DXC_WANT_COMPAT_DEVICEMODEL_API=1 to configure and forcefully disable Xen 4.9 detection in the configure script. If QEMU detects xen_ctrl_version = 480, the build will fail against Xen 4.9, even when -DXC_WANT_COMPAT_DEVICEMODEL_API=1 is specified. The appended patch solves the problem. However, Xen 4.9 detection and compilation remain broken. diff --git a/include/hw/xen/xen_common.h b/include/hw/xen/xen_common.h index 274accc..b1f5f53 100644 --- a/include/hw/xen/xen_common.h +++ b/include/hw/xen/xen_common.h @@ -9,7 +9,6 @@ #undef XC_WANT_COMPAT_EVTCHN_API #undef XC_WANT_COMPAT_GNTTAB_API #undef XC_WANT_COMPAT_MAP_FOREIGN_API -#undef XC_WANT_COMPAT_DEVICEMODEL_API #include #include @@ -154,6 +153,7 @@ static inline int xendevicemodel_set_mem_type( #else /* CONFIG_XEN_CTRL_INTERFACE_VERSION >= 490 */ +#undef XC_WANT_COMPAT_DEVICEMODEL_API #include #endif