From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=3.0 tests=FROM_EXCESS_BASE64, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED,USER_AGENT_MUTT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 079E4C43613 for ; Fri, 21 Jun 2019 11:08:01 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D0F0221530 for ; Fri, 21 Jun 2019 11:08:00 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D0F0221530 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:59366 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1heHOi-0000Pf-2o for qemu-devel@archiver.kernel.org; Fri, 21 Jun 2019 07:08:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43200) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1heHO9-0008PT-Fj for qemu-devel@nongnu.org; Fri, 21 Jun 2019 07:07:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1heHO6-0007DW-Ci for qemu-devel@nongnu.org; Fri, 21 Jun 2019 07:07:25 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36172) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1heHO5-00075r-0h for qemu-devel@nongnu.org; Fri, 21 Jun 2019 07:07:22 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4A869C05001F; Fri, 21 Jun 2019 11:07:10 +0000 (UTC) Received: from redhat.com (ovpn-112-66.ams2.redhat.com [10.36.112.66]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9A44119C4F; Fri, 21 Jun 2019 11:07:07 +0000 (UTC) Date: Fri, 21 Jun 2019 12:07:04 +0100 From: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= To: Anthony PERARD Message-ID: <20190621110704.GI11706@redhat.com> References: <20190621105441.3025-1-anthony.perard@citrix.com> <20190621105441.3025-2-anthony.perard@citrix.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20190621105441.3025-2-anthony.perard@citrix.com> User-Agent: Mutt/1.11.4 (2019-03-13) X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Fri, 21 Jun 2019 11:07:10 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: Re: [Qemu-devel] [PATCH v3 1/2] Revert xen/io/ring.h of "Clean up a few header guard symbols" X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= Cc: xen-devel@lists.xenproject.org, Stefano Stabellini , qemu-devel@nongnu.org, Paul Durrant , Markus Armbruster Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Fri, Jun 21, 2019 at 11:54:40AM +0100, Anthony PERARD wrote: > This reverts changes to include/hw/xen/io/ring.h from commit > 37677d7db39a3c250ad661d00fb7c3b59d047b1f. >=20 > Following 37677d7db3 "Clean up a few header guard symbols", QEMU start > to fail to build: >=20 > In file included from ~/xen/tools/../tools/include/xen/io/blkif.h:31:0, > from ~/xen/tools/qemu-xen-dir/hw/block/xen_blkif.h:5, > from ~/xen/tools/qemu-xen-dir/hw/block/xen-block.c:22: > ~/xen/tools/../tools/include/xen/io/ring.h:68:0: error: "__CONST_RING_S= IZE" redefined [-Werror] > #define __CONST_RING_SIZE(_s, _sz) \ >=20 > In file included from ~/xen/tools/qemu-xen-dir/hw/block/xen_blkif.h:4:0= , > from ~/xen/tools/qemu-xen-dir/hw/block/xen-block.c:22: > ~/xen/tools/qemu-xen-dir/include/hw/xen/io/ring.h:66:0: note: this is t= he location of the previous definition > #define __CONST_RING_SIZE(_s, _sz) \ >=20 > The issue is that some public xen headers have been imported (by > f65eadb639 "xen: import ring.h from xen") but not all. With the change > in the guards symbole, the ring.h header start to be imported twice. >=20 > Signed-off-by: Anthony PERARD > --- > CC: Markus Armbruster > --- >=20 > Notes: > v3: > - new patch, replace "xen: Fix build with public headers" from prev= ious > patch series version > - Revert problematic change instead. >=20 > include/hw/xen/io/ring.h | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) Reviewed-by: Daniel P. Berrang=C3=A9 Regards, Daniel --=20 |: https://berrange.com -o- https://www.flickr.com/photos/dberran= ge :| |: https://libvirt.org -o- https://fstop138.berrange.c= om :| |: https://entangle-photo.org -o- https://www.instagram.com/dberran= ge :|