Received: from eggs.gnu.org ([208.118.235.92]:37039) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UUEyM-00044D-Vt for qemu-devel@nongnu.org; Mon, 22 Apr 2013 07:31:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UUEyK-00021A-UT for qemu-devel@nongnu.org; Mon, 22 Apr 2013 07:31:50 -0400 Received: from mx1.redhat.com ([209.132.183.28]:43224) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UUEyK-00020x-Lw for qemu-devel@nongnu.org; Mon, 22 Apr 2013 07:31:48 -0400 From: Kevin Wolf Date: Mon, 22 Apr 2013 13:31:16 +0200 Message-Id: <1366630294-18984-3-git-send-email-kwolf@redhat.com> In-Reply-To: <1366630294-18984-1-git-send-email-kwolf@redhat.com> References: <1366630294-18984-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 02/20] qcow: allow sub-cluster compressed write to last cluster List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: Stefan Hajnoczi Compression in qcow requires image length to be a multiple of the cluster size. Lift this requirement by zero-padding the final cluster when necessary. The virtual disk size is still not cluster-aligned, so the guest cannot access the zero sectors. Note that this is almost identical to the qcow2 version of this code. qcow2's compression code is drawn from qcow. Signed-off-by: Stefan Hajnoczi Signed-off-by: Kevin Wolf --- block/qcow.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/block/qcow.c b/block/qcow.c index 3278e55..e2a64c7 100644 --- a/block/qcow.c +++ b/block/qcow.c @@ -787,8 +787,21 @@ static int qcow_write_compressed(BlockDriverState *bs, int64_t sector_num, uint8_t *out_buf; uint64_t cluster_offset; - if (nb_sectors != s->cluster_sectors) - return -EINVAL; + if (nb_sectors != s->cluster_sectors) { + ret = -EINVAL; + + /* Zero-pad last write if image size is not cluster aligned */ + if (sector_num + nb_sectors == bs->total_sectors && + nb_sectors < s->cluster_sectors) { + uint8_t *pad_buf = qemu_blockalign(bs, s->cluster_size); + memset(pad_buf, 0, s->cluster_size); + memcpy(pad_buf, buf, nb_sectors * BDRV_SECTOR_SIZE); + ret = qcow_write_compressed(bs, sector_num, + pad_buf, s->cluster_sectors); + qemu_vfree(pad_buf); + } + return ret; + } out_buf = g_malloc(s->cluster_size + (s->cluster_size / 1000) + 128); -- 1.8.1.4