qcow/qcow2: implement bdrv_aio_flush

Now that we do not have to flush the backing device anymore implementing
the bdrv_aio_flush method for image formats is trivial.

[hch: forward ported to qemu mainline from a product tree]

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

diff --git a/block/qcow.c b/block/qcow.c
index 7fc85ae5889f93a5b33204341fc746d7eb723d96..1e3e59b008e349ba0017ffa2693cb68e3810e68f 100644 (file)
--- a/block/qcow.c
+++ b/block/qcow.c
@@ -900,6 +900,14 @@ static void qcow_flush(BlockDriverState *bs)
     bdrv_flush(s->hd);
 }
 
+static BlockDriverAIOCB *qcow_aio_flush(BlockDriverState *bs,
+        BlockDriverCompletionFunc *cb, void *opaque)
+{
+    BDRVQcowState *s = bs->opaque;
+
+    return bdrv_aio_flush(s->hd, cb, opaque);
+}
+
 static int qcow_get_info(BlockDriverState *bs, BlockDriverInfo *bdi)
 {
     BDRVQcowState *s = bs->opaque;
@@ -940,6 +948,7 @@ static BlockDriver bdrv_qcow = {
     .bdrv_make_empty   = qcow_make_empty,
     .bdrv_aio_readv    = qcow_aio_readv,
     .bdrv_aio_writev   = qcow_aio_writev,
+    .bdrv_aio_flush    = qcow_aio_flush,
     .bdrv_write_compressed = qcow_write_compressed,
     .bdrv_get_info     = qcow_get_info,
 

diff --git a/block/qcow2.c b/block/qcow2.c
index 4f9ef91715778cf078dd6e2e429c617391015f06..6622ebadb0d7dac219f9cc17a0a80346b21119e8 100644 (file)
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -1111,6 +1111,14 @@ static void qcow_flush(BlockDriverState *bs)
     bdrv_flush(s->hd);
 }
 
+static BlockDriverAIOCB *qcow_aio_flush(BlockDriverState *bs,
+         BlockDriverCompletionFunc *cb, void *opaque)
+{
+     BDRVQcowState *s = bs->opaque;
+
+     return bdrv_aio_flush(s->hd, cb, opaque);
+}
+
 static int64_t qcow_vm_state_offset(BDRVQcowState *s)
 {
        return (int64_t)s->l1_vm_state_index << (s->cluster_bits + s->l2_bits);
@@ -1225,6 +1233,7 @@ static BlockDriver bdrv_qcow2 = {
 
     .bdrv_aio_readv    = qcow_aio_readv,
     .bdrv_aio_writev   = qcow_aio_writev,
+    .bdrv_aio_flush    = qcow_aio_flush,
     .bdrv_write_compressed = qcow_write_compressed,
 
     .bdrv_snapshot_create   = qcow2_snapshot_create,