[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 07/19] Typedef the subtypes of QObject in qemu/ty
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH v2 07/19] Typedef the subtypes of QObject in qemu/typedefs.h, too |
Date: |
Wed, 31 Jan 2018 15:48:34 +0100 |
This renders many inclusions of qapi/qmp/q*.h superfluous. They'll be
dropped in the next few commits.
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
---
include/qapi/qmp/qbool.h | 4 ++--
include/qapi/qmp/qdict.h | 4 ++--
include/qapi/qmp/qlist.h | 4 ++--
include/qapi/qmp/qnum.h | 4 ++--
include/qapi/qmp/qstring.h | 4 ++--
include/qemu/typedefs.h | 7 ++++++-
6 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/include/qapi/qmp/qbool.h b/include/qapi/qmp/qbool.h
index f77ea86c4e..629c508d34 100644
--- a/include/qapi/qmp/qbool.h
+++ b/include/qapi/qmp/qbool.h
@@ -16,10 +16,10 @@
#include "qapi/qmp/qobject.h"
-typedef struct QBool {
+struct QBool {
QObject base;
bool value;
-} QBool;
+};
QBool *qbool_from_bool(bool value);
bool qbool_get_bool(const QBool *qb);
diff --git a/include/qapi/qmp/qdict.h b/include/qapi/qmp/qdict.h
index fc218e7be6..d0c298114e 100644
--- a/include/qapi/qmp/qdict.h
+++ b/include/qapi/qmp/qdict.h
@@ -27,11 +27,11 @@ typedef struct QDictEntry {
QLIST_ENTRY(QDictEntry) next;
} QDictEntry;
-typedef struct QDict {
+struct QDict {
QObject base;
size_t size;
QLIST_HEAD(,QDictEntry) table[QDICT_BUCKET_MAX];
-} QDict;
+};
/* Object API */
QDict *qdict_new(void);
diff --git a/include/qapi/qmp/qlist.h b/include/qapi/qmp/qlist.h
index ec3fcc1a4c..632b7ef2c1 100644
--- a/include/qapi/qmp/qlist.h
+++ b/include/qapi/qmp/qlist.h
@@ -23,10 +23,10 @@ typedef struct QListEntry {
QTAILQ_ENTRY(QListEntry) next;
} QListEntry;
-typedef struct QList {
+struct QList {
QObject base;
QTAILQ_HEAD(,QListEntry) head;
-} QList;
+};
#define qlist_append(qlist, obj) \
qlist_append_obj(qlist, QOBJECT(obj))
diff --git a/include/qapi/qmp/qnum.h b/include/qapi/qmp/qnum.h
index c3d86794bb..15e3971c7f 100644
--- a/include/qapi/qmp/qnum.h
+++ b/include/qapi/qmp/qnum.h
@@ -44,7 +44,7 @@ typedef enum {
* in range: qnum_get_try_int() / qnum_get_try_uint() check range and
* convert under the hood.
*/
-typedef struct QNum {
+struct QNum {
QObject base;
QNumKind kind;
union {
@@ -52,7 +52,7 @@ typedef struct QNum {
uint64_t u64;
double dbl;
} u;
-} QNum;
+};
QNum *qnum_from_int(int64_t value);
QNum *qnum_from_uint(uint64_t value);
diff --git a/include/qapi/qmp/qstring.h b/include/qapi/qmp/qstring.h
index 65c05a9be5..98070ef3d6 100644
--- a/include/qapi/qmp/qstring.h
+++ b/include/qapi/qmp/qstring.h
@@ -15,12 +15,12 @@
#include "qapi/qmp/qobject.h"
-typedef struct QString {
+struct QString {
QObject base;
char *string;
size_t length;
size_t capacity;
-} QString;
+};
QString *qstring_new(void);
QString *qstring_from_str(const char *str);
diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h
index 9bd7a834ba..78e2f08c0b 100644
--- a/include/qemu/typedefs.h
+++ b/include/qemu/typedefs.h
@@ -92,8 +92,13 @@ typedef struct QemuOptsList QemuOptsList;
typedef struct QEMUSGList QEMUSGList;
typedef struct QEMUTimer QEMUTimer;
typedef struct QEMUTimerListGroup QEMUTimerListGroup;
-typedef struct QObject QObject;
+typedef struct QBool QBool;
+typedef struct QDict QDict;
+typedef struct QList QList;
typedef struct QNull QNull;
+typedef struct QNum QNum;
+typedef struct QObject QObject;
+typedef struct QString QString;
typedef struct RAMBlock RAMBlock;
typedef struct Range Range;
typedef struct SerialState SerialState;
--
2.13.6
- Re: [Qemu-devel] [PATCH v2 01/19] Use #include "..." for our own headers, <...> for others, (continued)
- [Qemu-devel] [PATCH v2 10/19] Include qapi/qmp/qobject.h exactly where needed, Markus Armbruster, 2018/01/31
- [Qemu-devel] [PATCH v2 16/19] Include qapi/qmp/qnull.h exactly where needed, Markus Armbruster, 2018/01/31
- [Qemu-devel] [PATCH v2 03/19] Drop superfluous includes of qapi-types.h and test-qapi-types.h, Markus Armbruster, 2018/01/31
- [Qemu-devel] [PATCH v2 02/19] Clean up includes, Markus Armbruster, 2018/01/31
- [Qemu-devel] [PATCH v2 07/19] Typedef the subtypes of QObject in qemu/typedefs.h, too,
Markus Armbruster <=
- [Qemu-devel] [PATCH v2 06/19] Include qmp-commands.h exactly where needed, Markus Armbruster, 2018/01/31
- [Qemu-devel] [PATCH v2 17/19] Drop superfluous includes of qapi/qmp/dispatch.h, Markus Armbruster, 2018/01/31
- [Qemu-devel] [PATCH v2 13/19] Include qapi/qmp/qstring.h exactly where needed, Markus Armbruster, 2018/01/31
- [Qemu-devel] [PATCH v2 05/19] Drop superfluous includes of qapi/qmp/qerror.h, Markus Armbruster, 2018/01/31
- [Qemu-devel] [PATCH v2 09/19] qdict qlist: Make most helper macros functions, Markus Armbruster, 2018/01/31
- [Qemu-devel] [PATCH v2 12/19] Include qapi/qmp/qdict.h exactly where needed, Markus Armbruster, 2018/01/31
- [Qemu-devel] [PATCH v2 14/19] Include qapi/qmp/qbool.h exactly where needed, Markus Armbruster, 2018/01/31
- [Qemu-devel] [PATCH v2 04/19] Include qapi/error.h exactly where needed, Markus Armbruster, 2018/01/31
- [Qemu-devel] [PATCH v2 18/19] Drop superfluous includes of qapi/qmp/qjson.h, Markus Armbruster, 2018/01/31