From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yoshiaki Tamura Subject: [PATCH 14/19] block: insert event-tap to bdrv_aio_writev() and bdrv_aio_flush(). Date: Wed, 26 Jan 2011 18:42:06 +0900 Message-ID: <1296034931-10843-15-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> References: <1296034931-10843-1-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> Cc: avi@redhat.com, anthony@codemonkey.ws, aliguori@us.ibm.com, mtosatti@redhat.com, dlaor@redhat.com, mst@redhat.com, kwolf@redhat.com, ananth@in.ibm.com, psuriset@linux.vnet.ibm.com, vatsa@linux.vnet.ibm.com, stefanha@linux.vnet.ibm.com, blauwirbel@gmail.com, ohmura.kei@lab.ntt.co.jp, Yoshiaki Tamura To: kvm@vger.kernel.org, qemu-devel@nongnu.org Return-path: Received: from sh.osrg.net ([192.16.179.4]:49701 "EHLO sh.osrg.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752576Ab1AZJoA (ORCPT ); Wed, 26 Jan 2011 04:44:00 -0500 In-Reply-To: <1296034931-10843-1-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> Sender: kvm-owner@vger.kernel.org List-ID: event-tap function is called only when it is on, and requests sent from device emulators. Signed-off-by: Yoshiaki Tamura --- block.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/block.c b/block.c index ff2795b..e4df9b6 100644 --- a/block.c +++ b/block.c @@ -28,6 +28,7 @@ #include "block_int.h" #include "module.h" #include "qemu-objects.h" +#include "event-tap.h" #ifdef CONFIG_BSD #include @@ -1476,6 +1477,10 @@ int bdrv_flush(BlockDriverState *bs) } if (bs->drv && bs->drv->bdrv_flush) { + if (*bs->device_name && event_tap_is_on()) { + event_tap_bdrv_flush(); + } + return bs->drv->bdrv_flush(bs); } @@ -2111,6 +2116,11 @@ BlockDriverAIOCB *bdrv_aio_writev(BlockDriverState *bs, int64_t sector_num, if (bdrv_check_request(bs, sector_num, nb_sectors)) return NULL; + if (*bs->device_name && event_tap_is_on()) { + return event_tap_bdrv_aio_writev(bs, sector_num, qiov, nb_sectors, + cb, opaque); + } + if (bs->dirty_bitmap) { blk_cb_data = blk_dirty_cb_alloc(bs, sector_num, nb_sectors, cb, opaque); @@ -2374,6 +2384,11 @@ BlockDriverAIOCB *bdrv_aio_flush(BlockDriverState *bs, if (!drv) return NULL; + + if (*bs->device_name && event_tap_is_on()) { + return event_tap_bdrv_aio_flush(bs, cb, opaque); + } + return drv->bdrv_aio_flush(bs, cb, opaque); } -- 1.7.1.2 From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=51237 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pi1uz-0004Ki-Oy for qemu-devel@nongnu.org; Wed, 26 Jan 2011 04:44:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Pi1ui-0006Bm-91 for qemu-devel@nongnu.org; Wed, 26 Jan 2011 04:43:51 -0500 Received: from sh.osrg.net ([192.16.179.4]:45635) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Pi1uh-0006B6-Or for qemu-devel@nongnu.org; Wed, 26 Jan 2011 04:43:44 -0500 From: Yoshiaki Tamura Date: Wed, 26 Jan 2011 18:42:06 +0900 Message-Id: <1296034931-10843-15-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> In-Reply-To: <1296034931-10843-1-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> References: <1296034931-10843-1-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> Subject: [Qemu-devel] [PATCH 14/19] block: insert event-tap to bdrv_aio_writev() and bdrv_aio_flush(). List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: kvm@vger.kernel.org, qemu-devel@nongnu.org Cc: kwolf@redhat.com, aliguori@us.ibm.com, mtosatti@redhat.com, ananth@in.ibm.com, mst@redhat.com, dlaor@redhat.com, vatsa@linux.vnet.ibm.com, Yoshiaki Tamura , blauwirbel@gmail.com, ohmura.kei@lab.ntt.co.jp, avi@redhat.com, psuriset@linux.vnet.ibm.com, stefanha@linux.vnet.ibm.com event-tap function is called only when it is on, and requests sent from device emulators. Signed-off-by: Yoshiaki Tamura --- block.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/block.c b/block.c index ff2795b..e4df9b6 100644 --- a/block.c +++ b/block.c @@ -28,6 +28,7 @@ #include "block_int.h" #include "module.h" #include "qemu-objects.h" +#include "event-tap.h" #ifdef CONFIG_BSD #include @@ -1476,6 +1477,10 @@ int bdrv_flush(BlockDriverState *bs) } if (bs->drv && bs->drv->bdrv_flush) { + if (*bs->device_name && event_tap_is_on()) { + event_tap_bdrv_flush(); + } + return bs->drv->bdrv_flush(bs); } @@ -2111,6 +2116,11 @@ BlockDriverAIOCB *bdrv_aio_writev(BlockDriverState *bs, int64_t sector_num, if (bdrv_check_request(bs, sector_num, nb_sectors)) return NULL; + if (*bs->device_name && event_tap_is_on()) { + return event_tap_bdrv_aio_writev(bs, sector_num, qiov, nb_sectors, + cb, opaque); + } + if (bs->dirty_bitmap) { blk_cb_data = blk_dirty_cb_alloc(bs, sector_num, nb_sectors, cb, opaque); @@ -2374,6 +2384,11 @@ BlockDriverAIOCB *bdrv_aio_flush(BlockDriverState *bs, if (!drv) return NULL; + + if (*bs->device_name && event_tap_is_on()) { + return event_tap_bdrv_aio_flush(bs, cb, opaque); + } + return drv->bdrv_aio_flush(bs, cb, opaque); } -- 1.7.1.2