From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58231) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fQozI-0001OL-9h for qemu-devel@nongnu.org; Thu, 07 Jun 2018 03:05:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fQozD-0003sp-BZ for qemu-devel@nongnu.org; Thu, 07 Jun 2018 03:05:36 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:56086 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fQozD-0003sS-5w for qemu-devel@nongnu.org; Thu, 07 Jun 2018 03:05:31 -0400 From: Markus Armbruster References: <20180606173233.28080-1-berrange@redhat.com> <20180606173233.28080-4-berrange@redhat.com> <20180607035805.GH7815@xz-mi> Date: Thu, 07 Jun 2018 09:05:28 +0200 In-Reply-To: <20180607035805.GH7815@xz-mi> (Peter Xu's message of "Thu, 7 Jun 2018 11:58:05 +0800") Message-ID: <878t7r3wlj.fsf@dusky.pond.sub.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH v2 3/3] util: remove redundant include of glib.h List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Xu Cc: Peter Maydell , Olaf Hering , Stefan Berger , Michael Roth , QEMU Developers , Stefan Hajnoczi , Thomas Huth , Paolo Bonzini Peter Xu writes: > On Wed, Jun 06, 2018 at 07:31:53PM +0100, Peter Maydell wrote: >> On 6 June 2018 at 18:32, Daniel P. Berrang=C3=A9 w= rote: >> > Code must only ever include glib.h indirectly via the glib-compat.h >> > header file, because we will need some macros set before glib.h is >> > pulled in. Adding extra includes of glib.h will (soon) cause compile >> > failures such as: >> > >> > In file included from /home/berrange/src/virt/qemu/include/qemu/osdep.= h:107, >> > from /home/berrange/src/virt/qemu/include/qemu/iova-t= ree.h:26, >> > from util/iova-tree.c:13: >> > /home/berrange/src/virt/qemu/include/glib-compat.h:22: error: "GLIB_VE= RSION_MIN_REQUIRED" redefined [-Werror] >> > #define GLIB_VERSION_MIN_REQUIRED GLIB_VERSION_2_40 >> > >> > In file included from /usr/include/glib-2.0/glib/gtypes.h:34, >> > from /usr/include/glib-2.0/glib/galloca.h:32, >> > from /usr/include/glib-2.0/glib.h:30, >> > from util/iova-tree.c:12: >> > /usr/include/glib-2.0/glib/gversionmacros.h:237: note: this is the loc= ation of the previous definition >> > # define GLIB_VERSION_MIN_REQUIRED (GLIB_VERSION_CUR_STABLE) >> > >> > Signed-off-by: Daniel P. Berrang=C3=A9 >> > --- >> > util/iova-tree.c | 1 - >> > 1 file changed, 1 deletion(-) >> > >> > diff --git a/util/iova-tree.c b/util/iova-tree.c >> > index 2d9cebfc89..d39cd8bb29 100644 >> > --- a/util/iova-tree.c >> > +++ b/util/iova-tree.c >> > @@ -9,7 +9,6 @@ >> > * This work is licensed under the terms of the GNU GPL, version 2 or= later. >> > */ >> > >> > -#include >> > #include "qemu/iova-tree.h" >>=20 >> While we're fixing up the headers in this file: >> it should start with an include of qemu/osdep.h, >> and qemu/iova-tree.h should not include osdep.h... > > Sorry to messed this up. It was used for hwaddr definition. > > Maybe we can just replace hwaddr usage in iova-tree.[ch] with > something like uint64_t? Then I think we can drop the osdep.h. Every compilation unit must include "osdep.h" first. Its file comment explains why. If it's insufficiently convincing, we should fix it :)