From dd97cdc064f24484a2ebc141a4ec6bba35f56007 Mon Sep 17 00:00:00 2001 From: "Denis V. Lunev" Date: Tue, 28 Apr 2015 10:46:49 +0300 Subject: [PATCH] block/parallels: keep BAT bitmap data in little endian in memory This will allow to use this data as buffer to BAT update directly without any intermediate buffers. Signed-off-by: Denis V. Lunev Reviewed-by: Roman Kagan Reviewed-by: Stefan Hajnoczi Signed-off-by: Roman Kagan Message-id: 1430207220-24458-17-git-send-email-den@openvz.org CC: Kevin Wolf Signed-off-by: Stefan Hajnoczi --- block/parallels.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/block/parallels.c b/block/parallels.c index 1540c2186a..431adf1ceb 100644 --- a/block/parallels.c +++ b/block/parallels.c @@ -90,7 +90,6 @@ static int parallels_open(BlockDriverState *bs, QDict *options, int flags, Error **errp) { BDRVParallelsState *s = bs->opaque; - int i; ParallelsHeader ph; int ret; @@ -143,10 +142,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]); - } - s->has_truncate = bdrv_has_zero_init(bs->file) && bdrv_truncate(bs->file, bdrv_getlength(bs->file)) == 0; @@ -164,7 +159,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) @@ -191,7 +186,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; @@ -215,12 +210,10 @@ static int64_t allocate_cluster(BlockDriverState *bs, int64_t sector_num) return ret; } - 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(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) { s->bat_bitmap[idx] = 0; return ret;