From ebb0a0980d8347add30842be49555e4f07a4a047 Mon Sep 17 00:00:00 2001 From: Jeffrey Cody Date: Tue, 11 Feb 2014 16:14:29 +0100 Subject: [PATCH 23/28] block: remove QED .bdrv_make_empty implementation RH-Author: Jeffrey Cody Message-id: <2f8e3c76feeda371ed325fb08b26f3bf7e776db3.1392134912.git.jcody@redhat.com> Patchwork-id: 57219 O-Subject: [RHEL7 qemu-kvm PATCH 5/6] block: remove QED .bdrv_make_empty implementation Bugzilla: 1047254 RH-Acked-by: Kevin Wolf RH-Acked-by: Markus Armbruster RH-Acked-by: Miroslav Rezanina 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 Reviewed-by: Benoit Canet Signed-off-by: Stefan Hajnoczi (cherry picked from commit 55aff7f133b0eb20b2c8a2a3e1307240aab8044c) --- block/qed.c | 6 ------ 1 file changed, 6 deletions(-) Signed-off-by: Miroslav Rezanina --- block/qed.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/block/qed.c b/block/qed.c index da68152..be5945b 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.7.1