diff options
| author | Denis V. Lunev <den@openvz.org> | 2015-04-28 10:46:56 +0300 |
|---|---|---|
| committer | Stefan Hajnoczi <stefanha@redhat.com> | 2015-05-22 09:37:32 +0100 |
| commit | 2d68e22e94e8bc5a0d32a38b53c592c320db8261 (patch) | |
| tree | f40ca50b4f08c9e952812cd48ec94ee191fe4b88 /block/parallels.c | |
| parent | 6953d920784466dfaea77f7cfd23df2ad8b772a0 (diff) | |
block/parallels: create bat_entry_off helper
calculate offset of the BAT entry in the image file.
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-24-git-send-email-den@openvz.org
CC: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'block/parallels.c')
| -rw-r--r-- | block/parallels.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/block/parallels.c b/block/parallels.c index 5ff74e8a0f..4d8a0d48aa 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) { |