From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33015) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aH6db-0001wb-Pg for qemu-devel@nongnu.org; Thu, 07 Jan 2016 04:13:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aH6da-0002Lt-TA for qemu-devel@nongnu.org; Thu, 07 Jan 2016 04:13:43 -0500 Received: from mx1.redhat.com ([209.132.183.28]:43099) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aH6da-0002Lm-Na for qemu-devel@nongnu.org; Thu, 07 Jan 2016 04:13:42 -0500 From: Stefan Hajnoczi Date: Thu, 7 Jan 2016 17:13:26 +0800 Message-Id: <1452158009-17140-2-git-send-email-stefanha@redhat.com> In-Reply-To: <1452158009-17140-1-git-send-email-stefanha@redhat.com> References: <1452158009-17140-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PULL 1/4] trace: reflect the file name change List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Qinghua Jin , Stefan Hajnoczi From: Qinghua Jin Some functions was moved from block.c to block/io.c, so the trace-events file should reflect that change. Signed-off-by: Qinghua Jin Signed-off-by: Stefan Hajnoczi --- trace-events | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/trace-events b/trace-events index 6f03638..2112a74 100644 --- a/trace-events +++ b/trace-events @@ -59,6 +59,9 @@ virtio_console_chr_event(unsigned int port, int event) "port %u, event %d" # 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\"" +bdrv_lock_medium(void *bs, bool locked) "bs %p locked %d" + +# block/io.c 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_discard(void *bs, int64_t sector_num, int nb_sectors, void *opaque) "bs %p sector_num %"PRId64" nb_sectors %d opaque %p" @@ -66,7 +69,6 @@ bdrv_aio_flush(void *bs, void *opaque) "bs %p opaque %p" bdrv_aio_readv(void *bs, int64_t sector_num, int nb_sectors, void *opaque) "bs %p sector_num %"PRId64" nb_sectors %d opaque %p" bdrv_aio_writev(void *bs, int64_t sector_num, int nb_sectors, void *opaque) "bs %p sector_num %"PRId64" nb_sectors %d opaque %p" bdrv_aio_write_zeroes(void *bs, int64_t sector_num, int nb_sectors, int flags, void *opaque) "bs %p sector_num %"PRId64" nb_sectors %d flags %#x opaque %p" -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_copy_on_readv(void *bs, int64_t sector_num, int nb_sector) "bs %p sector_num %"PRId64" nb_sectors %d" bdrv_co_readv_no_serialising(void *bs, int64_t sector_num, int nb_sector) "bs %p sector_num %"PRId64" nb_sectors %d" -- 2.5.0