[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 2/8] block: remove QED .bdrv_make_empty implementatio
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL 2/8] block: remove QED .bdrv_make_empty implementation |
Date: |
Fri, 31 Jan 2014 22:19:43 +0100 |
From: Jeff Cody <address@hidden>
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 <address@hidden>
Reviewed-by: Benoit Canet <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
block/qed.c | 6 ------
1 file changed, 6 deletions(-)
diff --git a/block/qed.c b/block/qed.c
index 694e6e2..b9ca7ac 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,
--
1.8.5.3
- [Qemu-devel] [PULL 0/8] Block patches, Stefan Hajnoczi, 2014/01/31
- [Qemu-devel] [PULL 1/8] Describe flaws in qcow/qcow2 encryption in the docs, Stefan Hajnoczi, 2014/01/31
- [Qemu-devel] [PULL 3/8] block: remove qcow2 .bdrv_make_empty implementation, Stefan Hajnoczi, 2014/01/31
- [Qemu-devel] [PULL 4/8] block/vmdk: add basic .bdrv_check support, Stefan Hajnoczi, 2014/01/31
- [Qemu-devel] [PULL 5/8] qemu-iotests: Drop assert_no_active_commit in case 040, Stefan Hajnoczi, 2014/01/31
- [Qemu-devel] [PULL 2/8] block: remove QED .bdrv_make_empty implementation,
Stefan Hajnoczi <=
- [Qemu-devel] [PULL 8/8] qemu-iotests: only run 071 on qcow2, Stefan Hajnoczi, 2014/01/31
- [Qemu-devel] [PULL 6/8] block/vhdx: Error checking fixes, Stefan Hajnoczi, 2014/01/31
- [Qemu-devel] [PULL 7/8] dataplane: Comment fix, Stefan Hajnoczi, 2014/01/31