From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54028) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fRDKB-0007J4-74 for qemu-devel@nongnu.org; Fri, 08 Jun 2018 05:04:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fRDK7-0006hO-5N for qemu-devel@nongnu.org; Fri, 08 Jun 2018 05:04:47 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:49796 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 1fRDK6-0006hD-Vd for qemu-devel@nongnu.org; Fri, 08 Jun 2018 05:04:43 -0400 Date: Fri, 8 Jun 2018 10:04:39 +0100 From: "Dr. David Alan Gilbert" Message-ID: <20180608090438.GE2671@work-vm> References: <152844714981.11789.3657734445739553287.stgit@bahia.lan> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <152844714981.11789.3657734445739553287.stgit@bahia.lan> Subject: Re: [Qemu-devel] [PATCH] typedefs: add QJSON List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Greg Kurz Cc: qemu-devel@nongnu.org, Juan Quintela * Greg Kurz (groug@kaod.org) wrote: > Since commit 83ee768d6247b, we now have two places that define the > QJSON type: > > $ git grep 'typedef struct QJSON QJSON' > include/migration/vmstate.h:typedef struct QJSON QJSON; > migration/qjson.h:typedef struct QJSON QJSON; > > This breaks docker-test-build@centos6: > > In file included from /tmp/qemu-test/src/migration/savevm.c:59: > /tmp/qemu-test/src/migration/qjson.h:16: error: redefinition of typedef > 'QJSON' > /tmp/qemu-test/src/include/migration/vmstate.h:30: note: previous > declaration of 'QJSON' was here > make: *** [migration/savevm.o] Error 1 > > This happens because CentOS 6 has an old GCC 4.4.7. Even if redefining > a typedef with the same type is permitted since GCC 4.6, unless -pedantic > is passed, we don't really need to do that on purpose. Let's have a > single definition in instead. > > Signed-off-by: Greg Kurz Yeh that looks right to me; Reviewed-by: Dr. David Alan Gilbert > --- > include/migration/vmstate.h | 2 -- > include/qemu/typedefs.h | 1 + > migration/qjson.h | 2 -- > 3 files changed, 1 insertion(+), 4 deletions(-) > > diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h > index 3747110f951a..42b946ce902c 100644 > --- a/include/migration/vmstate.h > +++ b/include/migration/vmstate.h > @@ -27,8 +27,6 @@ > #ifndef QEMU_VMSTATE_H > #define QEMU_VMSTATE_H > > -typedef struct QJSON QJSON; > - > typedef struct VMStateInfo VMStateInfo; > typedef struct VMStateDescription VMStateDescription; > typedef struct VMStateField VMStateField; > diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h > index 325c72de3313..3ec0e13a967f 100644 > --- a/include/qemu/typedefs.h > +++ b/include/qemu/typedefs.h > @@ -97,6 +97,7 @@ typedef struct QEMUTimer QEMUTimer; > typedef struct QEMUTimerListGroup QEMUTimerListGroup; > typedef struct QBool QBool; > typedef struct QDict QDict; > +typedef struct QJSON QJSON; > typedef struct QList QList; > typedef struct QNull QNull; > typedef struct QNum QNum; > diff --git a/migration/qjson.h b/migration/qjson.h > index 2978b5f37121..41664f2d71b5 100644 > --- a/migration/qjson.h > +++ b/migration/qjson.h > @@ -13,8 +13,6 @@ > #ifndef QEMU_QJSON_H > #define QEMU_QJSON_H > > -typedef struct QJSON QJSON; > - > QJSON *qjson_new(void); > void qjson_destroy(QJSON *json); > void json_prop_str(QJSON *json, const char *name, const char *str); > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK