[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 06/13] qobject: Add helper macros for common scal
From: |
Eric Blake |
Subject: |
[Qemu-devel] [PATCH v3 06/13] qobject: Add helper macros for common scalar insertions |
Date: |
Wed, 5 Apr 2017 14:47:34 -0500 |
Rather than making lots of callers wrap a scalar in a QInt, QString,
or QBool, provide helper macros that do the wrapping automatically.
Update the Coccinelle script to make mass conversions easy, although
the conversion itself will be done as a separate patches to ease
review and backport efforts.
Signed-off-by: Eric Blake <address@hidden>
---
include/qapi/qmp/qdict.h | 8 ++++++++
include/qapi/qmp/qlist.h | 8 ++++++++
scripts/coccinelle/qobject.cocci | 22 ++++++++++++++++++++++
3 files changed, 38 insertions(+)
diff --git a/include/qapi/qmp/qdict.h b/include/qapi/qmp/qdict.h
index fe9a4c5..9d9f9a3 100644
--- a/include/qapi/qmp/qdict.h
+++ b/include/qapi/qmp/qdict.h
@@ -52,6 +52,14 @@ void qdict_destroy_obj(QObject *obj);
#define qdict_put(qdict, key, obj) \
qdict_put_obj(qdict, key, QOBJECT(obj))
+/* Helpers for int, bool, and const char*. */
+#define qdict_put_int(qdict, key, value) \
+ qdict_put(qdict, key, qint_from_int(value))
+#define qdict_put_bool(qdict, key, value) \
+ qdict_put(qdict, key, qbool_from_bool(value))
+#define qdict_put_str(qdict, key, value) \
+ qdict_put(qdict, key, qstring_from_str(value))
+
/* High level helpers */
double qdict_get_double(const QDict *qdict, const char *key);
int64_t qdict_get_int(const QDict *qdict, const char *key);
diff --git a/include/qapi/qmp/qlist.h b/include/qapi/qmp/qlist.h
index a84117e..659325a 100644
--- a/include/qapi/qmp/qlist.h
+++ b/include/qapi/qmp/qlist.h
@@ -29,6 +29,14 @@ typedef struct QList {
#define qlist_append(qlist, obj) \
qlist_append_obj(qlist, QOBJECT(obj))
+/* Helpers for int, bool, and const char*. */
+#define qlist_append_int(qlist, value) \
+ qlist_append(qlist, qint_from_int(value))
+#define qlist_append_bool(qlist, value) \
+ qlist_append(qlist, qbool_from_bool(value))
+#define qlist_append_str(qlist, value) \
+ qlist_append(qlist, qstring_from_str(value))
+
#define QLIST_FOREACH_ENTRY(qlist, var) \
for ((var) = ((qlist)->head.tqh_first); \
(var); \
diff --git a/scripts/coccinelle/qobject.cocci b/scripts/coccinelle/qobject.cocci
index aa899e2..97703a4 100644
--- a/scripts/coccinelle/qobject.cocci
+++ b/scripts/coccinelle/qobject.cocci
@@ -2,12 +2,34 @@
@@
expression Obj, Key, E;
@@
+(
- qdict_put_obj(Obj, Key, QOBJECT(E));
+ qdict_put(Obj, Key, E);
+|
+- qdict_put(Obj, Key, qint_from_int(E));
++ qdict_put_int(Obj, Key, E);
+|
+- qdict_put(Obj, Key, qbool_from_bool(E));
++ qdict_put_bool(Obj, Key, E);
+|
+- qdict_put(Obj, Key, qstring_from_str(E));
++ qdict_put_str(Obj, Key, E);
+)
// Use QList macros where they make sense
@@
expression Obj, E;
@@
+(
- qlist_append_obj(Obj, QOBJECT(E));
+ qlist_append(Obj, E);
+|
+- qlist_append(Obj, qint_from_int(E));
++ qlist_append_int(Obj, E);
+|
+- qlist_append(Obj, qbool_from_bool(E));
++ qlist_append_bool(Obj, E);
+|
+- qlist_append(Obj, qstring_from_str(E));
++ qlist_append_str(Obj, E);
+)
--
2.9.3
- [Qemu-devel] [PATCH v3 02/13] pci: Reduce scope of error injection, (continued)
- [Qemu-devel] [PATCH v3 02/13] pci: Reduce scope of error injection, Eric Blake, 2017/04/05
- [Qemu-devel] [PATCH v3 04/13] coccinelle: Add script to remove useless QObject casts, Eric Blake, 2017/04/05
- [Qemu-devel] [PATCH v3 03/13] s390x: Drop useless casts, Eric Blake, 2017/04/05
- [Qemu-devel] [PATCH v3 06/13] qobject: Add helper macros for common scalar insertions,
Eric Blake <=
- [Qemu-devel] [PATCH v3 05/13] qobject: Drop useless QObject casts, Eric Blake, 2017/04/05
- [Qemu-devel] [PATCH v3 08/13] tests: Use simpler QDict/QList scalar insertion macros, Eric Blake, 2017/04/05
- [Qemu-devel] [PATCH v3 11/13] QemuOpts: Simplify qemu_opts_to_qdict(), Eric Blake, 2017/04/05
- [Qemu-devel] [PATCH v3 10/13] block: Simplify bdrv_append_temp_snapshot() logic, Eric Blake, 2017/04/05