OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity
qemu-e2k/include/migration
History
Greg Kurz ea134caa08 typedefs: add QJSON 
Since commit 83ee768d62, 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 <qemu/typedefs.h> instead.

Signed-off-by: Greg Kurz <groug@kaod.org>
Message-Id: <152844714981.11789.3657734445739553287.stgit@bahia.lan>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
 		2018-06-15 14:40:56 +01:00
..
blocker.h migration: Create migration/blocker.h 2017-05-17 12:04:59 +02:00
colo.h Include less of the generated modular QAPI headers 2018-03-02 13:45:50 -06:00
cpu.h migration: Add VMSTATE_UINTTL_2DARRAY() 2017-05-04 09:39:01 +09:00
failover.h Include less of the generated modular QAPI headers 2018-03-02 13:45:50 -06:00
global_state.h Include less of the generated modular QAPI headers 2018-03-02 13:45:50 -06:00
misc.h migration: add postcopy migration of dirty bitmaps 2018-03-13 17:06:09 -04:00
qemu-file-types.h migration: Split qemu-file.h 2017-06-01 18:49:22 +02:00
register.h migration: introduce SaveVMHandlers.resume_prepare 2018-05-15 20:56:55 +02:00
snapshot.h migration: Create include for migration snapshots 2017-06-01 18:49:23 +02:00
vmstate.h typedefs: add QJSON 2018-06-15 14:40:56 +01:00