From 3c982979d2ad3741cd4150e44d1e863589a22048 Mon Sep 17 00:00:00 2001 From: Kevin Wolf Date: Tue, 14 Feb 2012 11:14:51 +0100 Subject: [PATCH 86/99] trace: add arguments to bdrv_co_io_em() trace event RH-Author: Kevin Wolf Message-id: <1329218101-24213-87-git-send-email-kwolf@redhat.com> Patchwork-id: 37269 O-Subject: [RHEL-6.3 qemu-kvm PATCH v2 86/96] trace: add arguments to bdrv_co_io_em() trace event Bugzilla: 783950 RH-Acked-by: Paolo Bonzini RH-Acked-by: Marcelo Tosatti RH-Acked-by: Laszlo Ersek From: Stefan Hajnoczi Bugzilla: 783950 It is useful to know the BlockDriverState as well as the sector_num/nb_sectors of an emulated .bdrv_co_*() request. Signed-off-by: Stefan Hajnoczi (cherry picked from commit 59370aaa5693d57c350074e537f2627d5b9d446c) Conflicts: trace-events Signed-off-by: Kevin Wolf --- block.c | 2 +- trace-events | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) Signed-off-by: Michal Novotny --- block.c | 2 +- trace-events | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/block.c b/block.c index 879fc7d..008afed 100644 --- a/block.c +++ b/block.c @@ -2747,7 +2747,7 @@ static int coroutine_fn bdrv_co_io_em(BlockDriverState *bs, int64_t sector_num, 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) { return -EIO; } diff --git a/trace-events b/trace-events index 4727006..e0d3b79 100644 --- a/trace-events +++ b/trace-events @@ -57,7 +57,7 @@ disable bdrv_aio_writev(void *bs, int64_t sector_num, int nb_sectors, void *opaq disable bdrv_lock_medium(void *bs, int locked) "bs %p locked %d" disable bdrv_co_readv(void *bs, int64_t sector_num, int nb_sector) "bs %p sector_num %"PRId64" nb_sectors %d" disable bdrv_co_writev(void *bs, int64_t sector_num, int nb_sector) "bs %p sector_num %"PRId64" nb_sectors %d" -disable bdrv_co_io(int is_write, void *acb) "is_write %d acb %p" +disable 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 disable virtio_blk_req_complete(void *req, int status) "req %p status %d" -- 1.7.7.5