From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=38700 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PPc0j-0002y4-J6 for qemu-devel@nongnu.org; Mon, 06 Dec 2010 09:25:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PPc0i-0000Jz-7o for qemu-devel@nongnu.org; Mon, 06 Dec 2010 09:25:49 -0500 Received: from mx1.redhat.com ([209.132.183.28]:43275) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PPc0i-0000Jn-0z for qemu-devel@nongnu.org; Mon, 06 Dec 2010 09:25:48 -0500 From: Jes.Sorensen@redhat.com Date: Mon, 6 Dec 2010 15:25:35 +0100 Message-Id: <1291645540-9784-3-git-send-email-Jes.Sorensen@redhat.com> In-Reply-To: <1291645540-9784-1-git-send-email-Jes.Sorensen@redhat.com> References: <1291645540-9784-1-git-send-email-Jes.Sorensen@redhat.com> Subject: [Qemu-devel] [PATCH 2/7] Use qemu_mallocz() instead of calloc() in img_convert() List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: kwolf@redhat.com Cc: stefanha@linux.vnet.ibm.com, qemu-devel@nongnu.org From: Jes Sorensen Signed-off-by: Jes Sorensen --- qemu-img.c | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/qemu-img.c b/qemu-img.c index fa77ac0..eca99c4 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -699,11 +699,7 @@ static int img_convert(int argc, char **argv) return 1; } - bs = calloc(bs_n, sizeof(BlockDriverState *)); - if (!bs) { - error("Out of memory"); - return 1; - } + bs = qemu_mallocz(bs_n * sizeof(BlockDriverState *)); total_sectors = 0; for (bs_i = 0; bs_i < bs_n; bs_i++) { @@ -983,7 +979,7 @@ out: bdrv_delete(bs[bs_i]); } } - free(bs); + qemu_free(bs); if (ret) { return 1; } -- 1.7.3.2