Received: from eggs.gnu.org ([2001:4830:134:3::10]:51237) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YNTQL-0007c0-LY for qemu-devel@nongnu.org; Mon, 16 Feb 2015 16:41:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YNTQI-0007XX-FU for qemu-devel@nongnu.org; Mon, 16 Feb 2015 16:41:49 -0500 Received: from e06smtp11.uk.ibm.com ([195.75.94.107]:36380) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YNTQI-0007Ww-7Z for qemu-devel@nongnu.org; Mon, 16 Feb 2015 16:41:46 -0500 Received: from /spool/local by e06smtp11.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 16 Feb 2015 21:41:42 -0000 From: Thomas Huth Date: Mon, 16 Feb 2015 22:41:31 +0100 Message-Id: <1424122891-9390-5-git-send-email-thuth@linux.vnet.ibm.com> In-Reply-To: <1424122891-9390-1-git-send-email-thuth@linux.vnet.ibm.com> References: <1424122891-9390-1-git-send-email-thuth@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH 4/4] block: Remove unused functions List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-trivial@nongnu.org, qemu-devel@nongnu.org Cc: Kevin Wolf , Paolo Bonzini , Thomas Huth , Stefan Hajnoczi qemu_try_blockalign0() and nbd_export_close_all() are not used anymore and thus can be removed. Signed-off-by: Thomas Huth Cc: Kevin Wolf Cc: Stefan Hajnoczi Cc: Paolo Bonzini --- block.c | 11 ----------- include/block/block.h | 1 - include/block/nbd.h | 1 - nbd.c | 9 --------- 4 files changed, 0 insertions(+), 22 deletions(-) diff --git a/block.c b/block.c index 210fd5f..2128f82 100644 --- a/block.c +++ b/block.c @@ -5335,17 +5335,6 @@ void *qemu_try_blockalign(BlockDriverState *bs, size_t size) return qemu_try_memalign(align, size); } -void *qemu_try_blockalign0(BlockDriverState *bs, size_t size) -{ - void *mem = qemu_try_blockalign(bs, size); - - if (mem) { - memset(mem, 0, size); - } - - return mem; -} - /* * Check if all memory in this vector is sector aligned. */ diff --git a/include/block/block.h b/include/block/block.h index 321295e..7ee9ab3 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -433,7 +433,6 @@ void bdrv_set_guest_block_size(BlockDriverState *bs, int align); void *qemu_blockalign(BlockDriverState *bs, size_t size); void *qemu_blockalign0(BlockDriverState *bs, size_t size); void *qemu_try_blockalign(BlockDriverState *bs, size_t size); -void *qemu_try_blockalign0(BlockDriverState *bs, size_t size); bool bdrv_qiov_is_aligned(BlockDriverState *bs, QEMUIOVector *qiov); struct HBitmapIter; diff --git a/include/block/nbd.h b/include/block/nbd.h index b759595..fccef2d 100644 --- a/include/block/nbd.h +++ b/include/block/nbd.h @@ -95,7 +95,6 @@ BlockBackend *nbd_export_get_blockdev(NBDExport *exp); NBDExport *nbd_export_find(const char *name); void nbd_export_set_name(NBDExport *exp, const char *name); -void nbd_export_close_all(void); NBDClient *nbd_client_new(NBDExport *exp, int csock, void (*close)(NBDClient *)); diff --git a/nbd.c b/nbd.c index e56afbc..634bf84 100644 --- a/nbd.c +++ b/nbd.c @@ -1067,15 +1067,6 @@ BlockBackend *nbd_export_get_blockdev(NBDExport *exp) return exp->blk; } -void nbd_export_close_all(void) -{ - NBDExport *exp, *next; - - QTAILQ_FOREACH_SAFE(exp, &exports, next, next) { - nbd_export_close(exp); - } -} - static ssize_t nbd_co_send_reply(NBDRequest *req, struct nbd_reply *reply, int len) { -- 1.7.1