* [Qemu-devel] [PATCH 0/2] vmdk: Fix vmdk_co_get_block_status
@ 2015-06-04 6:02 Fam Zheng
2015-06-04 6:02 ` [Qemu-devel] [PATCH 1/2] vmdk: Fix index_in_cluster calculation in vmdk_co_get_block_status Fam Zheng
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Fam Zheng @ 2015-06-04 6:02 UTC (permalink / raw)
To: qemu-devel; +Cc: Kevin Wolf, Fam Zheng, qemu-stable, qemu-block
The buggy index_in_cluster was missed in b1649fae49a8. Fix that and dedup the
calculation.
Fam Zheng (2):
vmdk: Fix index_in_cluster calculation in vmdk_co_get_block_status
vmdk: Use vmdk_find_index_in_cluster everywhere
block/vmdk.c | 23 ++++++++++++++---------
1 file changed, 14 insertions(+), 9 deletions(-)
--
2.4.2
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Qemu-devel] [PATCH 1/2] vmdk: Fix index_in_cluster calculation in vmdk_co_get_block_status
2015-06-04 6:02 [Qemu-devel] [PATCH 0/2] vmdk: Fix vmdk_co_get_block_status Fam Zheng
@ 2015-06-04 6:02 ` Fam Zheng
2015-06-05 16:49 ` [Qemu-devel] [Qemu-block] " Max Reitz
2015-06-04 6:02 ` [Qemu-devel] [PATCH 2/2] vmdk: Use vmdk_find_index_in_cluster everywhere Fam Zheng
2015-06-08 10:45 ` [Qemu-devel] [PATCH 0/2] vmdk: Fix vmdk_co_get_block_status Kevin Wolf
2 siblings, 1 reply; 6+ messages in thread
From: Fam Zheng @ 2015-06-04 6:02 UTC (permalink / raw)
To: qemu-devel; +Cc: Kevin Wolf, Fam Zheng, qemu-stable, qemu-block
It has the similar issue with b1649fae49a8. Since the calculation
is repeated for a few times already, introduce a function so it can be
reused.
Signed-off-by: Fam Zheng <famz@redhat.com>
---
block/vmdk.c | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/block/vmdk.c b/block/vmdk.c
index b66745d..3e4d84b 100644
--- a/block/vmdk.c
+++ b/block/vmdk.c
@@ -1248,6 +1248,17 @@ static VmdkExtent *find_extent(BDRVVmdkState *s,
return NULL;
}
+static inline uint64_t vmdk_find_index_in_cluster(VmdkExtent *extent,
+ int64_t sector_num)
+{
+ uint64_t index_in_cluster, extent_begin_sector, extent_relative_sector_num;
+
+ extent_begin_sector = extent->end_sector - extent->sectors;
+ extent_relative_sector_num = sector_num - extent_begin_sector;
+ index_in_cluster = extent_relative_sector_num % extent->cluster_sectors;
+ return index_in_cluster;
+}
+
static int64_t coroutine_fn vmdk_co_get_block_status(BlockDriverState *bs,
int64_t sector_num, int nb_sectors, int *pnum)
{
@@ -1285,7 +1296,7 @@ static int64_t coroutine_fn vmdk_co_get_block_status(BlockDriverState *bs,
break;
}
- index_in_cluster = sector_num % extent->cluster_sectors;
+ index_in_cluster = vmdk_find_index_in_cluster(extent, sector_num);
n = extent->cluster_sectors - index_in_cluster;
if (n > nb_sectors) {
n = nb_sectors;
--
2.4.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Qemu-devel] [PATCH 2/2] vmdk: Use vmdk_find_index_in_cluster everywhere
2015-06-04 6:02 [Qemu-devel] [PATCH 0/2] vmdk: Fix vmdk_co_get_block_status Fam Zheng
2015-06-04 6:02 ` [Qemu-devel] [PATCH 1/2] vmdk: Fix index_in_cluster calculation in vmdk_co_get_block_status Fam Zheng
@ 2015-06-04 6:02 ` Fam Zheng
2015-06-05 16:51 ` [Qemu-devel] [Qemu-block] " Max Reitz
2015-06-08 10:45 ` [Qemu-devel] [PATCH 0/2] vmdk: Fix vmdk_co_get_block_status Kevin Wolf
2 siblings, 1 reply; 6+ messages in thread
From: Fam Zheng @ 2015-06-04 6:02 UTC (permalink / raw)
To: qemu-devel; +Cc: Kevin Wolf, Fam Zheng, qemu-stable, qemu-block
Signed-off-by: Fam Zheng <famz@redhat.com>
---
block/vmdk.c | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/block/vmdk.c b/block/vmdk.c
index 3e4d84b..56626b0 100644
--- a/block/vmdk.c
+++ b/block/vmdk.c
@@ -1424,7 +1424,6 @@ static int vmdk_read(BlockDriverState *bs, int64_t sector_num,
BDRVVmdkState *s = bs->opaque;
int ret;
uint64_t n, index_in_cluster;
- uint64_t extent_begin_sector, extent_relative_sector_num;
VmdkExtent *extent = NULL;
uint64_t cluster_offset;
@@ -1436,9 +1435,7 @@ static int vmdk_read(BlockDriverState *bs, int64_t sector_num,
ret = get_cluster_offset(bs, extent, NULL,
sector_num << 9, false, &cluster_offset,
0, 0);
- extent_begin_sector = extent->end_sector - extent->sectors;
- extent_relative_sector_num = sector_num - extent_begin_sector;
- index_in_cluster = extent_relative_sector_num % extent->cluster_sectors;
+ index_in_cluster = vmdk_find_index_in_cluster(extent, sector_num);
n = extent->cluster_sectors - index_in_cluster;
if (n > nb_sectors) {
n = nb_sectors;
@@ -1500,7 +1497,6 @@ static int vmdk_write(BlockDriverState *bs, int64_t sector_num,
VmdkExtent *extent = NULL;
int ret;
int64_t index_in_cluster, n;
- uint64_t extent_begin_sector, extent_relative_sector_num;
uint64_t cluster_offset;
VmdkMetaData m_data;
@@ -1516,9 +1512,7 @@ static int vmdk_write(BlockDriverState *bs, int64_t sector_num,
if (!extent) {
return -EIO;
}
- extent_begin_sector = extent->end_sector - extent->sectors;
- extent_relative_sector_num = sector_num - extent_begin_sector;
- index_in_cluster = extent_relative_sector_num % extent->cluster_sectors;
+ index_in_cluster = vmdk_find_index_in_cluster(extent, sector_num);
n = extent->cluster_sectors - index_in_cluster;
if (n > nb_sectors) {
n = nb_sectors;
--
2.4.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [Qemu-block] [PATCH 1/2] vmdk: Fix index_in_cluster calculation in vmdk_co_get_block_status
2015-06-04 6:02 ` [Qemu-devel] [PATCH 1/2] vmdk: Fix index_in_cluster calculation in vmdk_co_get_block_status Fam Zheng
@ 2015-06-05 16:49 ` Max Reitz
0 siblings, 0 replies; 6+ messages in thread
From: Max Reitz @ 2015-06-05 16:49 UTC (permalink / raw)
To: Fam Zheng, qemu-devel; +Cc: qemu-stable, qemu-block
On 04.06.2015 08:02, Fam Zheng wrote:
> It has the similar issue with b1649fae49a8. Since the calculation
> is repeated for a few times already, introduce a function so it can be
> reused.
>
> Signed-off-by: Fam Zheng <famz@redhat.com>
> ---
> block/vmdk.c | 13 ++++++++++++-
> 1 file changed, 12 insertions(+), 1 deletion(-)
Reviewed-by: Max Reitz <mreitz@redhat.com>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [Qemu-block] [PATCH 2/2] vmdk: Use vmdk_find_index_in_cluster everywhere
2015-06-04 6:02 ` [Qemu-devel] [PATCH 2/2] vmdk: Use vmdk_find_index_in_cluster everywhere Fam Zheng
@ 2015-06-05 16:51 ` Max Reitz
0 siblings, 0 replies; 6+ messages in thread
From: Max Reitz @ 2015-06-05 16:51 UTC (permalink / raw)
To: Fam Zheng, qemu-devel; +Cc: qemu-stable, qemu-block
On 04.06.2015 08:02, Fam Zheng wrote:
> Signed-off-by: Fam Zheng <famz@redhat.com>
> ---
> block/vmdk.c | 10 ++--------
> 1 file changed, 2 insertions(+), 8 deletions(-)
Reviewed-by: Max Reitz <mreitz@redhat.com>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [PATCH 0/2] vmdk: Fix vmdk_co_get_block_status
2015-06-04 6:02 [Qemu-devel] [PATCH 0/2] vmdk: Fix vmdk_co_get_block_status Fam Zheng
2015-06-04 6:02 ` [Qemu-devel] [PATCH 1/2] vmdk: Fix index_in_cluster calculation in vmdk_co_get_block_status Fam Zheng
2015-06-04 6:02 ` [Qemu-devel] [PATCH 2/2] vmdk: Use vmdk_find_index_in_cluster everywhere Fam Zheng
@ 2015-06-08 10:45 ` Kevin Wolf
2 siblings, 0 replies; 6+ messages in thread
From: Kevin Wolf @ 2015-06-08 10:45 UTC (permalink / raw)
To: Fam Zheng; +Cc: qemu-devel, qemu-block, qemu-stable
Am 04.06.2015 um 08:02 hat Fam Zheng geschrieben:
> The buggy index_in_cluster was missed in b1649fae49a8. Fix that and dedup the
> calculation.
Thanks, applied to the block branch.
Kevin
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2015-06-08 10:45 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-06-04 6:02 [Qemu-devel] [PATCH 0/2] vmdk: Fix vmdk_co_get_block_status Fam Zheng
2015-06-04 6:02 ` [Qemu-devel] [PATCH 1/2] vmdk: Fix index_in_cluster calculation in vmdk_co_get_block_status Fam Zheng
2015-06-05 16:49 ` [Qemu-devel] [Qemu-block] " Max Reitz
2015-06-04 6:02 ` [Qemu-devel] [PATCH 2/2] vmdk: Use vmdk_find_index_in_cluster everywhere Fam Zheng
2015-06-05 16:51 ` [Qemu-devel] [Qemu-block] " Max Reitz
2015-06-08 10:45 ` [Qemu-devel] [PATCH 0/2] vmdk: Fix vmdk_co_get_block_status Kevin Wolf
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.