diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-07-21 19:25:48 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-07-21 19:25:48 +0100 |
| commit | 0c1fd2f41f2f63cf3305d6d29d1acd0d960dbd36 (patch) | |
| tree | 9153d2ff6ea4c34f669ba70e7a675449c46ea9fe /block | |
| parent | b50dab9ecac442acc1b316e4749dae36a2fe7d61 (diff) | |
| parent | 4a01e27ddcb5921efd68820d05d85ba71293fea6 (diff) | |
| download | qemu-0c1fd2f41f2f63cf3305d6d29d1acd0d960dbd36.zip qemu-0c1fd2f41f2f63cf3305d6d29d1acd0d960dbd36.tar.gz qemu-0c1fd2f41f2f63cf3305d6d29d1acd0d960dbd36.tar.bz2 | |
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
Block layer patches:
- file-posix: Handle `EINVAL` fallocate return value
- qemu-img convert -n: Keep qcow2 v2 target sparse
# gpg: Signature made Tue 21 Jul 2020 16:45:28 BST
# gpg: using RSA key DC3DEB159A9AF95D3D7456FE7F09B272C88F2FD6
# gpg: issuer "kwolf@redhat.com"
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>" [full]
# Primary key fingerprint: DC3D EB15 9A9A F95D 3D74 56FE 7F09 B272 C88F 2FD6
* remotes/kevin/tags/for-upstream:
iotests: Test sparseness for qemu-img convert -n
qcow2: Implement v2 zero writes with discard if possible
file-posix: Handle `EINVAL` fallocate return value
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'block')
| -rw-r--r-- | block/file-posix.c | 6 | ||||
| -rw-r--r-- | block/qcow2-cluster.c | 9 |
2 files changed, 13 insertions, 2 deletions
diff --git a/block/file-posix.c b/block/file-posix.c index 8cc39a1..9a00d41 100644 --- a/block/file-posix.c +++ b/block/file-posix.c @@ -1698,7 +1698,11 @@ static int handle_aiocb_write_zeroes_unmap(void *opaque) #ifdef CONFIG_FALLOCATE_PUNCH_HOLE int ret = do_fallocate(s->fd, FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE, aiocb->aio_offset, aiocb->aio_nbytes); - if (ret != -ENOTSUP) { + switch (ret) { + case -ENOTSUP: + case -EINVAL: + break; + default: return ret; } #endif diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c index 4b5fc8c..a677ba9 100644 --- a/block/qcow2-cluster.c +++ b/block/qcow2-cluster.c @@ -1797,8 +1797,15 @@ int qcow2_cluster_zeroize(BlockDriverState *bs, uint64_t offset, assert(QEMU_IS_ALIGNED(end_offset, s->cluster_size) || end_offset >= bs->total_sectors << BDRV_SECTOR_BITS); - /* The zero flag is only supported by version 3 and newer */ + /* + * The zero flag is only supported by version 3 and newer. However, if we + * have no backing file, we can resort to discard in version 2. + */ if (s->qcow_version < 3) { + if (!bs->backing) { + return qcow2_cluster_discard(bs, offset, bytes, + QCOW2_DISCARD_REQUEST, false); + } return -ENOTSUP; } |