summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Cody <jcody@redhat.com>2014-01-27 16:09:12 -0500
committerStefan Hajnoczi <stefanha@redhat.com>2014-01-31 22:05:03 +0100
commit55aff7f133b0eb20b2c8a2a3e1307240aab8044c (patch)
tree6591a6faf6ae829f7bdc19c2575f9d857a60214a
parent136cd19d0522c03b6dccc3e344886feab6faee43 (diff)
downloadqemu-55aff7f133b0eb20b2c8a2a3e1307240aab8044c.tar.gz
block: remove QED .bdrv_make_empty implementation
The QED .bdrv_make_empty() implementation does nothing but return -ENOTSUP, which causes problems in bdrv_commit(). Since the function stub exists for QED, it is called, which then always returns an error. The proper way to not support an optional driver function stub is to just not implement it, so let's remove the stub. Signed-off-by: Jeff Cody <jcody@redhat.com> Reviewed-by: Benoit Canet <benoit@irqsave.net> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
-rw-r--r--block/qed.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/block/qed.c b/block/qed.c
index 694e6e2ee0..b9ca7ac0da 100644
--- a/block/qed.c
+++ b/block/qed.c
@@ -731,11 +731,6 @@ static int64_t coroutine_fn bdrv_qed_co_get_block_status(BlockDriverState *bs,
return cb.status;
}
-static int bdrv_qed_make_empty(BlockDriverState *bs)
-{
- return -ENOTSUP;
-}
-
static BDRVQEDState *acb_to_s(QEDAIOCB *acb)
{
return acb->common.bs->opaque;
@@ -1617,7 +1612,6 @@ static BlockDriver bdrv_qed = {
.bdrv_create = bdrv_qed_create,
.bdrv_has_zero_init = bdrv_has_zero_init_1,
.bdrv_co_get_block_status = bdrv_qed_co_get_block_status,
- .bdrv_make_empty = bdrv_qed_make_empty,
.bdrv_aio_readv = bdrv_qed_aio_readv,
.bdrv_aio_writev = bdrv_qed_aio_writev,
.bdrv_co_write_zeroes = bdrv_qed_co_write_zeroes,