[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 23/27] block/parallels: create bat_entry_off helper
From: |
Denis V. Lunev |
Subject: |
[Qemu-devel] [PATCH 23/27] block/parallels: create bat_entry_off helper |
Date: |
Tue, 28 Apr 2015 10:46:56 +0300 |
calculate offset of the BAT entry in the image file.
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 | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/block/parallels.c b/block/parallels.c
index 5ff74e8..4d8a0d4 100644
--- a/block/parallels.c
+++ b/block/parallels.c
@@ -82,6 +82,11 @@ static int64_t bat2sect(BDRVParallelsState *s, uint32_t idx)
return (uint64_t)le32_to_cpu(s->bat_bitmap[idx]) * s->off_multiplier;
}
+static uint32_t bat_entry_off(uint32_t idx)
+{
+ return sizeof(ParallelsHeader) + sizeof(uint32_t) * idx;
+}
+
static int64_t seek_to_sector(BDRVParallelsState *s, int64_t sector_num)
{
uint32_t index, offset;
@@ -160,9 +165,8 @@ static int64_t allocate_cluster(BlockDriverState *bs,
int64_t sector_num)
}
s->bat_bitmap[idx] = cpu_to_le32(pos / s->off_multiplier);
- ret = bdrv_pwrite(bs->file,
- sizeof(ParallelsHeader) + idx * sizeof(s->bat_bitmap[idx]),
- s->bat_bitmap + idx, sizeof(s->bat_bitmap[idx]));
+ ret = bdrv_pwrite(bs->file, bat_entry_off(idx), s->bat_bitmap + idx,
+ sizeof(s->bat_bitmap[idx]));
if (ret < 0) {
s->bat_bitmap[idx] = 0;
return ret;
@@ -400,8 +404,7 @@ static int parallels_create(const char *filename, QemuOpts
*opts, Error **errp)
}
bat_entries = DIV_ROUND_UP(total_size, cl_size);
- bat_sectors = DIV_ROUND_UP(bat_entries * sizeof(uint32_t) +
- sizeof(ParallelsHeader), cl_size);
+ bat_sectors = DIV_ROUND_UP(bat_entry_off(bat_entries), cl_size);
bat_sectors = (bat_sectors * cl_size) >> BDRV_SECTOR_BITS;
memset(&header, 0, sizeof(header));
@@ -513,7 +516,7 @@ static int parallels_open(BlockDriverState *bs, QDict
*options, int flags,
goto fail;
}
- size = sizeof(ParallelsHeader) + sizeof(uint32_t) * s->bat_size;
+ size = bat_entry_off(s->bat_size);
s->header_size = ROUND_UP(size, bdrv_opt_mem_align(bs->file));
s->header = qemu_try_blockalign(bs->file, s->header_size);
if (s->header == NULL) {
--
1.9.1
- [Qemu-devel] [PATCH 10/27] iotests, parallels: test for write into Parallels image, (continued)
- [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, 2015/04/28
- [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 <=
- [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
- [Qemu-devel] [PATCH 26/27] block/parallels: optimize linear image expansion, Denis V. Lunev, 2015/04/28
- [Qemu-devel] [PATCH 27/27] block/parallels: improve image writing performance further, Denis V. Lunev, 2015/04/28