From: Laurent Vivier <lvivier@redhat.com>
To: qemu-devel@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>,
Laurent Vivier <lvivier@redhat.com>,
Thomas Huth <thuth@redhat.com>,
qemu-block@nongnu.org, "Michael S. Tsirkin" <mst@redhat.com>,
Markus Armbruster <armbru@redhat.com>,
Hanna Reitz <hreitz@redhat.com>,
Paolo Bonzini <pbonzini@redhat.com>
Subject: [PATCH 1/3] qdict: make available dump_qobject(), dump_qdict(), dump_qlist()
Date: Wed, 10 Nov 2021 14:56:14 +0100 [thread overview]
Message-ID: <20211110135616.1188725-2-lvivier@redhat.com> (raw)
In-Reply-To: <20211110135616.1188725-1-lvivier@redhat.com>
move them from block/qapi.c to qobject/qdict.c, qobject/qlist.c,
qobject/qobject.c
This is useful to debug qobjects
Signed-off-by: Laurent Vivier <lvivier@redhat.com>
---
block/qapi.c | 82 +-------------------------------------
include/qapi/qmp/qdict.h | 2 +
include/qapi/qmp/qlist.h | 1 +
include/qapi/qmp/qobject.h | 1 +
qobject/qdict.c | 25 ++++++++++++
qobject/qlist.c | 17 ++++++++
qobject/qobject.c | 35 ++++++++++++++++
7 files changed, 82 insertions(+), 81 deletions(-)
diff --git a/block/qapi.c b/block/qapi.c
index cf557e3aea7c..26bbc45a67f5 100644
--- a/block/qapi.c
+++ b/block/qapi.c
@@ -697,86 +697,6 @@ void bdrv_snapshot_dump(QEMUSnapshotInfo *sn)
g_free(sizing);
}
-static void dump_qdict(int indentation, QDict *dict);
-static void dump_qlist(int indentation, QList *list);
-
-static void dump_qobject(int comp_indent, QObject *obj)
-{
- switch (qobject_type(obj)) {
- case QTYPE_QNUM: {
- QNum *value = qobject_to(QNum, obj);
- char *tmp = qnum_to_string(value);
- qemu_printf("%s", tmp);
- g_free(tmp);
- break;
- }
- case QTYPE_QSTRING: {
- QString *value = qobject_to(QString, obj);
- qemu_printf("%s", qstring_get_str(value));
- break;
- }
- case QTYPE_QDICT: {
- QDict *value = qobject_to(QDict, obj);
- dump_qdict(comp_indent, value);
- break;
- }
- case QTYPE_QLIST: {
- QList *value = qobject_to(QList, obj);
- dump_qlist(comp_indent, value);
- break;
- }
- case QTYPE_QBOOL: {
- QBool *value = qobject_to(QBool, obj);
- qemu_printf("%s", qbool_get_bool(value) ? "true" : "false");
- break;
- }
- default:
- abort();
- }
-}
-
-static void dump_qlist(int indentation, QList *list)
-{
- const QListEntry *entry;
- int i = 0;
-
- for (entry = qlist_first(list); entry; entry = qlist_next(entry), i++) {
- QType type = qobject_type(entry->value);
- bool composite = (type == QTYPE_QDICT || type == QTYPE_QLIST);
- qemu_printf("%*s[%i]:%c", indentation * 4, "", i,
- composite ? '\n' : ' ');
- dump_qobject(indentation + 1, entry->value);
- if (!composite) {
- qemu_printf("\n");
- }
- }
-}
-
-static void dump_qdict(int indentation, QDict *dict)
-{
- const QDictEntry *entry;
-
- for (entry = qdict_first(dict); entry; entry = qdict_next(dict, entry)) {
- QType type = qobject_type(entry->value);
- bool composite = (type == QTYPE_QDICT || type == QTYPE_QLIST);
- char *key = g_malloc(strlen(entry->key) + 1);
- int i;
-
- /* replace dashes with spaces in key (variable) names */
- for (i = 0; entry->key[i]; i++) {
- key[i] = entry->key[i] == '-' ? ' ' : entry->key[i];
- }
- key[i] = 0;
- qemu_printf("%*s%s:%c", indentation * 4, "", key,
- composite ? '\n' : ' ');
- dump_qobject(indentation + 1, entry->value);
- if (!composite) {
- qemu_printf("\n");
- }
- g_free(key);
- }
-}
-
void bdrv_image_info_specific_dump(ImageInfoSpecific *info_spec)
{
QObject *obj, *data;
@@ -785,7 +705,7 @@ void bdrv_image_info_specific_dump(ImageInfoSpecific *info_spec)
visit_type_ImageInfoSpecific(v, NULL, &info_spec, &error_abort);
visit_complete(v, &obj);
data = qdict_get(qobject_to(QDict, obj), "data");
- dump_qobject(1, data);
+ dump_qobject(1, data, qemu_printf);
qobject_unref(obj);
visit_free(v);
}
diff --git a/include/qapi/qmp/qdict.h b/include/qapi/qmp/qdict.h
index d5b5430e21a9..e529a9a9a29c 100644
--- a/include/qapi/qmp/qdict.h
+++ b/include/qapi/qmp/qdict.h
@@ -67,4 +67,6 @@ QDict *qdict_clone_shallow(const QDict *src);
QObject *qdict_crumple(const QDict *src, Error **errp);
void qdict_flatten(QDict *qdict);
+void dump_qdict(int indentation, QDict *dict, int (*qemu_printf)(const char *fmt, ...));
+
#endif /* QDICT_H */
diff --git a/include/qapi/qmp/qlist.h b/include/qapi/qmp/qlist.h
index 06e98ad5f498..4af55d82d3e4 100644
--- a/include/qapi/qmp/qlist.h
+++ b/include/qapi/qmp/qlist.h
@@ -62,4 +62,5 @@ static inline const QListEntry *qlist_next(const QListEntry *entry)
return QTAILQ_NEXT(entry, next);
}
+void dump_qlist(int indentation, QList *list, int (*qemu_printf)(const char *fmt, ...));
#endif /* QLIST_H */
diff --git a/include/qapi/qmp/qobject.h b/include/qapi/qmp/qobject.h
index 9003b71fd32d..bf893b146217 100644
--- a/include/qapi/qmp/qobject.h
+++ b/include/qapi/qmp/qobject.h
@@ -135,4 +135,5 @@ static inline QObject *qobject_check_type(const QObject *obj, QType type)
}
}
+void dump_qobject(int comp_indent, QObject *obj, int (*qemu_printf)(const char *fmt, ...));
#endif /* QOBJECT_H */
diff --git a/qobject/qdict.c b/qobject/qdict.c
index 0216ca7ac168..c09d98710c6d 100644
--- a/qobject/qdict.c
+++ b/qobject/qdict.c
@@ -442,3 +442,28 @@ void qdict_destroy_obj(QObject *obj)
g_free(qdict);
}
+
+void dump_qdict(int indentation, QDict *dict, int (*qemu_printf)(const char *fmt, ...))
+{
+ const QDictEntry *entry;
+
+ for (entry = qdict_first(dict); entry; entry = qdict_next(dict, entry)) {
+ QType type = qobject_type(entry->value);
+ bool composite = (type == QTYPE_QDICT || type == QTYPE_QLIST);
+ char *key = g_malloc(strlen(entry->key) + 1);
+ int i;
+
+ /* replace dashes with spaces in key (variable) names */
+ for (i = 0; entry->key[i]; i++) {
+ key[i] = entry->key[i] == '-' ? ' ' : entry->key[i];
+ }
+ key[i] = 0;
+ qemu_printf("%*s%s:%c", indentation * 4, "", key,
+ composite ? '\n' : ' ');
+ dump_qobject(indentation + 1, entry->value, qemu_printf);
+ if (!composite) {
+ qemu_printf("\n");
+ }
+ g_free(key);
+ }
+}
diff --git a/qobject/qlist.c b/qobject/qlist.c
index 60562a1f5269..d32bd7f08925 100644
--- a/qobject/qlist.c
+++ b/qobject/qlist.c
@@ -182,3 +182,20 @@ void qlist_destroy_obj(QObject *obj)
g_free(qlist);
}
+
+void dump_qlist(int indentation, QList *list, int (*qemu_printf)(const char *fmt, ...))
+{
+ const QListEntry *entry;
+ int i = 0;
+
+ for (entry = qlist_first(list); entry; entry = qlist_next(entry), i++) {
+ QType type = qobject_type(entry->value);
+ bool composite = (type == QTYPE_QDICT || type == QTYPE_QLIST);
+ qemu_printf("%*s[%i]:%c", indentation * 4, "", i,
+ composite ? '\n' : ' ');
+ dump_qobject(indentation + 1, entry->value, qemu_printf);
+ if (!composite) {
+ qemu_printf("\n");
+ }
+ }
+}
diff --git a/qobject/qobject.c b/qobject/qobject.c
index d7077b8f2a9d..01a3524db42f 100644
--- a/qobject/qobject.c
+++ b/qobject/qobject.c
@@ -70,3 +70,38 @@ bool qobject_is_equal(const QObject *x, const QObject *y)
return qis_equal[x->base.type](x, y);
}
+
+void dump_qobject(int comp_indent, QObject *obj, int (*qemu_printf)(const char *fmt, ...))
+{
+ switch (qobject_type(obj)) {
+ case QTYPE_QNUM: {
+ QNum *value = qobject_to(QNum, obj);
+ char *tmp = qnum_to_string(value);
+ qemu_printf("%s", tmp);
+ g_free(tmp);
+ break;
+ }
+ case QTYPE_QSTRING: {
+ QString *value = qobject_to(QString, obj);
+ qemu_printf("%s", qstring_get_str(value));
+ break;
+ }
+ case QTYPE_QDICT: {
+ QDict *value = qobject_to(QDict, obj);
+ dump_qdict(comp_indent, value, qemu_printf);
+ break;
+ }
+ case QTYPE_QLIST: {
+ QList *value = qobject_to(QList, obj);
+ dump_qlist(comp_indent, value, qemu_printf);
+ break;
+ }
+ case QTYPE_QBOOL: {
+ QBool *value = qobject_to(QBool, obj);
+ qemu_printf("%s", qbool_get_bool(value) ? "true" : "false");
+ break;
+ }
+ default:
+ abort();
+ }
+}
--
2.31.1
next prev parent reply other threads:[~2021-11-10 13:58 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-10 13:56 [PATCH 0/3] tests/qtest: add some tests for virtio-net failover Laurent Vivier
2021-11-10 13:56 ` Laurent Vivier [this message]
2021-11-10 16:17 ` [PATCH 1/3] qdict: make available dump_qobject(), dump_qdict(), dump_qlist() Markus Armbruster
2021-11-10 17:11 ` Laurent Vivier
2021-11-10 13:56 ` [PATCH 2/3] qtest/libqos: add a function to initialize secondary PCI buses Laurent Vivier
2021-11-10 13:56 ` [PATCH 3/3] tests/qtest: add some tests for virtio-net failover Laurent Vivier
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=20211110135616.1188725-2-lvivier@redhat.com \
--to=lvivier@redhat.com \
--cc=armbru@redhat.com \
--cc=hreitz@redhat.com \
--cc=kwolf@redhat.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=thuth@redhat.com \
/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).