aboutsummaryrefslogtreecommitdiff
path: root/block
diff options
context:
space:
mode:
authorDenis V. Lunev <den@openvz.org>2015-04-28 10:46:48 +0300
committerStefan Hajnoczi <stefanha@redhat.com>2015-05-22 09:37:32 +0100
commit555cc9d9fc5c71be6bd3f288eaf1e5628732088f (patch)
treeb8d71dca82f36f2c6903b9b9c22d3f28bde92d36 /block
parent369f7de9d57e4dd2f312255fc12271d5749c0a4e (diff)
downloadqemu-555cc9d9fc5c71be6bd3f288eaf1e5628732088f.zip
qemu-555cc9d9fc5c71be6bd3f288eaf1e5628732088f.tar.gz
qemu-555cc9d9fc5c71be6bd3f288eaf1e5628732088f.tar.bz2
block/parallels: create bat2sect helper
deduplicate copy/paste arithmetcs Signed-off-by: Denis V. Lunev <den@openvz.org> Reviewed-by: Roman Kagan <rkagan@parallels.com> Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com> Signed-off-by: Roman Kagan <rkagan@parallels.com> Message-id: 1430207220-24458-16-git-send-email-den@openvz.org CC: Kevin Wolf <kwolf@redhat.com> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'block')
-rw-r--r--block/parallels.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/block/parallels.c b/block/parallels.c
index 16fbdf4..1540c21 100644
--- a/block/parallels.c
+++ b/block/parallels.c
@@ -161,6 +161,12 @@ fail:
return ret;
}
+
+static int64_t bat2sect(BDRVParallelsState *s, uint32_t idx)
+{
+ return (uint64_t)s->bat_bitmap[idx] * s->off_multiplier;
+}
+
static int64_t seek_to_sector(BDRVParallelsState *s, int64_t sector_num)
{
uint32_t index, offset;
@@ -172,7 +178,7 @@ static int64_t seek_to_sector(BDRVParallelsState *s, int64_t sector_num)
if ((index >= s->bat_size) || (s->bat_bitmap[index] == 0)) {
return -1;
}
- return (uint64_t)s->bat_bitmap[index] * s->off_multiplier + offset;
+ return bat2sect(s, index) + offset;
}
static int cluster_remainder(BDRVParallelsState *s, int64_t sector_num,
@@ -196,7 +202,7 @@ static int64_t allocate_cluster(BlockDriverState *bs, int64_t sector_num)
return -EINVAL;
}
if (s->bat_bitmap[idx] != 0) {
- return (uint64_t)s->bat_bitmap[idx] * s->off_multiplier + offset;
+ return bat2sect(s, idx) + offset;
}
pos = bdrv_getlength(bs->file) >> BDRV_SECTOR_BITS;
@@ -219,7 +225,7 @@ static int64_t allocate_cluster(BlockDriverState *bs, int64_t sector_num)
s->bat_bitmap[idx] = 0;
return ret;
}
- return (uint64_t)s->bat_bitmap[idx] * s->off_multiplier + offset;
+ return bat2sect(s, idx) + offset;
}
static int64_t coroutine_fn parallels_co_get_block_status(BlockDriverState *bs,