From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42341) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xgujq-0007Qk-H7 for qemu-devel@nongnu.org; Wed, 22 Oct 2014 08:10:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xguje-0005gq-90 for qemu-devel@nongnu.org; Wed, 22 Oct 2014 08:10:02 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52202) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xguje-0005gf-15 for qemu-devel@nongnu.org; Wed, 22 Oct 2014 08:09:50 -0400 From: Max Reitz Date: Wed, 22 Oct 2014 14:09:27 +0200 Message-Id: <1413979783-1549-2-git-send-email-mreitz@redhat.com> In-Reply-To: <1413979783-1549-1-git-send-email-mreitz@redhat.com> References: <1413979783-1549-1-git-send-email-mreitz@redhat.com> Subject: [Qemu-devel] [PATCH v8 01/17] block: Add qemu_{, try_}blockalign0() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?UTF-8?q?Beno=C3=AEt=20Canet?= , Stefan Hajnoczi , Max Reitz These functions call their non-0-counterparts and then fill the allocated buffer with 0 (if the allocation has been successful). Signed-off-by: Max Reitz --- block.c | 16 ++++++++++++++++ include/block/block.h | 2 ++ 2 files changed, 18 insertions(+) diff --git a/block.c b/block.c index 773e87e..bbb04e7 100644 --- a/block.c +++ b/block.c @@ -5200,6 +5200,11 @@ void *qemu_blockalign(BlockDriverState *bs, size_t size) return qemu_memalign(bdrv_opt_mem_align(bs), size); } +void *qemu_blockalign0(BlockDriverState *bs, size_t size) +{ + return memset(qemu_blockalign(bs, size), 0, size); +} + void *qemu_try_blockalign(BlockDriverState *bs, size_t size) { size_t align = bdrv_opt_mem_align(bs); @@ -5213,6 +5218,17 @@ 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 c9ec0ab..341054d 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -412,7 +412,9 @@ void bdrv_img_create(const char *filename, const char *fmt, size_t bdrv_opt_mem_align(BlockDriverState *bs); 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; -- 1.9.3