From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:55167) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RAgji-00018T-UB for qemu-devel@nongnu.org; Mon, 03 Oct 2011 07:31:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RAgjh-0005Cl-4a for qemu-devel@nongnu.org; Mon, 03 Oct 2011 07:31:06 -0400 Received: from mtagate2.uk.ibm.com ([194.196.100.162]:55363) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RAgjg-0005CU-TW for qemu-devel@nongnu.org; Mon, 03 Oct 2011 07:31:05 -0400 Received: from d06nrmr1307.portsmouth.uk.ibm.com (d06nrmr1307.portsmouth.uk.ibm.com [9.149.38.129]) by mtagate2.uk.ibm.com (8.13.1/8.13.1) with ESMTP id p93BV4Co019562 for ; Mon, 3 Oct 2011 11:31:04 GMT Received: from d06av05.portsmouth.uk.ibm.com (d06av05.portsmouth.uk.ibm.com [9.149.37.229]) by d06nrmr1307.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p93BV4et2363472 for ; Mon, 3 Oct 2011 12:31:04 +0100 Received: from d06av05.portsmouth.uk.ibm.com (loopback [127.0.0.1]) by d06av05.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p93BV3W9014397 for ; Mon, 3 Oct 2011 05:31:03 -0600 From: Stefan Hajnoczi Date: Mon, 3 Oct 2011 12:30:45 +0100 Message-Id: <1317641447-8084-4-git-send-email-stefanha@linux.vnet.ibm.com> In-Reply-To: <1317641447-8084-1-git-send-email-stefanha@linux.vnet.ibm.com> References: <1317641447-8084-1-git-send-email-stefanha@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH 3/4] trace: trace monitor qmp dispatch/completion List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Anthony Liguori , Stefan Hajnoczi Add trace events for handle_qmp_command(), which dispatches qmp commands, and monitor_protocol_emitter(), which produces the reply to a qmp command. Also remove duplicate #include "trace/control.h". Signed-off-by: Stefan Hajnoczi --- monitor.c | 5 ++++- trace-events | 4 ++++ 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/monitor.c b/monitor.c index 08f6197..cf59442 100644 --- a/monitor.c +++ b/monitor.c @@ -57,11 +57,11 @@ #include "json-parser.h" #include "osdep.h" #include "cpu.h" +#include "trace.h" #include "trace/control.h" #ifdef CONFIG_TRACE_SIMPLE #include "trace/simple.h" #endif -#include "trace/control.h" #include "ui/qemu-spice.h" #include "memory.h" @@ -370,6 +370,8 @@ static void monitor_protocol_emitter(Monitor *mon, QObject *data) { QDict *qmp; + trace_monitor_protocol_emitter(mon); + qmp = qdict_new(); if (!monitor_has_error(mon)) { @@ -5102,6 +5104,7 @@ static void handle_qmp_command(JSONMessageParser *parser, QList *tokens) qobject_incref(mon->mc->id); cmd_name = qdict_get_str(input, "execute"); + trace_handle_qmp_command(mon, cmd_name); if (invalid_qmp_mode(mon, cmd_name)) { qerror_report(QERR_COMMAND_NOT_FOUND, cmd_name); goto err_out; diff --git a/trace-events b/trace-events index f408564..c9fd8e5 100644 --- a/trace-events +++ b/trace-events @@ -534,3 +534,7 @@ esp_mem_writeb_cmd_sel(uint32_t val) "Select without ATN (%2.2x)" esp_mem_writeb_cmd_selatn(uint32_t val) "Select with ATN (%2.2x)" esp_mem_writeb_cmd_selatns(uint32_t val) "Select with ATN & stop (%2.2x)" esp_mem_writeb_cmd_ensel(uint32_t val) "Enable selection (%2.2x)" + +# monitor.c +handle_qmp_command(void *mon, const char *cmd_name) "mon %p cmd_name \"%s\"" +monitor_protocol_emitter(void *mon) "mon %p" -- 1.7.6.3