david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

typedefs: add QJSON

Browse Source 
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 <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>
This commit is contained in:
Greg Kurz 2018-06-08 10:39:09 +02:00 committed by Dr. David Alan Gilbert
parent 2702c2d3eb
commit ea134caa08
3 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/migration/vmstate.h
View File

@ -27,8 +27,6 @@
#ifndef QEMU_VMSTATE_H #ifndef QEMU_VMSTATE_H
#define QEMU_VMSTATE_H #define QEMU_VMSTATE_H
typedef struct QJSON QJSON;
typedef struct VMStateInfo VMStateInfo; typedef struct VMStateInfo VMStateInfo;
typedef struct VMStateDescription VMStateDescription; typedef struct VMStateDescription VMStateDescription;
typedef struct VMStateField VMStateField; typedef struct VMStateField VMStateField;

1
include/qemu/typedefs.h
View File

@ -97,6 +97,7 @@ typedef struct QEMUTimer QEMUTimer;
typedef struct QEMUTimerListGroup QEMUTimerListGroup; typedef struct QEMUTimerListGroup QEMUTimerListGroup;
typedef struct QBool QBool; typedef struct QBool QBool;
typedef struct QDict QDict; typedef struct QDict QDict;
typedef struct QJSON QJSON;
typedef struct QList QList; typedef struct QList QList;
typedef struct QNull QNull; typedef struct QNull QNull;
typedef struct QNum QNum; typedef struct QNum QNum;

2
migration/qjson.h
View File

@ -13,8 +13,6 @@
#ifndef QEMU_QJSON_H #ifndef QEMU_QJSON_H
#define QEMU_QJSON_H #define QEMU_QJSON_H
typedef struct QJSON QJSON;
QJSON *qjson_new(void); QJSON *qjson_new(void);
void qjson_destroy(QJSON *json); void qjson_destroy(QJSON *json);
void json_prop_str(QJSON *json, const char *name, const char *str); void json_prop_str(QJSON *json, const char *name, const char *str);