Patchwork [14/18] block: insert event-tap to bdrv_aio_writev(), bdrv_aio_flush() and bdrv_flush().

login
register
mail settings
Submitter Yoshiaki Tamura
Date March 23, 2011, 4:10 a.m.
Message ID <1300853426-7054-15-git-send-email-tamura.yoshiaki@lab.ntt.co.jp>
Download mbox | patch
Permalink /patch/87995/
State New
Headers show

Comments

Yoshiaki Tamura - March 23, 2011, 4:10 a.m.
event-tap function is called only when it is on, and requests were
sent from device emulators.

Signed-off-by: Yoshiaki Tamura <tamura.yoshiaki@lab.ntt.co.jp>
Acked-by: Kevin Wolf <kwolf@redhat.com>
---
 block.c |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 deletions(-)

Patch

diff --git a/block.c b/block.c
index c8e2f97..952543a 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 <sys/types.h>
@@ -1585,6 +1586,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);
     }
 
@@ -2220,6 +2225,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);
@@ -2493,6 +2503,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);
 }