[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 23/38] block/parallels: create bat_entry_off helper
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL 23/38] block/parallels: create bat_entry_off helper |
Date: |
Fri, 22 May 2015 10:01:55 +0100 |
From: "Denis V. Lunev" <address@hidden>
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>
Signed-off-by: Roman Kagan <address@hidden>
Message-id: address@hidden
CC: Kevin Wolf <address@hidden>
Signed-off-by: Stefan Hajnoczi <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) {
--
2.1.0
- [Qemu-devel] [PULL 14/38] block/parallels: rename catalog_ names to bat_, (continued)
- [Qemu-devel] [PULL 14/38] block/parallels: rename catalog_ names to bat_, Stefan Hajnoczi, 2015/05/22
- [Qemu-devel] [PULL 18/38] block/parallels: move parallels_open/probe to the very end of the file, Stefan Hajnoczi, 2015/05/22
- [Qemu-devel] [PULL 16/38] block/parallels: keep BAT bitmap data in little endian in memory, Stefan Hajnoczi, 2015/05/22
- [Qemu-devel] [PULL 15/38] block/parallels: create bat2sect helper, Stefan Hajnoczi, 2015/05/22
- [Qemu-devel] [PULL 19/38] block/parallels: implement parallels_check method of block driver, Stefan Hajnoczi, 2015/05/22
- [Qemu-devel] [PULL 17/38] block/parallels: read parallels image header and BAT into single buffer, Stefan Hajnoczi, 2015/05/22
- [Qemu-devel] [PULL 20/38] block/parallels: implement incorrect close detection, Stefan Hajnoczi, 2015/05/22
- [Qemu-devel] [PULL 21/38] iotests, parallels: check for incorrectly closed image in tests, Stefan Hajnoczi, 2015/05/22
- [Qemu-devel] [PULL 24/38] block/parallels: delay writing to BAT till bdrv_co_flush_to_os, Stefan Hajnoczi, 2015/05/22
- [Qemu-devel] [PULL 22/38] block/parallels: improve image reading performance, Stefan Hajnoczi, 2015/05/22
- [Qemu-devel] [PULL 23/38] block/parallels: create bat_entry_off helper,
Stefan Hajnoczi <=
- [Qemu-devel] [PULL 26/38] block/parallels: optimize linear image expansion, Stefan Hajnoczi, 2015/05/22
- [Qemu-devel] [PULL 28/38] configure: handle clang -nopie argument warning, Stefan Hajnoczi, 2015/05/22
- [Qemu-devel] [PULL 27/38] block/parallels: improve image writing performance further, Stefan Hajnoczi, 2015/05/22
- [Qemu-devel] [PULL 29/38] configure: factor out supported flag check, Stefan Hajnoczi, 2015/05/22
- [Qemu-devel] [PULL 25/38] block/parallels: add prealloc-mode and prealloc-size open paramemets, Stefan Hajnoczi, 2015/05/22
- [Qemu-devel] [PULL 30/38] configure: silence glib unknown attribute __alloc_size__, Stefan Hajnoczi, 2015/05/22
- [Qemu-devel] [PULL 31/38] configure: Add workaround for ccache and clang, Stefan Hajnoczi, 2015/05/22
- [Qemu-devel] [PULL 33/38] block: minimal bounce buffer alignment, Stefan Hajnoczi, 2015/05/22
- [Qemu-devel] [PULL 34/38] block: align bounce buffers to page, Stefan Hajnoczi, 2015/05/22
- [Qemu-devel] [PULL 35/38] Revert "block: Fix unaligned zero write", Stefan Hajnoczi, 2015/05/22