From 79cad8b46ba79116ded5690ea2e265585bb9cb53 Mon Sep 17 00:00:00 2001 From: Stefan Hajnoczi Date: Mon, 5 Jun 2017 11:42:15 +0100 Subject: monitor: add handle_hmp_command trace event It is often useful to correlate QEMU-internal events with monitor commands that caused them. Trace the full HMP command being executed. Signed-off-by: Stefan Hajnoczi Reviewed-by: Eric Blake Message-id: 20170605104216.22429-2-stefanha@redhat.com Signed-off-by: Stefan Hajnoczi --- monitor.c | 2 ++ trace-events | 1 + 2 files changed, 3 insertions(+) diff --git a/monitor.c b/monitor.c index 1e63ace2d4..11de403edf 100644 --- a/monitor.c +++ b/monitor.c @@ -3088,6 +3088,8 @@ static void handle_hmp_command(Monitor *mon, const char *cmdline) QDict *qdict; const mon_cmd_t *cmd; + trace_handle_hmp_command(mon, cmdline); + cmd = monitor_parse_command(mon, &cmdline, mon->cmd_table); if (!cmd) { return; diff --git a/trace-events b/trace-events index b496be94d4..6fe78180f0 100644 --- a/trace-events +++ b/trace-events @@ -45,6 +45,7 @@ qemu_system_powerdown_request(void) "" monitor_protocol_event_handler(uint32_t event, void *qdict) "event=%d data=%p" monitor_protocol_event_emit(uint32_t event, void *data) "event=%d data=%p" monitor_protocol_event_queue(uint32_t event, void *qdict, uint64_t rate) "event=%d data=%p rate=%" PRId64 +handle_hmp_command(void *mon, const char *cmdline) "mon %p cmdline: %s" # dma-helpers.c dma_blk_io(void *dbs, void *bs, int64_t offset, bool to_dev) "dbs=%p bs=%p offset=%" PRId64 " to_dev=%d" -- cgit v1.2.3 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 +++++ trace-events | 1 + 2 files changed, 6 insertions(+) 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) { diff --git a/trace-events b/trace-events index 6fe78180f0..fd83087e39 100644 --- a/trace-events +++ b/trace-events @@ -46,6 +46,7 @@ monitor_protocol_event_handler(uint32_t event, void *qdict) "event=%d data=%p" monitor_protocol_event_emit(uint32_t event, void *data) "event=%d data=%p" monitor_protocol_event_queue(uint32_t event, void *qdict, uint64_t rate) "event=%d data=%p rate=%" PRId64 handle_hmp_command(void *mon, const char *cmdline) "mon %p cmdline: %s" +handle_qmp_command(void *mon, const char *req) "mon %p req: %s" # dma-helpers.c dma_blk_io(void *dbs, void *bs, int64_t offset, bool to_dev) "dbs=%p bs=%p offset=%" PRId64 " to_dev=%d" -- cgit v1.2.3