[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 15/27] block/parallels: create bat2sect helper
From: |
Denis V. Lunev |
Subject: |
[Qemu-devel] [PATCH 15/27] block/parallels: create bat2sect helper |
Date: |
Tue, 28 Apr 2015 10:46:48 +0300 |
deduplicate copy/paste arithmetcs
Signed-off-by: Denis V. Lunev <address@hidden>
Reviewed-by: Roman Kagan <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
CC: Kevin Wolf <address@hidden>
---
block/parallels.c | 12 +++++++++---
1 file 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,
--
1.9.1
- [Qemu-devel] [PATCH 07/27] block/parallels: replace magic constants 4, 64 with proper sizeofs, (continued)
- [Qemu-devel] [PATCH 07/27] block/parallels: replace magic constants 4, 64 with proper sizeofs, Denis V. Lunev, 2015/04/28
- [Qemu-devel] [PATCH 08/27] block/parallels: mark parallels format driver as zero inited, Denis V. Lunev, 2015/04/28
- [Qemu-devel] [PATCH 01/27] iotests, parallels: quote TEST_IMG in 076 test to be path-safe, Denis V. Lunev, 2015/04/28
- [Qemu-devel] [PATCH 09/27] block/parallels: _co_writev callback for Parallels format, Denis V. Lunev, 2015/04/28
- [Qemu-devel] [PATCH 04/27] block/parallels: read up to cluster end in one go, Denis V. Lunev, 2015/04/28
- [Qemu-devel] [PATCH 11/27] block/parallels: support parallels image creation, Denis V. Lunev, 2015/04/28
- [Qemu-devel] [PATCH 13/27] parallels: change copyright information in the image header, Denis V. Lunev, 2015/04/28
- [Qemu-devel] [PATCH 12/27] iotests, parallels: test for newly created parallels image via qemu-img, Denis V. Lunev, 2015/04/28
- [Qemu-devel] [PATCH 10/27] iotests, parallels: test for write into Parallels image, Denis V. Lunev, 2015/04/28
- [Qemu-devel] [PATCH 14/27] block/parallels: rename catalog_ names to bat_, Denis V. Lunev, 2015/04/28
- [Qemu-devel] [PATCH 15/27] block/parallels: create bat2sect helper,
Denis V. Lunev <=
- [Qemu-devel] [PATCH 16/27] block/parallels: keep BAT bitmap data in little endian in memory, Denis V. Lunev, 2015/04/28
- [Qemu-devel] [PATCH 17/27] block/parallels: read parallels image header and BAT into single buffer, Denis V. Lunev, 2015/04/28
- [Qemu-devel] [PATCH 18/27] block/parallels: move parallels_open/probe to the very end of the file, Denis V. Lunev, 2015/04/28
- [Qemu-devel] [PATCH 19/27] block/parallels: implement parallels_check method of block driver, Denis V. Lunev, 2015/04/28
- [Qemu-devel] [PATCH 20/27] block/parallels: implement incorrect close detection, Denis V. Lunev, 2015/04/28
- [Qemu-devel] [PATCH 22/27] block/parallels: improve image reading performance, Denis V. Lunev, 2015/04/28
- [Qemu-devel] [PATCH 21/27] iotests, parallels: check for incorrectly closed image in tests, Denis V. Lunev, 2015/04/28
- [Qemu-devel] [PATCH 23/27] block/parallels: create bat_entry_off helper, Denis V. Lunev, 2015/04/28
- [Qemu-devel] [PATCH 24/27] block/parallels: delay writing to BAT till bdrv_co_flush_to_os, Denis V. Lunev, 2015/04/28
- [Qemu-devel] [PATCH 25/27] block/parallels: add prealloc-mode and prealloc-size open paramemets, Denis V. Lunev, 2015/04/28