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

Merge branch 'tracing' of git://repo.or.cz/qemu/stefanha

Browse Source 
* '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
This commit is contained in:
Blue Swirl 2011-10-08 15:38:14 +00:00
commit 211685040f
4 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
block.c
View File

@ -475,6 +475,8 @@ static int bdrv_open_common(BlockDriverState *bs, const char *filename,
assert(drv != NULL); assert(drv != NULL);
trace_bdrv_open_common(bs, filename, flags, drv->format_name);
bs->file = NULL; bs->file = NULL;
bs->total_sectors = 0; bs->total_sectors = 0;
bs->encrypted = 0; bs->encrypted = 0;
@ -2997,7 +2999,7 @@ static int coroutine_fn bdrv_co_io_em(BlockDriverState *bs, int64_t sector_num,
bdrv_co_io_em_complete, &co); bdrv_co_io_em_complete, &co);
} }
trace_bdrv_co_io(is_write, acb); trace_bdrv_co_io_em(bs, sector_num, nb_sectors, is_write, acb);
if (!acb) { if (!acb) {
return -EIO; return -EIO;
} }

2
hmp-commands.hx
View File

@ -194,7 +194,7 @@ STEXI
changes status of a trace event changes status of a trace event
ETEXI ETEXI
#if defined(CONFIG_SIMPLE_TRACE) #if defined(CONFIG_TRACE_SIMPLE)
{ {
.name = "trace-file", .name = "trace-file",
.args_type = "op:s?,arg:F?", .args_type = "op:s?,arg:F?",

7
monitor.c
View File

@ -57,11 +57,11 @@
#include "json-parser.h" #include "json-parser.h"
#include "osdep.h" #include "osdep.h"
#include "cpu.h" #include "cpu.h"
#include "trace.h"
#include "trace/control.h" #include "trace/control.h"
#ifdef CONFIG_TRACE_SIMPLE #ifdef CONFIG_TRACE_SIMPLE
#include "trace/simple.h" #include "trace/simple.h"
#endif #endif
#include "trace/control.h"
#include "ui/qemu-spice.h" #include "ui/qemu-spice.h"
#include "memory.h" #include "memory.h"
@ -370,6 +370,8 @@ static void monitor_protocol_emitter(Monitor *mon, QObject *data)
{ {
QDict *qmp; QDict *qmp;
trace_monitor_protocol_emitter(mon);
qmp = qdict_new(); qmp = qdict_new();
if (!monitor_has_error(mon)) { 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) static void do_trace_file(Monitor *mon, const QDict *qdict)
{ {
const char *op = qdict_get_try_str(qdict, "op"); 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); qobject_incref(mon->mc->id);
cmd_name = qdict_get_str(input, "execute"); cmd_name = qdict_get_str(input, "execute");
trace_handle_qmp_command(mon, cmd_name);
if (invalid_qmp_mode(mon, cmd_name)) { if (invalid_qmp_mode(mon, cmd_name)) {
qerror_report(QERR_COMMAND_NOT_FOUND, cmd_name); qerror_report(QERR_COMMAND_NOT_FOUND, cmd_name);
goto err_out; goto err_out;

7
trace-events
View File

@ -56,6 +56,7 @@ virtio_console_chr_read(unsigned int port, int size) "port %u, size %d"
virtio_console_chr_event(unsigned int port, int event) "port %u, event %d" virtio_console_chr_event(unsigned int port, int event) "port %u, event %d"
# block.c # block.c
bdrv_open_common(void *bs, const char *filename, int flags, const char *format_name) "bs %p filename \"%s\" flags %#x format_name \"%s\""
multiwrite_cb(void *mcb, int ret) "mcb %p ret %d" multiwrite_cb(void *mcb, int ret) "mcb %p ret %d"
bdrv_aio_multiwrite(void *mcb, int num_callbacks, int num_reqs) "mcb %p num_callbacks %d num_reqs %d" bdrv_aio_multiwrite(void *mcb, int num_callbacks, int num_reqs) "mcb %p num_callbacks %d num_reqs %d"
bdrv_aio_multiwrite_earlyfail(void *mcb) "mcb %p" bdrv_aio_multiwrite_earlyfail(void *mcb) "mcb %p"
@ -66,7 +67,7 @@ bdrv_aio_writev(void *bs, int64_t sector_num, int nb_sectors, void *opaque) "bs
bdrv_lock_medium(void *bs, bool locked) "bs %p locked %d" bdrv_lock_medium(void *bs, bool locked) "bs %p locked %d"
bdrv_co_readv(void *bs, int64_t sector_num, int nb_sector) "bs %p sector_num %"PRId64" nb_sectors %d" bdrv_co_readv(void *bs, int64_t sector_num, int nb_sector) "bs %p sector_num %"PRId64" nb_sectors %d"
bdrv_co_writev(void *bs, int64_t sector_num, int nb_sector) "bs %p sector_num %"PRId64" nb_sectors %d" bdrv_co_writev(void *bs, int64_t sector_num, int nb_sector) "bs %p sector_num %"PRId64" nb_sectors %d"
bdrv_co_io(int is_write, void *acb) "is_write %d acb %p" bdrv_co_io_em(void *bs, int64_t sector_num, int nb_sectors, int is_write, void *acb) "bs %p sector_num %"PRId64" nb_sectors %d is_write %d acb %p"
# hw/virtio-blk.c # hw/virtio-blk.c
virtio_blk_req_complete(void *req, int status) "req %p status %d" virtio_blk_req_complete(void *req, int status) "req %p status %d"
@ -533,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_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_selatns(uint32_t val) "Select with ATN & stop (%2.2x)"
esp_mem_writeb_cmd_ensel(uint32_t val) "Enable selection (%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"