mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

block/parallels: create bat_entry_off helper

Browse Source 
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>
This commit is contained in:
Denis V. Lunev 2015-04-28 10:46:56 +03:00 committed by Stefan Hajnoczi
parent 6953d92078
commit 2d68e22e94
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
block/parallels.c
View File

@ -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; 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) static int64_t seek_to_sector(BDRVParallelsState *s, int64_t sector_num)
{ {
uint32_t index, offset; 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); s->bat_bitmap[idx] = cpu_to_le32(pos / s->off_multiplier);
ret = bdrv_pwrite(bs->file, ret = bdrv_pwrite(bs->file, bat_entry_off(idx), s->bat_bitmap + idx,
sizeof(ParallelsHeader) + idx * sizeof(s->bat_bitmap[idx]), sizeof(s->bat_bitmap[idx]));
s->bat_bitmap + idx, sizeof(s->bat_bitmap[idx]));
if (ret < 0) { if (ret < 0) {
s->bat_bitmap[idx] = 0; s->bat_bitmap[idx] = 0;
return ret; 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_entries = DIV_ROUND_UP(total_size, cl_size);
bat_sectors = DIV_ROUND_UP(bat_entries * sizeof(uint32_t) + bat_sectors = DIV_ROUND_UP(bat_entry_off(bat_entries), cl_size);
sizeof(ParallelsHeader), cl_size);
bat_sectors = (bat_sectors * cl_size) >> BDRV_SECTOR_BITS; bat_sectors = (bat_sectors * cl_size) >> BDRV_SECTOR_BITS;
memset(&header, 0, sizeof(header)); memset(&header, 0, sizeof(header));
@ -513,7 +516,7 @@ static int parallels_open(BlockDriverState *bs, QDict *options, int flags,
goto fail; 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_size = ROUND_UP(size, bdrv_opt_mem_align(bs->file));
s->header = qemu_try_blockalign(bs->file, s->header_size); s->header = qemu_try_blockalign(bs->file, s->header_size);
if (s->header == NULL) { if (s->header == NULL) {