From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48241) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W9LW7-0003dk-10 for qemu-devel@nongnu.org; Fri, 31 Jan 2014 16:20:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W9LW1-0003u6-6m for qemu-devel@nongnu.org; Fri, 31 Jan 2014 16:20:50 -0500 Received: from mx1.redhat.com ([209.132.183.28]:9225) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W9LW0-0003tw-Qr for qemu-devel@nongnu.org; Fri, 31 Jan 2014 16:20:45 -0500 From: Stefan Hajnoczi Date: Fri, 31 Jan 2014 22:19:43 +0100 Message-Id: <1391203189-6552-3-git-send-email-stefanha@redhat.com> In-Reply-To: <1391203189-6552-1-git-send-email-stefanha@redhat.com> References: <1391203189-6552-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PULL 2/8] block: remove QED .bdrv_make_empty implementation List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Anthony Liguori From: Jeff Cody 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 --- 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