[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 01/10] typedefs: add QJSON
From: |
Dr. David Alan Gilbert (git) |
Subject: |
[Qemu-devel] [PULL 01/10] typedefs: add QJSON |
Date: |
Fri, 15 Jun 2018 16:15:09 +0100 |
From: Greg Kurz <address@hidden>
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 address@hidden:
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 <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Signed-off-by: Dr. David Alan Gilbert <address@hidden>
---
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 3747110f95..42b946ce90 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 325c72de33..3ec0e13a96 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 2978b5f371..41664f2d71 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);
--
2.17.1
- [Qemu-devel] [PULL 00/10] migration queue, Dr. David Alan Gilbert (git), 2018/06/15
- [Qemu-devel] [PULL 01/10] typedefs: add QJSON,
Dr. David Alan Gilbert (git) <=
- [Qemu-devel] [PULL 02/10] migration: Fixes for non-migratable RAMBlocks, Dr. David Alan Gilbert (git), 2018/06/15
- [Qemu-devel] [PULL 03/10] migration: Poison ramblock loops in migration, Dr. David Alan Gilbert (git), 2018/06/15
- [Qemu-devel] [PULL 04/10] migration/block-dirty-bitmap: fix dirty_bitmap_load, Dr. David Alan Gilbert (git), 2018/06/15
- [Qemu-devel] [PULL 05/10] migration: fix counting xbzrle cache_miss_rate, Dr. David Alan Gilbert (git), 2018/06/15
- [Qemu-devel] [PULL 06/10] migration: introduce migration_update_rates, Dr. David Alan Gilbert (git), 2018/06/15
- [Qemu-devel] [PULL 09/10] migration/postcopy: Wake rate limit sleep on postcopy request, Dr. David Alan Gilbert (git), 2018/06/15
- [Qemu-devel] [PULL 07/10] migration/postcopy: Add max-postcopy-bandwidth parameter, Dr. David Alan Gilbert (git), 2018/06/15
- [Qemu-devel] [PULL 08/10] migration: Wake rate limiting for urgent requests, Dr. David Alan Gilbert (git), 2018/06/15
- [Qemu-devel] [PULL 10/10] migration: calculate expected_downtime with ram_bytes_remaining(), Dr. David Alan Gilbert (git), 2018/06/15
- Re: [Qemu-devel] [PULL 00/10] migration queue, Peter Maydell, 2018/06/15