Commite8c9e65816
"qom: Make "info qom-tree" show children sorted" created a memory leak, because I didn't realize object_get_canonical_path_component()'s value needs to be freed. Reproducer: $ qemu-system-x86_64 -nodefaults -display none -S -monitor stdio QEMU 5.0.50 monitor - type 'help' for more information (qemu) info qom-tree This leaks some 4500 path components, 12-13 characters on average, i.e. roughly 100kBytes depending on the allocator. A couple of hundred "info qom-tree" here, a couple of hundred there, and soon enough we're talking about real memory. Plug the leak. Fixes:e8c9e65816
Signed-off-by: Markus Armbruster <armbru@redhat.com> Reported-by: Reviewed-by: Li Qiang <liq3ea@gmail.com> [sent same patch] Message-Id: <20200714160202.3121879-3-armbru@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Signed-off-by: Thomas Huth <thuth@redhat.com>
156 lines
4.1 KiB
C
156 lines
4.1 KiB
C
/*
|
|
* HMP commands related to QOM
|
|
*
|
|
* This work is licensed under the terms of the GNU GPL, version 2 or
|
|
* later. See the COPYING file in the top-level directory.
|
|
*/
|
|
|
|
#include "qemu/osdep.h"
|
|
#include "hw/qdev-core.h"
|
|
#include "monitor/hmp.h"
|
|
#include "monitor/monitor.h"
|
|
#include "qapi/error.h"
|
|
#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)
|
|
{
|
|
const char *path = qdict_get_try_str(qdict, "path");
|
|
ObjectPropertyInfoList *list;
|
|
Error *err = NULL;
|
|
|
|
if (path == NULL) {
|
|
monitor_printf(mon, "/\n");
|
|
return;
|
|
}
|
|
|
|
list = qmp_qom_list(path, &err);
|
|
if (err == NULL) {
|
|
ObjectPropertyInfoList *start = list;
|
|
while (list != NULL) {
|
|
ObjectPropertyInfo *value = list->value;
|
|
|
|
monitor_printf(mon, "%s (%s)\n",
|
|
value->name, value->type);
|
|
list = list->next;
|
|
}
|
|
qapi_free_ObjectPropertyInfoList(start);
|
|
}
|
|
hmp_handle_error(mon, err);
|
|
}
|
|
|
|
void hmp_qom_set(Monitor *mon, const QDict *qdict)
|
|
{
|
|
const bool json = qdict_get_try_bool(qdict, "json", false);
|
|
const char *path = qdict_get_str(qdict, "path");
|
|
const char *property = qdict_get_str(qdict, "property");
|
|
const char *value = qdict_get_str(qdict, "value");
|
|
Error *err = NULL;
|
|
|
|
if (!json) {
|
|
Object *obj = object_resolve_path(path, NULL);
|
|
|
|
if (!obj) {
|
|
error_set(&err, ERROR_CLASS_DEVICE_NOT_FOUND,
|
|
"Device '%s' not found", path);
|
|
} else {
|
|
object_property_parse(obj, property, value, &err);
|
|
}
|
|
} else {
|
|
QObject *obj = qobject_from_json(value, &err);
|
|
|
|
if (!err) {
|
|
qmp_qom_set(path, property, obj, &err);
|
|
}
|
|
}
|
|
|
|
hmp_handle_error(mon, err);
|
|
}
|
|
|
|
void hmp_qom_get(Monitor *mon, const QDict *qdict)
|
|
{
|
|
const char *path = qdict_get_str(qdict, "path");
|
|
const char *property = qdict_get_str(qdict, "property");
|
|
Error *err = NULL;
|
|
QObject *obj = qmp_qom_get(path, property, &err);
|
|
|
|
if (err == NULL) {
|
|
QString *str = qobject_to_json_pretty(obj);
|
|
monitor_printf(mon, "%s\n", qstring_get_str(str));
|
|
qobject_unref(str);
|
|
}
|
|
|
|
qobject_unref(obj);
|
|
hmp_handle_error(mon, err);
|
|
}
|
|
|
|
typedef struct QOMCompositionState {
|
|
Monitor *mon;
|
|
int indent;
|
|
} QOMCompositionState;
|
|
|
|
static void print_qom_composition(Monitor *mon, Object *obj, int indent);
|
|
|
|
static int qom_composition_compare(const void *a, const void *b, void *ignore)
|
|
{
|
|
g_autofree char *ac = object_get_canonical_path_component(a);
|
|
g_autofree char *bc = object_get_canonical_path_component(b);
|
|
|
|
return g_strcmp0(ac, bc);
|
|
}
|
|
|
|
static int insert_qom_composition_child(Object *obj, void *opaque)
|
|
{
|
|
GQueue *children = opaque;
|
|
|
|
g_queue_insert_sorted(children, obj, qom_composition_compare, NULL);
|
|
return 0;
|
|
}
|
|
|
|
static void print_qom_composition(Monitor *mon, Object *obj, int indent)
|
|
{
|
|
char *name;
|
|
GQueue children;
|
|
Object *child;
|
|
|
|
if (obj == object_get_root()) {
|
|
name = g_strdup("");
|
|
} else {
|
|
name = object_get_canonical_path_component(obj);
|
|
}
|
|
monitor_printf(mon, "%*s/%s (%s)\n", indent, "", name,
|
|
object_get_typename(obj));
|
|
g_free(name);
|
|
|
|
g_queue_init(&children);
|
|
object_child_foreach(obj, insert_qom_composition_child, &children);
|
|
while ((child = g_queue_pop_head(&children))) {
|
|
print_qom_composition(mon, child, indent + 2);
|
|
}
|
|
}
|
|
|
|
void hmp_info_qom_tree(Monitor *mon, const QDict *dict)
|
|
{
|
|
const char *path = qdict_get_try_str(dict, "path");
|
|
Object *obj;
|
|
bool ambiguous = false;
|
|
|
|
if (path) {
|
|
obj = object_resolve_path(path, &ambiguous);
|
|
if (!obj) {
|
|
monitor_printf(mon, "Path '%s' could not be resolved.\n", path);
|
|
return;
|
|
}
|
|
if (ambiguous) {
|
|
monitor_printf(mon, "Warning: Path '%s' is ambiguous.\n", path);
|
|
return;
|
|
}
|
|
} else {
|
|
obj = qdev_get_machine();
|
|
}
|
|
print_qom_composition(mon, obj, 0);
|
|
}
|