From patchwork Tue Jan 12 12:49:43 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [2/2] qcow/qcow2: implement bdrv_aio_flush
From: Christoph Hellwig <hch@lst.de>
X-Patchwork-Id: 42723
Message-Id: <20100112124943.GB19631@lst.de>
To: qemu-devel@nongnu.org
Date: Tue, 12 Jan 2010 13:49:43 +0100

From: Kevin Wolf <kwolf@redhat.com>

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>


Index: qemu/block/qcow2.c
===================================================================
--- qemu.orig/block/qcow2.c	2010-01-12 11:43:13.745003589 +0100
+++ qemu/block/qcow2.c	2010-01-12 11:43:33.502003548 +0100
@@ -1012,6 +1012,14 @@ static void qcow_flush(BlockDriverState 
     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);
@@ -1126,6 +1134,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,
Index: qemu/block/qcow.c
===================================================================
--- qemu.orig/block/qcow.c	2010-01-12 11:43:36.819003870 +0100
+++ qemu/block/qcow.c	2010-01-12 11:44:27.855256142 +0100
@@ -900,6 +900,14 @@ static void qcow_flush(BlockDriverState 
     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,