[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v7 02/12] VMDK: bugfix, align offset to cluster in g
From: |
Fam Zheng |
Subject: |
[Qemu-devel] [PATCH v7 02/12] VMDK: bugfix, align offset to cluster in get_whole_cluster |
Date: |
Sun, 3 Jul 2011 23:06:42 +0800 |
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 <address@hidden>
---
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) {
- [Qemu-devel] [PATCH v7 00/12] Adding VMDK monolithic flat support, Fam Zheng, 2011/07/03
- [Qemu-devel] [PATCH v7 01/12] VMDK: introduce VmdkExtent, Fam Zheng, 2011/07/03
- [Qemu-devel] [PATCH v7 02/12] VMDK: bugfix, align offset to cluster in get_whole_cluster,
Fam Zheng <=
- [Qemu-devel] [PATCH v7 03/12] VMDK: probe for monolithicFlat images, Fam Zheng, 2011/07/03
- [Qemu-devel] [PATCH v7 04/12] VMDK: separate vmdk_open by format version, Fam Zheng, 2011/07/03
- [Qemu-devel] [PATCH v7 05/12] VMDK: add field BDRVVmdkState.desc_offset, Fam Zheng, 2011/07/03
- [Qemu-devel] [PATCH v7 06/12] VMDK: flush multiple extents, Fam Zheng, 2011/07/03
- [Qemu-devel] [PATCH v7 07/12] VMDK: move 'static' cid_update flag to bs field, Fam Zheng, 2011/07/03
- [Qemu-devel] [PATCH v7 08/12] VMDK: change get_cluster_offset return type, Fam Zheng, 2011/07/03
- [Qemu-devel] [PATCH v7 09/12] VMDK: open/read/write for monolithicFlat image, Fam Zheng, 2011/07/03
- [Qemu-devel] [PATCH v7 10/12] VMDK: create different subformats, Fam Zheng, 2011/07/03
- [Qemu-devel] [PATCH v7 11/12] VMDK: fix coding style, Fam Zheng, 2011/07/03