@@ -84,7 +84,6 @@ static int parallels_open(BlockDriverState *bs, QDict *options, int flags,
Error **errp)
{
BDRVParallelsState *s = bs->opaque;
- int i;
ParallelsHeader ph;
int ret;
@@ -137,9 +136,6 @@ static int parallels_open(BlockDriverState *bs, QDict *options, int flags,
goto fail;
}
- for (i = 0; i < s->bat_size; i++)
- le32_to_cpus(&s->bat_bitmap[i]);
-
qemu_co_mutex_init(&s->lock);
return 0;
@@ -154,7 +150,7 @@ fail:
static int64_t bat2sect(BDRVParallelsState *s, uint32_t idx)
{
- return (uint64_t)s->bat_bitmap[idx] * s->off_multiplier;
+ return (uint64_t)le32_to_cpu(s->bat_bitmap[idx]) * s->off_multiplier;
}
static int64_t seek_to_sector(BDRVParallelsState *s, int64_t sector_num)
@@ -180,7 +176,7 @@ static int cluster_remainder(BDRVParallelsState *s, int64_t sector_num,
static int64_t allocate_cluster(BlockDriverState *bs, int64_t sector_num)
{
BDRVParallelsState *s = bs->opaque;
- uint32_t idx, offset, tmp;
+ uint32_t idx, offset;
int64_t pos;
int ret;
@@ -196,12 +192,11 @@ static int64_t allocate_cluster(BlockDriverState *bs, int64_t sector_num)
pos = bdrv_getlength(bs->file) >> BDRV_SECTOR_BITS;
bdrv_truncate(bs->file, (pos + s->tracks) << BDRV_SECTOR_BITS);
- s->bat_bitmap[idx] = pos / s->off_multiplier;
-
- tmp = cpu_to_le32(s->bat_bitmap[idx]);
+ s->bat_bitmap[idx] = cpu_to_le32(pos / s->off_multiplier);
ret = bdrv_pwrite_sync(bs->file,
- sizeof(ParallelsHeader) + idx * sizeof(tmp), &tmp, sizeof(tmp));
+ sizeof(ParallelsHeader) + idx * sizeof(s->bat_bitmap[idx]),
+ s->bat_bitmap + idx, sizeof(s->bat_bitmap[idx]));
if (ret < 0) {
return ret;
}
This will allow to use this data as buffer to BAT update directly without any intermediate buffers. Signed-off-by: Denis V. Lunev <den@openvz.org> CC: Roman Kagan <rkagan@parallels.com> CC: Kevin Wolf <kwolf@redhat.com> CC: Stefan Hajnoczi <stefanha@redhat.com> --- block/parallels.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-)