Peter Maydell 58e2e17dba Block layer patches ... -----BEGIN PGP SIGNATURE----- iQIcBAABAgAGBQJanYJPAAoJEH8JsnLIjy/WxjUQAJA+DTOmGXvaNpMs65BrU79K /r/iGVrzHv/RMLmrWMnqj96W9SnpMuiAP9hVLNsekqClY9q4ME4DpGcXhWfhSvF5 FC51ehvFJdfo8cPorsevcqNj60iWebjcx3lFfUq2606UOyYih3oijYxr6gSwWbRc GAgdGMqsvGYpzgqAQVEWHUhaX0La49/OzY42aR+E+LCBNfTYvlydvyoc+tUTdIpW 1eM/ASGndGsN0Cf2vxlbKgJ0/P6v+cRZuuIDhKZqre+YG+yM+pq7yZb+o7nf/P36 TPR93BsT7FSVAizRK7VFRuPIynHpiaxYygrJERCXF0sxsV4OlKjpmt/uUPamWFh+ 46Jx2NK1AuAx87BdErgmA119ObO3oAPxK0+2p981obb6SphTbbPxDj6SOlYCt4mJ mhff4JtIiwCmDSckAwd2mkBI1Tvl9qqcELrpyd2t2eU4ec2vf7fPd85EsK/Mq6Kr dbfqFvjNaaMxChoqFgkHAveYJ7zYqRFI2IY5o9c1QyZehCGPWjScxHXZZYdpDl59 YF9DkYQDOyvEX2jmMECaO1r/0nnO+BqQHu5ItJuTte9rjP9Q0do3iBISiIefewtf yji6/QNn2hFrnr1HPAwLFFC3kPgc8Mq8mIUb53j8vG/01KhVRCcnJm2K6D4IUwLZ S6ZnQJB97eE4y7YR5dNt =2axz -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging Block layer patches # gpg: Signature made Mon 05 Mar 2018 17:45:51 GMT # gpg: using RSA key 7F09B272C88F2FD6 # gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>" # Primary key fingerprint: DC3D EB15 9A9A F95D 3D74 56FE 7F09 B272 C88F 2FD6 * remotes/kevin/tags/for-upstream: (38 commits) block: Fix NULL dereference on empty drive error qcow2: Replace align_offset() with ROUND_UP() block/ssh: Add basic .bdrv_truncate() block/ssh: Make ssh_grow_file() blocking block/ssh: Pull ssh_grow_file() from ssh_create() qemu-img: Make resize error message more general qcow2: make qcow2_co_create2() a coroutine_fn block: rename .bdrv_create() to .bdrv_co_create_opts() Revert "IDE: Do not flush empty CDROM drives" block: test blk_aio_flush() with blk->root == NULL block: add BlockBackend->in_flight counter block: extract AIO_WAIT_WHILE() from BlockDriverState aio: rename aio_context_in_iothread() to in_aio_context_home_thread() docs: document how to use the l2-cache-entry-size parameter specs/qcow2: Fix documentation of the compressed cluster descriptor iotest 033: add misaligned write-zeroes test via truncate block: fix write with zero flag set and iovector provided block: Drop unused .bdrv_co_get_block_status() vvfat: Switch to .bdrv_co_block_status() vpc: Switch to .bdrv_co_block_status() ... Signed-off-by: Peter Maydell <peter.maydell@linaro.org> # Conflicts: # include/block/block.h		2018-03-06 11:20:44 +00:00
..
accounting.h	block: make accounting thread-safe	2017-06-16 07:55:00 +08:00
aio-wait.h	block: extract AIO_WAIT_WHILE() from BlockDriverState	2018-03-02 18:39:07 +01:00
aio.h	aio: rename aio_context_in_iothread() to in_aio_context_home_thread()	2018-03-02 18:39:07 +01:00
block_backup.h	backup: Switch block_backup.h to byte-based	2017-07-10 13:18:06 +02:00
block_int.h	block: rename .bdrv_create() to .bdrv_co_create_opts()	2018-03-02 18:39:07 +01:00
block.h	Block layer patches	2018-03-06 11:20:44 +00:00
blockjob_int.h	blockjob: reimplement block_job_sleep_ns to allow cancellation	2017-11-29 15:26:21 +01:00
blockjob.h	blockjob: reimplement block_job_sleep_ns to allow cancellation	2017-11-29 15:26:21 +01:00
dirty-bitmap.h	Include less of the generated modular QAPI headers	2018-03-02 13:45:50 -06:00
nbd.h	Include less of the generated modular QAPI headers	2018-03-02 13:45:50 -06:00
nvme.h	block: Move NVMe constants to a separate header	2018-02-08 09:22:03 +08:00
qapi.h	Drop superfluous includes of qapi-types.h and test-qapi-types.h	2018-02-09 05:05:11 +01:00
raw-aio.h	linux-aio: share one LinuxAioState within an AioContext	2016-07-18 15:09:31 +01:00
snapshot.h	Move include qemu/option.h from qemu-common.h to actual users	2018-02-09 13:52:16 +01:00
thread-pool.h	Clean up decorations and whitespace around header guards	2016-07-12 16:20:46 +02:00
throttle-groups.h	block: add throttle block filter driver	2017-09-06 10:12:02 +02:00
write-threshold.h	Use scripts/clean-includes to drop redundant qemu/typedefs.h	2016-03-22 22:20:16 +01:00