The following changes since commit 5ec2eca83dc478ddf24077e02a8b34dd26cd3ff9:
Merge remote-tracking branch 'remotes/awilliam/tags/vfio-updates-20190613.0' into staging (2019-06-14 09:33:55 +0100) are available in the Git repository at: https://github.com/XanClic/qemu.git tags/pull-block-2019-06-14 for you to fetch changes up to 21c1ce592a144188dfe59b9e156a97da412a59a2: iotests: Test qemu-img convert -C --salvage (2019-06-14 15:09:42 +0200) ---------------------------------------------------------------- Block patches: - Allow blockdev-backup from nodes that are not in qemu's main AIO context to newly added nodes - Add salvaging mode to qemu-img convert - Minor fixes to tests, documentation, and for less Valgrind annoyance ---------------------------------------------------------------- Andrey Shinkevich (1): hw/block/fdc: floppy command FIFO memory initialization John Snow (6): blockdev-backup: don't check aio_context too early iotests.py: do not use infinite waits QEMUMachine: add events_wait method iotests.py: rewrite run_job to be pickier iotests: add iotest 256 for testing blockdev-backup across iothread contexts event_match: always match on None value Max Reitz (12): iotests: Filter 175's allocation information iotests: Fix intermittent failure in 219 qemu-img: Fix options leakage in img_rebase() qapi/block-core: Overlays are not snapshots blockdev: Overlays are not snapshots qemu-img: Move quiet into ImgConvertState qemu-img: Add salvaging mode to convert blkdebug: Add @iotype error option blkdebug: Add "none" event blkdebug: Inject errors on .bdrv_co_block_status() iotests: Test qemu-img convert --salvage iotests: Test qemu-img convert -C --salvage Vladimir Sementsov-Ogievskiy (1): iotests: restrict 254 to support only qcow2 qapi/block-core.json | 53 ++++++++--- block/blkdebug.c | 60 ++++++++++-- blockdev.c | 14 +-- hw/block/fdc.c | 1 + qemu-img.c | 106 +++++++++++++++------ python/qemu/__init__.py | 67 ++++++++++---- qemu-img-cmds.hx | 4 +- qemu-img.texi | 4 + tests/qemu-iotests/082 | 1 + tests/qemu-iotests/082.out | 3 + tests/qemu-iotests/085.out | 10 +- tests/qemu-iotests/175 | 26 +++++- tests/qemu-iotests/175.out | 8 +- tests/qemu-iotests/219 | 13 ++- tests/qemu-iotests/251 | 170 ++++++++++++++++++++++++++++++++++ tests/qemu-iotests/251.out | 43 +++++++++ tests/qemu-iotests/254 | 2 + tests/qemu-iotests/256 | 122 ++++++++++++++++++++++++ tests/qemu-iotests/256.out | 119 ++++++++++++++++++++++++ tests/qemu-iotests/group | 2 + tests/qemu-iotests/iotests.py | 60 +++++++----- 21 files changed, 772 insertions(+), 116 deletions(-) create mode 100755 tests/qemu-iotests/251 create mode 100644 tests/qemu-iotests/251.out create mode 100755 tests/qemu-iotests/256 create mode 100644 tests/qemu-iotests/256.out -- 2.21.0
