Patchwork [v2,03/13] virtio-blk: implement BlockDevOps->drain_threads_cb()

login
register
mail settings
Submitter Stefan Hajnoczi
Date July 15, 2013, 2:42 p.m.
Message ID <1373899382-13514-4-git-send-email-stefanha@redhat.com>
Download mbox | patch
Permalink /patch/259060/
State New
Headers show

Comments

Stefan Hajnoczi - July 15, 2013, 2:42 p.m.
Drain and stop the dataplane thread when bdrv_drain_all() is called.
Note that the thread will be restarted in virtio_blk_handle_output() the
next time the guest kicks the virtqueue.

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 hw/block/virtio-blk.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

Patch

diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c
index cf12469..f4ad528 100644
--- a/hw/block/virtio-blk.c
+++ b/hw/block/virtio-blk.c
@@ -618,8 +618,24 @@  static void virtio_blk_resize(void *opaque)
     virtio_notify_config(vdev);
 }
 
+static void virtio_blk_drain_threads(void *opaque)
+{
+#ifdef CONFIG_VIRTIO_BLK_DATA_PLANE
+    VirtIOBlock *s = VIRTIO_BLK(opaque);
+
+    if (s->dataplane) {
+        /* Drain I/O and stop thread.  Next time the guest kicks the virtqueue
+         * we restart the thread.  In the meantime the main loop may access the
+         * block device.
+         */
+        virtio_blk_data_plane_stop(s->dataplane);
+    }
+#endif
+}
+
 static const BlockDevOps virtio_block_ops = {
     .resize_cb = virtio_blk_resize,
+    .drain_threads_cb = virtio_blk_drain_threads,
 };
 
 void virtio_blk_set_conf(DeviceState *dev, VirtIOBlkConf *blk)