From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:48881) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qj7II-0006sJ-Uo for qemu-devel@nongnu.org; Tue, 19 Jul 2011 06:12:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Qj7IF-0003Pl-Sx for qemu-devel@nongnu.org; Tue, 19 Jul 2011 06:12:50 -0400 Received: from mx1.redhat.com ([209.132.183.28]:20858) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qj7IF-0003PQ-0y for qemu-devel@nongnu.org; Tue, 19 Jul 2011 06:12:47 -0400 From: Kevin Wolf Date: Tue, 19 Jul 2011 12:15:14 +0200 Message-Id: <1311070524-13533-12-git-send-email-kwolf@redhat.com> In-Reply-To: <1311070524-13533-1-git-send-email-kwolf@redhat.com> References: <1311070524-13533-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 11/21] VMDK: bugfix, align offset to cluster in get_whole_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: Fam Zheng In get_whole_cluster, the offset is not aligned to cluster when reading from backing_hd. When the first write to child is not at the cluster boundary, wrong address data from parent is copied to child. Signed-off-by: Fam Zheng Reviewed-by: Stefan Hajnoczi Signed-off-by: Kevin Wolf --- block/vmdk.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/block/vmdk.c b/block/vmdk.c index 3b78583..03a4619 100644 --- a/block/vmdk.c +++ b/block/vmdk.c @@ -514,21 +514,23 @@ static int get_whole_cluster(BlockDriverState *bs, /* 128 sectors * 512 bytes each = grain size 64KB */ uint8_t whole_grain[extent->cluster_sectors * 512]; - // we will be here if it's first write on non-exist grain(cluster). - // try to read from parent image, if exist + /* we will be here if it's first write on non-exist grain(cluster). + * try to read from parent image, if exist */ if (bs->backing_hd) { int ret; if (!vmdk_is_cid_valid(bs)) return -1; + /* floor offset to cluster */ + offset -= offset % (extent->cluster_sectors * 512); ret = bdrv_read(bs->backing_hd, offset >> 9, whole_grain, extent->cluster_sectors); if (ret < 0) { return -1; } - //Write grain only into the active image + /* Write grain only into the active image */ ret = bdrv_write(extent->file, cluster_offset, whole_grain, extent->cluster_sectors); if (ret < 0) { -- 1.7.6