mirror of
https://github.com/xemu-project/xemu.git
synced 2024-11-25 12:40:08 +00:00
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 <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-17-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:
parent
555cc9d9fc
commit
dd97cdc064
@ -90,7 +90,6 @@ static int parallels_open(BlockDriverState *bs, QDict *options, int flags,
|
|||||||
Error **errp)
|
Error **errp)
|
||||||
{
|
{
|
||||||
BDRVParallelsState *s = bs->opaque;
|
BDRVParallelsState *s = bs->opaque;
|
||||||
int i;
|
|
||||||
ParallelsHeader ph;
|
ParallelsHeader ph;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
@ -143,10 +142,6 @@ static int parallels_open(BlockDriverState *bs, QDict *options, int flags,
|
|||||||
goto fail;
|
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) &&
|
s->has_truncate = bdrv_has_zero_init(bs->file) &&
|
||||||
bdrv_truncate(bs->file, bdrv_getlength(bs->file)) == 0;
|
bdrv_truncate(bs->file, bdrv_getlength(bs->file)) == 0;
|
||||||
|
|
||||||
@ -164,7 +159,7 @@ fail:
|
|||||||
|
|
||||||
static int64_t bat2sect(BDRVParallelsState *s, uint32_t idx)
|
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)
|
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)
|
static int64_t allocate_cluster(BlockDriverState *bs, int64_t sector_num)
|
||||||
{
|
{
|
||||||
BDRVParallelsState *s = bs->opaque;
|
BDRVParallelsState *s = bs->opaque;
|
||||||
uint32_t idx, offset, tmp;
|
uint32_t idx, offset;
|
||||||
int64_t pos;
|
int64_t pos;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
@ -215,12 +210,10 @@ static int64_t allocate_cluster(BlockDriverState *bs, int64_t sector_num)
|
|||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
s->bat_bitmap[idx] = pos / s->off_multiplier;
|
s->bat_bitmap[idx] = cpu_to_le32(pos / s->off_multiplier);
|
||||||
|
|
||||||
tmp = cpu_to_le32(s->bat_bitmap[idx]);
|
|
||||||
|
|
||||||
ret = bdrv_pwrite(bs->file,
|
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) {
|
if (ret < 0) {
|
||||||
s->bat_bitmap[idx] = 0;
|
s->bat_bitmap[idx] = 0;
|
||||||
return ret;
|
return ret;
|
||||||
|
Loading…
Reference in New Issue
Block a user