aboutsummaryrefslogtreecommitdiff
path: root/monitor.c
diff options
context:
space:
mode:
authorBlue Swirl <blauwirbel@gmail.com>2011-10-08 15:38:14 +0000
committerBlue Swirl <blauwirbel@gmail.com>2011-10-08 15:38:14 +0000
commit211685040f4e579f83a3ed8b3aa7a3f363ad384f (patch)
tree23c6b4bca9564b5fcd4f2bcbe151031537222608 /monitor.c
parentdc439de7f96dc1a17e137273366123df24837876 (diff)
parent59370aaa5693d57c350074e537f2627d5b9d446c (diff)
downloadqemu-211685040f4e579f83a3ed8b3aa7a3f363ad384f.zip
qemu-211685040f4e579f83a3ed8b3aa7a3f363ad384f.tar.gz
qemu-211685040f4e579f83a3ed8b3aa7a3f363ad384f.tar.bz2
Merge branch 'tracing' of git://repo.or.cz/qemu/stefanha
* 'tracing' of git://repo.or.cz/qemu/stefanha: trace: add arguments to bdrv_co_io_em() trace event trace: trace monitor qmp dispatch/completion trace: trace bdrv_open_common() hmp: re-enable trace-file command
Diffstat (limited to 'monitor.c')
-rw-r--r--monitor.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/monitor.c b/monitor.c
index 58e149f..da13471 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)) {
@@ -606,7 +608,7 @@ static void do_trace_event_set_state(Monitor *mon, const QDict *qdict)
}
}
-#ifdef CONFIG_SIMPLE_TRACE
+#ifdef CONFIG_TRACE_SIMPLE
static void do_trace_file(Monitor *mon, const QDict *qdict)
{
const char *op = qdict_get_try_str(qdict, "op");
@@ -5103,6 +5105,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;