From b097efc0027e36fd15a4fc2e415e780611024757 Mon Sep 17 00:00:00 2001 From: Stefan Hajnoczi Date: Mon, 5 Jun 2017 11:42:16 +0100 Subject: monitor: resurrect handle_qmp_command trace event Commit 104fc3027960dd2aa9d310936a6cb201c60e1088 ("qmp: Drop duplicated QMP command object checks") removed the call to trace_handle_qmp_command() while eliminating code duplication. This patch brings the trace event back so QEMU-internal trace events can be correlated with the QMP commands that caused them. Signed-off-by: Stefan Hajnoczi Reviewed-by: Eric Blake Message-id: 20170605104216.22429-3-stefanha@redhat.com Signed-off-by: Stefan Hajnoczi --- monitor.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'monitor.c') diff --git a/monitor.c b/monitor.c index 11de403edf..fcf4fad47b 100644 --- a/monitor.c +++ b/monitor.c @@ -3809,6 +3809,7 @@ static void handle_qmp_command(JSONMessageParser *parser, GQueue *tokens) QDict *qdict = NULL; Monitor *mon = cur_mon; Error *err = NULL; + QString *req_json; req = json_parser_parse_err(tokens, NULL, &err); if (!req && !err) { @@ -3826,6 +3827,10 @@ static void handle_qmp_command(JSONMessageParser *parser, GQueue *tokens) qdict_del(qdict, "id"); } /* else will fail qmp_dispatch() */ + req_json = qobject_to_json(req); + trace_handle_qmp_command(mon, qstring_get_str(req_json)); + qobject_decref(QOBJECT(req_json)); + rsp = qmp_dispatch(cur_mon->qmp.commands, req); if (mon->qmp.commands == &qmp_cap_negotiation_commands) { -- cgit v1.2.1