From: Max Reitz <mreitz@redhat.com>
To: qemu-block@nongnu.org
Cc: qemu-devel@nongnu.org, Max Reitz <mreitz@redhat.com>,
Markus Armbruster <armbru@redhat.com>,
Kevin Wolf <kwolf@redhat.com>, Eric Blake <eblake@redhat.com>,
Michael Roth <mdroth@linux.vnet.ibm.com>
Subject: [Qemu-devel] [PATCH 07/13] qdict: Add qdict_stringify_for_keyval()
Date: Wed, 9 May 2018 18:55:24 +0200 [thread overview]
Message-ID: <20180509165530.29561-8-mreitz@redhat.com> (raw)
In-Reply-To: <20180509165530.29561-1-mreitz@redhat.com>
The purpose of this function is to prepare a QDict for consumption by
the keyval visitor, which only accepts strings and QNull.
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
include/block/qdict.h | 2 ++
qobject/qdict.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 59 insertions(+)
diff --git a/include/block/qdict.h b/include/block/qdict.h
index 825e096a72..05a24677b5 100644
--- a/include/block/qdict.h
+++ b/include/block/qdict.h
@@ -32,4 +32,6 @@ typedef struct QDictRenames {
} QDictRenames;
bool qdict_rename_keys(QDict *qdict, const QDictRenames *renames, Error **errp);
+void qdict_stringify_for_keyval(QDict *qdict);
+
#endif
diff --git a/qobject/qdict.c b/qobject/qdict.c
index 0554c64553..83678c4951 100644
--- a/qobject/qdict.c
+++ b/qobject/qdict.c
@@ -1087,3 +1087,60 @@ bool qdict_rename_keys(QDict *qdict, const QDictRenames *renames, Error **errp)
}
return true;
}
+
+/**
+ * Convert all values in a QDict so it can be consumed by the keyval
+ * input visitor. QNull values are left as-is, all other values are
+ * converted to strings.
+ *
+ * @qdict must be flattened, i.e. it may not contain any nested QDicts
+ * or QLists.
+ */
+void qdict_stringify_for_keyval(QDict *qdict)
+{
+ const QDictEntry *e;
+
+ for (e = qdict_first(qdict); e; e = qdict_next(qdict, e)) {
+ QString *new_value = NULL;
+
+ switch (qobject_type(e->value)) {
+ case QTYPE_QNULL:
+ /* leave as-is */
+ break;
+
+ case QTYPE_QNUM: {
+ char *str = qnum_to_string(qobject_to(QNum, e->value));
+ new_value = qstring_from_str(str);
+ g_free(str);
+ break;
+ }
+
+ case QTYPE_QSTRING:
+ /* leave as-is */
+ break;
+
+ case QTYPE_QDICT:
+ case QTYPE_QLIST:
+ /* @qdict must be flattened */
+ abort();
+
+ case QTYPE_QBOOL:
+ if (qbool_get_bool(qobject_to(QBool, e->value))) {
+ new_value = qstring_from_str("on");
+ } else {
+ new_value = qstring_from_str("off");
+ }
+ break;
+
+ case QTYPE_NONE:
+ case QTYPE__MAX:
+ abort();
+ }
+
+ if (new_value) {
+ QDictEntry *mut_e = (QDictEntry *)e;
+ qobject_unref(mut_e->value);
+ mut_e->value = QOBJECT(new_value);
+ }
+ }
+}
--
2.14.3
next prev parent reply other threads:[~2018-05-09 16:55 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-09 16:55 [Qemu-devel] [PATCH 00/13] block: Try to create well typed json:{} filenames Max Reitz
2018-05-09 16:55 ` [Qemu-devel] [PATCH 01/13] qapi: Add default-variant for flat unions Max Reitz
2018-05-10 13:12 ` Eric Blake
2018-05-10 13:18 ` Eric Blake
2018-05-11 17:59 ` Max Reitz
2018-05-11 18:13 ` Eric Blake
2018-05-11 17:38 ` Max Reitz
2018-05-09 16:55 ` [Qemu-devel] [PATCH 02/13] docs/qapi: Document optional discriminators Max Reitz
2018-05-10 13:14 ` Eric Blake
2018-05-09 16:55 ` [Qemu-devel] [PATCH 03/13] tests: Add QAPI optional discriminator tests Max Reitz
2018-05-10 14:08 ` Eric Blake
2018-05-11 18:06 ` Max Reitz
2018-05-09 16:55 ` [Qemu-devel] [PATCH 04/13] qapi: Formalize qcow2 encryption probing Max Reitz
2018-05-10 7:58 ` Daniel P. Berrangé
2018-05-10 14:22 ` Eric Blake
2018-05-11 17:32 ` Max Reitz
2018-05-09 16:55 ` [Qemu-devel] [PATCH 05/13] qapi: Formalize qcow " Max Reitz
2018-05-10 14:24 ` Eric Blake
2018-05-10 14:32 ` Daniel P. Berrangé
2018-05-11 18:07 ` Max Reitz
2018-05-09 16:55 ` [Qemu-devel] [PATCH 06/13] block: Add block-specific QDict header Max Reitz
2018-05-10 14:54 ` Eric Blake
2018-05-11 18:11 ` Max Reitz
2018-06-06 13:10 ` Markus Armbruster
2018-06-06 13:17 ` Markus Armbruster
2018-06-06 14:19 ` Markus Armbruster
2018-06-06 14:35 ` Markus Armbruster
2018-05-09 16:55 ` Max Reitz [this message]
2018-05-11 18:39 ` [Qemu-devel] [PATCH 07/13] qdict: Add qdict_stringify_for_keyval() Eric Blake
2018-05-11 21:42 ` Max Reitz
2018-05-09 16:55 ` [Qemu-devel] [PATCH 08/13] tests: Add qdict_stringify_for_keyval() test Max Reitz
2018-05-10 16:02 ` Eric Blake
2018-05-11 18:13 ` Max Reitz
2018-05-11 18:33 ` Eric Blake
2018-05-09 16:55 ` [Qemu-devel] [PATCH 09/13] qdict: Make qdict_flatten() shallow-clone-friendly Max Reitz
2018-05-11 18:44 ` Eric Blake
2018-05-09 16:55 ` [Qemu-devel] [PATCH 10/13] tests: Add QDict clone-flatten test Max Reitz
2018-05-11 18:46 ` Eric Blake
2018-05-11 21:41 ` Max Reitz
2018-05-09 16:55 ` [Qemu-devel] [PATCH 11/13] block: Try to create well typed json:{} filenames Max Reitz
2018-05-09 16:55 ` [Qemu-devel] [PATCH 12/13] iotests: Test internal option typing Max Reitz
2018-05-09 16:55 ` [Qemu-devel] [PATCH 13/13] iotests: qcow2's encrypt.format is now optional Max Reitz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180509165530.29561-8-mreitz@redhat.com \
--to=mreitz@redhat.com \
--cc=armbru@redhat.com \
--cc=eblake@redhat.com \
--cc=kwolf@redhat.com \
--cc=mdroth@linux.vnet.ibm.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).