haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

qmp: Always free QMPRequest with qmp_request_free()

Browse source 
monitor_qmp_dispatch_one() frees a QMPRequest manually, because it
needs to keep a reference to ->id.  Premature optimization.  Take an
additional reference so we can use qmp_request_free().

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <20180703085358.13941-15-armbru@redhat.com>
This commit is contained in:
Markus Armbruster 2018-07-03 10:53:40 +02:00
parent 45434ba47b
commit 05f7274c8b
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
monitor.c
View file

@ -4182,8 +4182,6 @@ static void monitor_qmp_dispatch_one(QMPRequest *req_obj)
id = req_obj->id;
need_resume = req_obj->need_resume;
g_free(req_obj);
old_mon = cur_mon;
cur_mon = mon;
@ -4192,14 +4190,14 @@ static void monitor_qmp_dispatch_one(QMPRequest *req_obj)
cur_mon = old_mon;
/* Respond if necessary */
monitor_qmp_respond(mon, rsp, NULL, id);
monitor_qmp_respond(mon, rsp, NULL, qobject_ref(id));
/* This pairs with the monitor_suspend() in handle_qmp_command(). */
if (need_resume) {
monitor_resume(mon);
}
qobject_unref(req);
qmp_request_free(req_obj);
}
/*