mirror of
https://github.com/mii443/qemu.git
synced 2025-08-22 15:15:46 +00:00
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>
This commit is contained in:
@ -5,7 +5,6 @@
|
||||
#include "qapi/qmp/qdict.h"
|
||||
#include "qapi/qmp/qerror.h"
|
||||
#include "qapi/qmp/qjson.h"
|
||||
#include "qapi/qmp/qstring.h"
|
||||
#include "qapi/qobject-input-visitor.h"
|
||||
#include "qom/object_interfaces.h"
|
||||
#include "qemu/help_option.h"
|
||||
@ -207,7 +206,8 @@ char *object_property_help(const char *name, const char *type,
|
||||
g_string_append(str, description);
|
||||
}
|
||||
if (defval) {
|
||||
g_autofree char *def_json = qstring_free(qobject_to_json(defval), TRUE);
|
||||
g_autofree char *def_json = g_string_free(qobject_to_json(defval),
|
||||
true);
|
||||
g_string_append_printf(str, " (default: %s)", def_json);
|
||||
}
|
||||
|
||||
|
@ -13,7 +13,6 @@
|
||||
#include "qapi/qapi-commands-qom.h"
|
||||
#include "qapi/qmp/qdict.h"
|
||||
#include "qapi/qmp/qjson.h"
|
||||
#include "qapi/qmp/qstring.h"
|
||||
#include "qom/object.h"
|
||||
|
||||
void hmp_qom_list(Monitor *mon, const QDict *qdict)
|
||||
@ -78,9 +77,9 @@ void hmp_qom_get(Monitor *mon, const QDict *qdict)
|
||||
QObject *obj = qmp_qom_get(path, property, &err);
|
||||
|
||||
if (err == NULL) {
|
||||
QString *str = qobject_to_json_pretty(obj, true);
|
||||
monitor_printf(mon, "%s\n", qstring_get_str(str));
|
||||
qobject_unref(str);
|
||||
GString *str = qobject_to_json_pretty(obj, true);
|
||||
monitor_printf(mon, "%s\n", str->str);
|
||||
g_string_free(str, true);
|
||||
}
|
||||
|
||||
qobject_unref(obj);
|
||||
|
Reference in New Issue
Block a user