Commit 6f153ceb authored by Peter Maydell's avatar Peter Maydell
Browse files

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: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 735286a4 b097efc0

monitor.c

+7 −0
Original line number Diff line number Diff line
@@ -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;
@@ -3807,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) {
@@ -3824,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) {

trace-events

+2 −0
Original line number Diff line number Diff line
@@ -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_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"