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

hmp: Drop pointless allocation during qapi visit 

The qapi visitor contract allows us to visit a virtual structure,
where we don't have any corresponding qapi struct.  Most such uses
pass NULL for @obj; but these two callers were passing a dummy
pointer, which then gets allocated to heap memory but then
immediately freed without use.  Clean this up to suppress unwanted
allocation, like we do elsewhere.

Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <1454075341-13658-7-git-send-email-eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
This commit is contained in:
Eric Blake 2016-01-29 06:48:42 -07:00 committed by Markus Armbruster
parent e408311546
commit 7019738d4c
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hmp.c
View File

@ -1657,7 +1657,6 @@ void hmp_object_add(Monitor *mon, const QDict *qdict)
QemuOpts *opts;
char *type = NULL;
char *id = NULL;
void *dummy = NULL;
OptsVisitor *ov;
QDict *pdict;
@ -1669,7 +1668,7 @@ void hmp_object_add(Monitor *mon, const QDict *qdict)
ov = opts_visitor_new(opts);
pdict = qdict_clone_shallow(qdict);
visit_start_struct(opts_get_visitor(ov), &dummy, NULL, NULL, 0, &err);
visit_start_struct(opts_get_visitor(ov), NULL, NULL, NULL, 0, &err);
if (err) {
goto out_clean;
}
@ -1701,7 +1700,6 @@ out_clean:
qemu_opts_del(opts);
g_free(id);
g_free(type);
g_free(dummy);
out:
hmp_handle_error(mon, &err);

4
vl.c
View File

@ -2821,7 +2821,6 @@ static int object_create(void *opaque, QemuOpts *opts, Error **errp)
Error *err = NULL;
char *type = NULL;
char *id = NULL;
void *dummy = NULL;
OptsVisitor *ov;
QDict *pdict;
bool (*type_predicate)(const char *) = opaque;
@ -2829,7 +2828,7 @@ static int object_create(void *opaque, QemuOpts *opts, Error **errp)
ov = opts_visitor_new(opts);
pdict = qemu_opts_to_qdict(opts, NULL);
visit_start_struct(opts_get_visitor(ov), &dummy, NULL, NULL, 0, &err);
visit_start_struct(opts_get_visitor(ov), NULL, NULL, NULL, 0, &err);
if (err) {
goto out;
}
@ -2864,7 +2863,6 @@ out:
QDECREF(pdict);
g_free(id);
g_free(type);
g_free(dummy);
if (err) {
error_report_err(err);
return -1;