]> git.proxmox.com Git - mirror_qemu.git/commit - backends/hostmem.c
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Tue, 21 Jul 2020 18:25:48 +0000 (19:25 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Tue, 21 Jul 2020 18:25:48 +0000 (19:25 +0100)
commit0c1fd2f41f2f63cf3305d6d29d1acd0d960dbd36
tree9153d2ff6ea4c34f669ba70e7a675449c46ea9fe
parentb50dab9ecac442acc1b316e4749dae36a2fe7d61
parent4a01e27ddcb5921efd68820d05d85ba71293fea6
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>