OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

qapi: A couple more QAPI_LIST_PREPEND() stragglers 

Commit 54aa3de72e switched multiple sites to use QAPI_LIST_PREPEND
instead of open-coding, but missed a couple of spots.

Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <20210113221013.390592-3-eblake@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
This commit is contained in:
Eric Blake 2021-01-13 16:10:10 -06:00 committed by Markus Armbruster
parent e9d635ea18
commit 240ee8bd31
2 changed files with 15 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
hw/core/machine-qmp-cmds.c
View File

@ -293,41 +293,31 @@ void qmp_set_numa_node(NumaOptions *cmd, Error **errp)
static int query_memdev(Object *obj, void *opaque) static int query_memdev(Object *obj, void *opaque)
{ {
MemdevList **list = opaque; MemdevList **list = opaque;
MemdevList *m = NULL; Memdev *m;
QObject *host_nodes; QObject *host_nodes;
Visitor *v; Visitor *v;
if (object_dynamic_cast(obj, TYPE_MEMORY_BACKEND)) { if (object_dynamic_cast(obj, TYPE_MEMORY_BACKEND)) {
m = g_malloc0(sizeof(*m)); m = g_malloc0(sizeof(*m));
m->value = g_malloc0(sizeof(*m->value)); m->id = g_strdup(object_get_canonical_path_component(obj));
m->has_id = !!m->id;
m->value->id = g_strdup(object_get_canonical_path_component(obj)); m->size = object_property_get_uint(obj, "size", &error_abort);
m->value->has_id = !!m->value->id; m->merge = object_property_get_bool(obj, "merge", &error_abort);
m->dump = object_property_get_bool(obj, "dump", &error_abort);
m->value->size = object_property_get_uint(obj, "size", m->prealloc = object_property_get_bool(obj, "prealloc", &error_abort);
&error_abort); m->policy = object_property_get_enum(obj, "policy", "HostMemPolicy",
m->value->merge = object_property_get_bool(obj, "merge", &error_abort);
&error_abort);
m->value->dump = object_property_get_bool(obj, "dump",
&error_abort);
m->value->prealloc = object_property_get_bool(obj,
"prealloc",
&error_abort);
m->value->policy = object_property_get_enum(obj,
"policy",
"HostMemPolicy",
&error_abort);
host_nodes = object_property_get_qobject(obj, host_nodes = object_property_get_qobject(obj,
"host-nodes", "host-nodes",
&error_abort); &error_abort);
v = qobject_input_visitor_new(host_nodes); v = qobject_input_visitor_new(host_nodes);
visit_type_uint16List(v, NULL, &m->value->host_nodes, &error_abort); visit_type_uint16List(v, NULL, &m->host_nodes, &error_abort);
visit_free(v); visit_free(v);
qobject_unref(host_nodes); qobject_unref(host_nodes);
m->next = *list; QAPI_LIST_PREPEND(*list, m);
*list = m;
} }
return 0; return 0;

9
monitor/qmp-cmds-control.c
View File

@ -104,17 +104,16 @@ VersionInfo *qmp_query_version(Error **errp)
static void query_commands_cb(const QmpCommand *cmd, void *opaque) static void query_commands_cb(const QmpCommand *cmd, void *opaque)
{ {
CommandInfoList *info, **list = opaque; CommandInfo *info;
CommandInfoList **list = opaque;
if (!cmd->enabled) { if (!cmd->enabled) {
return; return;
} }
info = g_malloc0(sizeof(*info)); info = g_malloc0(sizeof(*info));
info->value = g_malloc0(sizeof(*info->value)); info->name = g_strdup(cmd->name);
info->value->name = g_strdup(cmd->name); QAPI_LIST_PREPEND(*list, info);
info->next = *list;
*list = info;
} }
CommandInfoList *qmp_query_commands(Error **errp) CommandInfoList *qmp_query_commands(Error **errp)