diff options
| author | Markus Armbruster | 2017-03-03 13:32:28 +0100 |
|---|---|---|
| committer | Markus Armbruster | 2017-03-05 09:14:19 +0100 |
| commit | 104fc3027960dd2aa9d310936a6cb201c60e1088 (patch) | |
| tree | 28a6fa71d34cda7abd7bb75c9ab0750e4d5f0f66 /trace-events | |
| parent | qmp: Clean up how we enforce capability negotiation (diff) | |
| download | qemu-104fc3027960dd2aa9d310936a6cb201c60e1088.tar.gz qemu-104fc3027960dd2aa9d310936a6cb201c60e1088.tar.xz qemu-104fc3027960dd2aa9d310936a6cb201c60e1088.zip | |
qmp: Drop duplicated QMP command object checks
qmp_check_input_obj() duplicates qmp_dispatch_check_obj(), except the
latter screws up an error message. handle_qmp_command() runs first
the former, then the latter via qmp_dispatch(), masking the screwup.
qemu-ga also masks the screwup, because it also duplicates checks,
just differently.
qmp_check_input_obj() exists because handle_qmp_command() needs to
examine the command before dispatching it. The previous commit got
rid of this need, except for a tracepoint, and a bit of "id" code that
relies on qdict not being null.
Fix up the error message in qmp_dispatch_check_obj(), drop
qmp_check_input_obj() and the tracepoint. Protect the "id" code with
a conditional.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <1488544368-30622-9-git-send-email-armbru@redhat.com>
Diffstat (limited to 'trace-events')
| -rw-r--r-- | trace-events | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/trace-events b/trace-events index 728855743c..b07a09ba95 100644 --- a/trace-events +++ b/trace-events @@ -65,7 +65,6 @@ xen_remap_bucket(uint64_t index) "index %#"PRIx64 xen_map_cache_return(void* ptr) "%p" # monitor.c -handle_qmp_command(void *mon, const char *cmd_name) "mon %p cmd_name \"%s\"" 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 |