|
 |
9ae3a8 |
From 0cdb7038a7027cbb63c820e60bb34abd191ac85f Mon Sep 17 00:00:00 2001
|
|
|
9ae3a8 |
From: Fam Zheng <famz@redhat.com>
|
|
|
9ae3a8 |
Date: Mon, 15 Feb 2016 09:28:31 +0100
|
|
|
9ae3a8 |
Subject: [PATCH 18/18] vmdk: Fix calculation of block status's offset
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
RH-Author: Fam Zheng <famz@redhat.com>
|
|
|
9ae3a8 |
Message-id: <1455528511-9357-19-git-send-email-famz@redhat.com>
|
|
|
9ae3a8 |
Patchwork-id: 69184
|
|
|
9ae3a8 |
O-Subject: [RHEL-7.3 qemu-kvm PATCH 18/18] vmdk: Fix calculation of block status's offset
|
|
|
9ae3a8 |
Bugzilla: 1299116
|
|
|
9ae3a8 |
RH-Acked-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Max Reitz <mreitz@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Markus Armbruster <armbru@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
"offset" is the offset of cluster and sector_num doesn't necessarily
|
|
|
9ae3a8 |
refer to the start of it, it should add index_in_cluster.
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Fam Zheng <famz@redhat.com>
|
|
|
9ae3a8 |
Message-id: 1453780743-16806-12-git-send-email-famz@redhat.com
|
|
|
9ae3a8 |
Reviewed-by: Max Reitz <mreitz@redhat.com>
|
|
|
9ae3a8 |
Signed-off-by: Max Reitz <mreitz@redhat.com>
|
|
|
9ae3a8 |
(cherry picked from commit d0a18f10251f515c86dcaec5bdf979a4e07fafc5)
|
|
|
9ae3a8 |
Signed-off-by: Fam Zheng <famz@redhat.com>
|
|
|
9ae3a8 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
block/vmdk.c | 6 ++++--
|
|
|
9ae3a8 |
1 file changed, 4 insertions(+), 2 deletions(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
diff --git a/block/vmdk.c b/block/vmdk.c
|
|
|
9ae3a8 |
index b0c312b..b4f0d44 100644
|
|
|
9ae3a8 |
--- a/block/vmdk.c
|
|
|
9ae3a8 |
+++ b/block/vmdk.c
|
|
|
9ae3a8 |
@@ -1275,6 +1275,7 @@ static int64_t coroutine_fn vmdk_co_get_block_status(BlockDriverState *bs,
|
|
|
9ae3a8 |
0, 0);
|
|
|
9ae3a8 |
qemu_co_mutex_unlock(&s->lock);
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
+ index_in_cluster = vmdk_find_index_in_cluster(extent, sector_num);
|
|
|
9ae3a8 |
switch (ret) {
|
|
|
9ae3a8 |
case VMDK_ERROR:
|
|
|
9ae3a8 |
ret = -EIO;
|
|
|
9ae3a8 |
@@ -1288,13 +1289,14 @@ static int64_t coroutine_fn vmdk_co_get_block_status(BlockDriverState *bs,
|
|
|
9ae3a8 |
case VMDK_OK:
|
|
|
9ae3a8 |
ret = BDRV_BLOCK_DATA;
|
|
|
9ae3a8 |
if (extent->file == bs->file && !extent->compressed) {
|
|
|
9ae3a8 |
- ret |= BDRV_BLOCK_OFFSET_VALID | offset;
|
|
|
9ae3a8 |
+ ret |= BDRV_BLOCK_OFFSET_VALID;
|
|
|
9ae3a8 |
+ ret |= (offset + (index_in_cluster << BDRV_SECTOR_BITS))
|
|
|
9ae3a8 |
+ & BDRV_BLOCK_OFFSET_MASK;
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
break;
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
- index_in_cluster = vmdk_find_index_in_cluster(extent, sector_num);
|
|
|
9ae3a8 |
n = extent->cluster_sectors - index_in_cluster;
|
|
|
9ae3a8 |
if (n > nb_sectors) {
|
|
|
9ae3a8 |
n = nb_sectors;
|
|
|
9ae3a8 |
--
|
|
|
9ae3a8 |
1.8.3.1
|
|
|
9ae3a8 |
|