From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38120) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dL4G5-0004LO-52 for qemu-devel@nongnu.org; Wed, 14 Jun 2017 05:06:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dL4G3-0007OB-VL for qemu-devel@nongnu.org; Wed, 14 Jun 2017 05:06:37 -0400 Received: from mx1.redhat.com ([209.132.183.28]:50964) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dL4G3-0007O4-My for qemu-devel@nongnu.org; Wed, 14 Jun 2017 05:06:35 -0400 From: Juan Quintela In-Reply-To: <20170614105024.5f8658d0@bahia.ttt.fr.ibm.com> (Greg Kurz's message of "Wed, 14 Jun 2017 10:50:24 +0200") References: <20170614083434.17966-1-quintela@redhat.com> <20170614105024.5f8658d0@bahia.ttt.fr.ibm.com> Reply-To: quintela@redhat.com Date: Wed, 14 Jun 2017 11:06:30 +0200 Message-ID: <8737b3ey5l.fsf@secure.mitica> MIME-Version: 1.0 Content-Type: text/plain Subject: Re: [Qemu-devel] [PATCH] migration: Fix compilation with older compilers List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Greg Kurz Cc: qemu-devel@nongnu.org, lvivier@redhat.com, dgilbert@redhat.com, peterx@redhat.com Greg Kurz wrote: > On Wed, 14 Jun 2017 10:34:34 +0200 > Juan Quintela wrote: > >> That typedefs are needed on both files. New compilers (F25 where I > > Only LoadStateHandler is actually needed by both files but I guess > it is ok to keep these typedefs together. Yeap. Sorry for the confusing message. I wanted to have them together. As you said, only the Load one is needed. In due curse, register.h file should be removed, but that is not going to happen soon. > > Reviewed-by: Greg Kurz > >> work) don't complain about repeating a typedef. But older ones >> complain. >> >> Signed-off-by: Juan Quintela >> --- >> include/migration/register.h | 3 --- >> include/migration/vmstate.h | 1 - >> include/qemu/typedefs.h | 2 ++ >> 3 files changed, 2 insertions(+), 4 deletions(-) >> >> diff --git a/include/migration/register.h b/include/migration/register.h >> index 717c617..d9498d9 100644 >> --- a/include/migration/register.h >> +++ b/include/migration/register.h >> @@ -14,9 +14,6 @@ >> #ifndef MIGRATION_REGISTER_H >> #define MIGRATION_REGISTER_H >> >> -typedef void SaveStateHandler(QEMUFile *f, void *opaque); >> -typedef int LoadStateHandler(QEMUFile *f, void *opaque, int version_id); >> - >> typedef struct SaveVMHandlers { >> /* This runs inside the iothread lock. */ >> SaveStateHandler *save_state; >> diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h >> index f3f3c2a..e85fbd8 100644 >> --- a/include/migration/vmstate.h >> +++ b/include/migration/vmstate.h >> @@ -29,7 +29,6 @@ >> >> #include "migration/qjson.h" >> >> -typedef int LoadStateHandler(QEMUFile *f, void *opaque, int version_id); >> 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 51958bf..f745d5f 100644 >> --- a/include/qemu/typedefs.h >> +++ b/include/qemu/typedefs.h >> @@ -96,5 +96,7 @@ typedef struct uWireSlave uWireSlave; >> typedef struct VirtIODevice VirtIODevice; >> typedef struct Visitor Visitor; >> typedef struct node_info NodeInfo; >> +typedef void SaveStateHandler(QEMUFile *f, void *opaque); >> +typedef int LoadStateHandler(QEMUFile *f, void *opaque, int version_id); >> >> #endif /* QEMU_TYPEDEFS_H */