SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

-----BEGIN PGP SIGNATURE-----

Browse Source 
iQEcBAABAgAGBQJZP+odAAoJEJykq7OBq3PIQc8IALCU45jLhD8dSbayR4O9GEsK
 ybeRqANqvzKi5vraDoKY3kbpNwgf60IKpks2fOJ4shRkyIOP5fICAbBD3yhKX9ZP
 CJEo6K4iLVHN/Ki8LSg1p9vPE+ubXVzyJSSNBASDdSwppHWlXhqqaJeZH2je3rU6
 MC8QFBO2dPNx4TdWW5cjYM4tKKyv4Qr2xyQLyFvCZnDoRxqzz6td2tZsVo5G7o86
 s0B/kPlj3A8xV30UfLw2dLAp3AlLL2sgiHsi6yT9xGy2OFPFXTERcYaaaRDqhpgu
 20QJS7ABCKYHjddseqjzLQnmyJ1YsQp1J+VixGQo6Eut73c2bba1Shi0K1dgsGU=
 =ZFsK
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging

# gpg: Signature made Tue 13 Jun 2017 14:35:25 BST
# gpg:                using RSA key 0x9CA4ABB381AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>"
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35  775A 9CA4 ABB3 81AB 73C8

* remotes/stefanha/tags/tracing-pull-request:
  monitor: resurrect handle_qmp_command trace event
  monitor: add handle_hmp_command trace event

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2017-06-13 14:40:17 +01:00
commit 6f153ceb9b
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
monitor.c
View File

@ -3088,6 +3088,8 @@ static void handle_hmp_command(Monitor *mon, const char *cmdline)
QDict *qdict; QDict *qdict;
const mon_cmd_t *cmd; const mon_cmd_t *cmd;
trace_handle_hmp_command(mon, cmdline);
cmd = monitor_parse_command(mon, &cmdline, mon->cmd_table); cmd = monitor_parse_command(mon, &cmdline, mon->cmd_table);
if (!cmd) { if (!cmd) {
return; return;
@ -3807,6 +3809,7 @@ static void handle_qmp_command(JSONMessageParser *parser, GQueue *tokens)
QDict *qdict = NULL; QDict *qdict = NULL;
Monitor *mon = cur_mon; Monitor *mon = cur_mon;
Error *err = NULL; Error *err = NULL;
QString *req_json;
req = json_parser_parse_err(tokens, NULL, &err); req = json_parser_parse_err(tokens, NULL, &err);
if (!req && !err) { if (!req && !err) {
@ -3824,6 +3827,10 @@ static void handle_qmp_command(JSONMessageParser *parser, GQueue *tokens)
qdict_del(qdict, "id"); qdict_del(qdict, "id");
} /* else will fail qmp_dispatch() */ } /* 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); rsp = qmp_dispatch(cur_mon->qmp.commands, req);
if (mon->qmp.commands == &qmp_cap_negotiation_commands) { if (mon->qmp.commands == &qmp_cap_negotiation_commands) {

2
trace-events
View File

@ -45,6 +45,8 @@ qemu_system_powerdown_request(void) ""
monitor_protocol_event_handler(uint32_t event, void *qdict) "event=%d data=%p" 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_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 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-helpers.c
dma_blk_io(void *dbs, void *bs, int64_t offset, bool to_dev) "dbs=%p bs=%p offset=%" PRId64 " to_dev=%d" dma_blk_io(void *dbs, void *bs, int64_t offset, bool to_dev) "dbs=%p bs=%p offset=%" PRId64 " to_dev=%d"