motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-05 00:33:55 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

qcow: Switch to .bdrv_co_block_status()

Browse source 
We are gradually moving away from sector-based interfaces, towards
byte-based.  Update the qcow driver accordingly.  There is no
intent to optimize based on the want_zero flag for this format.

Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Eric Blake 2018-02-13 14:26:51 -06:00 • committed by Kevin Wolf
parent 8e0cf59d02
commit d63b4c93e3
1 changed files with 16 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

27
block/qcow.c
View file

@ -524,23 +524,28 @@ static int get_cluster_offset(BlockDriverState *bs,
return 1; return 1;
} }
static int64_t coroutine_fn qcow_co_get_block_status(BlockDriverState *bs, static int coroutine_fn qcow_co_block_status(BlockDriverState *bs,
int64_t sector_num, int nb_sectors, int *pnum, BlockDriverState **file) bool want_zero,
int64_t offset, int64_t bytes,
int64_t *pnum, int64_t *map,
BlockDriverState **file)
{ {
BDRVQcowState *s = bs->opaque; BDRVQcowState *s = bs->opaque;
int index_in_cluster, n, ret; int index_in_cluster, ret;
int64_t n;
uint64_t cluster_offset; uint64_t cluster_offset;
qemu_co_mutex_lock(&s->lock); qemu_co_mutex_lock(&s->lock);
ret = get_cluster_offset(bs, sector_num << 9, 0, 0, 0, 0, &cluster_offset); ret = get_cluster_offset(bs, offset, 0, 0, 0, 0, &cluster_offset);
qemu_co_mutex_unlock(&s->lock); qemu_co_mutex_unlock(&s->lock);
if (ret < 0) { if (ret < 0) {
return ret; return ret;
} }
index_in_cluster = sector_num & (s->cluster_sectors - 1); index_in_cluster = offset & (s->cluster_size - 1);
n = s->cluster_sectors - index_in_cluster; n = s->cluster_size - index_in_cluster;
if (n > nb_sectors) if (n > bytes) {
n = nb_sectors; n = bytes;
}
*pnum = n; *pnum = n;
if (!cluster_offset) { if (!cluster_offset) {
return 0; return 0;
@ -548,9 +553,9 @@ static int64_t coroutine_fn qcow_co_get_block_status(BlockDriverState *bs,
if ((cluster_offset & QCOW_OFLAG_COMPRESSED) || s->crypto) { if ((cluster_offset & QCOW_OFLAG_COMPRESSED) || s->crypto) {
return BDRV_BLOCK_DATA; return BDRV_BLOCK_DATA;
} }
cluster_offset |= (index_in_cluster << BDRV_SECTOR_BITS); *map = cluster_offset | index_in_cluster;
*file = bs->file->bs; *file = bs->file->bs;
return BDRV_BLOCK_DATA | BDRV_BLOCK_OFFSET_VALID | cluster_offset; return BDRV_BLOCK_DATA | BDRV_BLOCK_OFFSET_VALID;
} }
static int decompress_buffer(uint8_t *out_buf, int out_buf_size, static int decompress_buffer(uint8_t *out_buf, int out_buf_size,
@ -1128,7 +1133,7 @@ static BlockDriver bdrv_qcow = {
.bdrv_co_readv = qcow_co_readv, .bdrv_co_readv = qcow_co_readv,
.bdrv_co_writev = qcow_co_writev, .bdrv_co_writev = qcow_co_writev,
.bdrv_co_get_block_status = qcow_co_get_block_status, .bdrv_co_block_status = qcow_co_block_status,
.bdrv_make_empty = qcow_make_empty, .bdrv_make_empty = qcow_make_empty,
.bdrv_co_pwritev_compressed = qcow_co_pwritev_compressed, .bdrv_co_pwritev_compressed = qcow_co_pwritev_compressed,