From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:34730) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QqOgP-000802-Tf for qemu-devel@nongnu.org; Mon, 08 Aug 2011 08:11:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QqOgO-0007fh-R1 for qemu-devel@nongnu.org; Mon, 08 Aug 2011 08:11:49 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47645) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QqOgO-0007eB-GL for qemu-devel@nongnu.org; Mon, 08 Aug 2011 08:11:48 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p78CBlZV019499 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 8 Aug 2011 08:11:47 -0400 From: Kevin Wolf Date: Mon, 8 Aug 2011 14:14:43 +0200 Message-Id: <1312805683-8413-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH] qemu-img: Use qemu_blockalign List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, fsimonce@redhat.com Now that you can use cache=none for the output file in qemu-img, we should properly align our buffers so that raw-posix doesn't have to use its (smaller) bounce buffer. Signed-off-by: Kevin Wolf --- qemu-img.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qemu-img.c b/qemu-img.c index 5ee207b..27e07e9 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -814,7 +814,7 @@ static int img_convert(int argc, char **argv) bs_i = 0; bs_offset = 0; bdrv_get_geometry(bs[0], &bs_sectors); - buf = qemu_malloc(IO_BUF_SIZE); + buf = qemu_blockalign(out_bs, IO_BUF_SIZE); if (compress) { ret = bdrv_get_info(out_bs, &bdi); @@ -986,7 +986,7 @@ out: qemu_progress_end(); free_option_parameters(create_options); free_option_parameters(param); - qemu_free(buf); + qemu_vfree(buf); if (out_bs) { bdrv_delete(out_bs); } @@ -1353,8 +1353,8 @@ static int img_rebase(int argc, char **argv) uint8_t * buf_new; float local_progress; - buf_old = qemu_malloc(IO_BUF_SIZE); - buf_new = qemu_malloc(IO_BUF_SIZE); + buf_old = qemu_blockalign(bs, IO_BUF_SIZE); + buf_new = qemu_blockalign(bs, IO_BUF_SIZE); bdrv_get_geometry(bs, &num_sectors); @@ -1410,8 +1410,8 @@ static int img_rebase(int argc, char **argv) qemu_progress_print(local_progress, 100); } - qemu_free(buf_old); - qemu_free(buf_new); + qemu_vfree(buf_old); + qemu_vfree(buf_new); } /* -- 1.7.6