Message ID | 1291645540-9784-3-git-send-email-Jes.Sorensen@redhat.com |
---|---|
State | New |
Headers | show |
On Mon, Dec 06, 2010 at 03:25:35PM +0100, Jes.Sorensen@redhat.com wrote: > From: Jes Sorensen <Jes.Sorensen@redhat.com> > > Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com> > --- > qemu-img.c | 8 ++------ > 1 files changed, 2 insertions(+), 6 deletions(-) Reviewed-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
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; }