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

vmdk: Implement .bdrv_co_preadv() interface

Browse source 
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Fam Zheng <famz@redhat.com>
This commit is contained in:
Kevin Wolf 2016-04-25 17:34:41 +02:00
parent a844a2b0d4
commit f10cc24359
1 changed files with 53 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

98
block/vmdk.c
View file

@ -1381,8 +1381,8 @@ static int vmdk_write_extent(VmdkExtent *extent, int64_t cluster_offset,
} }
static int vmdk_read_extent(VmdkExtent *extent, int64_t cluster_offset, static int vmdk_read_extent(VmdkExtent *extent, int64_t cluster_offset,
int64_t offset_in_cluster, uint8_t *buf, int64_t offset_in_cluster, QEMUIOVector *qiov,
int nb_sectors) int bytes)
{ {
int ret; int ret;
int cluster_bytes, buf_bytes; int cluster_bytes, buf_bytes;
@ -1394,14 +1394,13 @@ static int vmdk_read_extent(VmdkExtent *extent, int64_t cluster_offset,
if (!extent->compressed) { if (!extent->compressed) {
ret = bdrv_pread(extent->file->bs, ret = bdrv_co_preadv(extent->file->bs,
cluster_offset + offset_in_cluster, cluster_offset + offset_in_cluster, bytes,
buf, nb_sectors * 512); qiov, 0);
if (ret == nb_sectors * 512) { if (ret < 0) {
return 0; return ret;
} else {
return -EIO;
} }
return 0;
} }
cluster_bytes = extent->cluster_sectors * 512; cluster_bytes = extent->cluster_sectors * 512;
/* Read two clusters in case GrainMarker + compressed data > one cluster */ /* Read two clusters in case GrainMarker + compressed data > one cluster */
@ -1433,11 +1432,11 @@ static int vmdk_read_extent(VmdkExtent *extent, int64_t cluster_offset,
} }
if (offset_in_cluster < 0 || if (offset_in_cluster < 0 ||
offset_in_cluster + nb_sectors * 512 > buf_len) { offset_in_cluster + bytes > buf_len) {
ret = -EINVAL; ret = -EINVAL;
goto out; goto out;
} }
memcpy(buf, uncomp_buf + offset_in_cluster, nb_sectors * 512); qemu_iovec_from_buf(qiov, 0, uncomp_buf + offset_in_cluster, bytes);
ret = 0; ret = 0;
out: out:
@ -1446,64 +1445,73 @@ static int vmdk_read_extent(VmdkExtent *extent, int64_t cluster_offset,
return ret; return ret;
} }
static int vmdk_read(BlockDriverState *bs, int64_t sector_num, static int coroutine_fn
uint8_t *buf, int nb_sectors) vmdk_co_preadv(BlockDriverState *bs, uint64_t offset, uint64_t bytes,
QEMUIOVector *qiov, int flags)
{ {
BDRVVmdkState *s = bs->opaque; BDRVVmdkState *s = bs->opaque;
int ret; int ret;
uint64_t n, index_in_cluster; uint64_t n_bytes, offset_in_cluster;
VmdkExtent *extent = NULL; VmdkExtent *extent = NULL;
QEMUIOVector local_qiov;
uint64_t cluster_offset; uint64_t cluster_offset;
uint64_t bytes_done = 0;
while (nb_sectors > 0) { qemu_iovec_init(&local_qiov, qiov->niov);
extent = find_extent(s, sector_num, extent); qemu_co_mutex_lock(&s->lock);
while (bytes > 0) {
extent = find_extent(s, offset >> BDRV_SECTOR_BITS, extent);
if (!extent) { if (!extent) {
return -EIO; ret = -EIO;
goto fail;
} }
ret = get_cluster_offset(bs, extent, NULL, ret = get_cluster_offset(bs, extent, NULL,
sector_num << 9, false, &cluster_offset, offset, false, &cluster_offset, 0, 0);
0, 0); offset_in_cluster = vmdk_find_offset_in_cluster(extent, offset);
index_in_cluster = vmdk_find_index_in_cluster(extent, sector_num);
n = extent->cluster_sectors - index_in_cluster; n_bytes = MIN(bytes, extent->cluster_sectors * BDRV_SECTOR_SIZE
if (n > nb_sectors) { - offset_in_cluster);
n = nb_sectors;
}
if (ret != VMDK_OK) { if (ret != VMDK_OK) {
/* if not allocated, try to read from parent image, if exist */ /* if not allocated, try to read from parent image, if exist */
if (bs->backing && ret != VMDK_ZEROED) { if (bs->backing && ret != VMDK_ZEROED) {
if (!vmdk_is_cid_valid(bs)) { if (!vmdk_is_cid_valid(bs)) {
return -EINVAL; ret = -EINVAL;
goto fail;
} }
ret = bdrv_read(bs->backing->bs, sector_num, buf, n);
qemu_iovec_reset(&local_qiov);
qemu_iovec_concat(&local_qiov, qiov, bytes_done, n_bytes);
ret = bdrv_co_preadv(bs->backing->bs, offset, n_bytes,
&local_qiov, 0);
if (ret < 0) { if (ret < 0) {
return ret; goto fail;
} }
} else { } else {
memset(buf, 0, 512 * n); qemu_iovec_memset(qiov, bytes_done, 0, n_bytes);
} }
} else { } else {
ret = vmdk_read_extent(extent, qemu_iovec_reset(&local_qiov);
cluster_offset, index_in_cluster * 512, qemu_iovec_concat(&local_qiov, qiov, bytes_done, n_bytes);
buf, n);
ret = vmdk_read_extent(extent, cluster_offset, offset_in_cluster,
&local_qiov, n_bytes);
if (ret) { if (ret) {
return ret; goto fail;
} }
} }
nb_sectors -= n; bytes -= n_bytes;
sector_num += n; offset += n_bytes;
buf += n * 512; bytes_done += n_bytes;
} }
return 0;
}
static coroutine_fn int vmdk_co_read(BlockDriverState *bs, int64_t sector_num, ret = 0;
uint8_t *buf, int nb_sectors) fail:
{
int ret;
BDRVVmdkState *s = bs->opaque;
qemu_co_mutex_lock(&s->lock);
ret = vmdk_read(bs, sector_num, buf, nb_sectors);
qemu_co_mutex_unlock(&s->lock); qemu_co_mutex_unlock(&s->lock);
qemu_iovec_destroy(&local_qiov);
return ret; return ret;
} }
@ -2332,7 +2340,7 @@ static BlockDriver bdrv_vmdk = {
.bdrv_open = vmdk_open, .bdrv_open = vmdk_open,
.bdrv_check = vmdk_check, .bdrv_check = vmdk_check,
.bdrv_reopen_prepare = vmdk_reopen_prepare, .bdrv_reopen_prepare = vmdk_reopen_prepare,
.bdrv_read = vmdk_co_read, .bdrv_co_preadv = vmdk_co_preadv,
.bdrv_write = vmdk_co_write, .bdrv_write = vmdk_co_write,
.bdrv_write_compressed = vmdk_write_compressed, .bdrv_write_compressed = vmdk_write_compressed,
.bdrv_co_write_zeroes = vmdk_co_write_zeroes, .bdrv_co_write_zeroes = vmdk_co_write_zeroes,