[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 11/21] VMDK: bugfix, align offset to cluster in get_
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH 11/21] VMDK: bugfix, align offset to cluster in get_whole_cluster |
Date: |
Tue, 19 Jul 2011 12:15:14 +0200 |
From: Fam Zheng <address@hidden>
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>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Kevin Wolf <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) {
--
1.7.6
- [Qemu-devel] [PULL 00/21] Block patches, Kevin Wolf, 2011/07/19
- [Qemu-devel] [PATCH 03/21] qemu-io: Fix if scoping bug, Kevin Wolf, 2011/07/19
- [Qemu-devel] [PATCH 01/21] sheepdog: add full data preallocation support, Kevin Wolf, 2011/07/19
- [Qemu-devel] [PATCH 08/21] qemu-options.hx: Document missing -drive options, Kevin Wolf, 2011/07/19
- [Qemu-devel] [PATCH 09/21] qemu-config: Document -drive options, Kevin Wolf, 2011/07/19
- [Qemu-devel] [PATCH 04/21] iov: Update parameter usage in iov_(to|from)_buf(), Kevin Wolf, 2011/07/19
- [Qemu-devel] [PATCH 06/21] scsi-disk: Fixup debugging statement, Kevin Wolf, 2011/07/19
- [Qemu-devel] [PATCH 12/21] VMDK: probe for monolithicFlat images, Kevin Wolf, 2011/07/19
- [Qemu-devel] [PATCH 10/21] VMDK: introduce VmdkExtent, Kevin Wolf, 2011/07/19
- [Qemu-devel] [PATCH 11/21] VMDK: bugfix, align offset to cluster in get_whole_cluster,
Kevin Wolf <=
- [Qemu-devel] [PATCH 05/21] scsi: Add 'hba_private' to SCSIRequest, Kevin Wolf, 2011/07/19
- Re: [Qemu-devel] [PATCH 05/21] scsi: Add 'hba_private' to SCSIRequest, Benjamin Herrenschmidt, 2011/07/19
- Re: [Qemu-devel] [PATCH 05/21] scsi: Add 'hba_private' to SCSIRequest, David Gibson, 2011/07/20
[Qemu-devel] [PATCH 13/21] VMDK: separate vmdk_open by format version, Kevin Wolf, 2011/07/19
[Qemu-devel] [PATCH 02/21] qemu-io: Fix formatting, Kevin Wolf, 2011/07/19