]> git.proxmox.com Git - mirror_qemu.git/commit - qobject/qjson.c
qobject: Change qobject_to_json()'s value to GString
authorMarkus Armbruster <armbru@redhat.com>
Fri, 11 Dec 2020 17:11:37 +0000 (18:11 +0100)
committerMarkus Armbruster <armbru@redhat.com>
Sat, 19 Dec 2020 09:38:43 +0000 (10:38 +0100)
commiteab3a4678b07267c39e7290a6e9e7690b1d2a521
tree223d43bbde1e59f4f6867a36e2dfdf0ca36603f3
parentf1cc129df8341ebb6176363d24b57035bb5dabe4
qobject: Change qobject_to_json()'s value to GString

qobject_to_json() and qobject_to_json_pretty() build a GString, then
covert it to QString.  Just one of the callers actually needs a
QString: qemu_rbd_parse_filename().  A few others need a string they
can modify: qmp_send_response(), qga's send_response(), to_json_str(),
and qmp_fd_vsend_fds().  The remainder just need a string.

Change qobject_to_json() and qobject_to_json_pretty() to return the
GString.

qemu_rbd_parse_filename() now has to convert to QString.  All others
save a QString temporary.  to_json_str() actually becomes a bit
simpler, because GString provides more convenient modification
functions.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20201211171152.146877-6-armbru@redhat.com>
12 files changed:
block.c
block/rbd.c
include/qapi/qmp/qjson.h
monitor/qmp.c
qemu-img.c
qga/main.c
qobject/qjson.c
qom/object_interfaces.c
qom/qom-hmp-cmds.c
tests/check-qjson.c
tests/qtest/libqtest.c
tests/test-visitor-serialization.c