Failed in applying to current master (
apply log)
Maintainers: Kevin Wolf <kwolf@redhat.com>, Hanna Reitz <hreitz@redhat.com>, "Dr. David Alan Gilbert" <dgilbert@redhat.com>, Markus Armbruster <armbru@redhat.com>, Eric Blake <eblake@redhat.com>, Peter Maydell <peter.maydell@linaro.org>, "Philippe Mathieu-Daudé" <f4bug@amsat.org>, Akihiko Odaki <akihiko.odaki@gmail.com>, Gerd Hoffmann <kraxel@redhat.com>
qapi/block.json | 6 ++
block/qapi-sysemu.c | 3 +-
monitor/hmp-cmds.c | 4 +-
hmp-commands.hx | 11 ++-
tests/qemu-iotests/030 | 85 +++++++++++--------
tests/qemu-iotests/040 | 53 +++++++-----
tests/qemu-iotests/056 | 2 +-
tests/qemu-iotests/108 | 2 +-
tests/qemu-iotests/149 | 6 +-
tests/qemu-iotests/163 | 5 +-
tests/qemu-iotests/205 | 4 +-
tests/qemu-iotests/216 | 12 +--
tests/qemu-iotests/218 | 5 +-
tests/qemu-iotests/224 | 4 +-
tests/qemu-iotests/242 | 6 +-
tests/qemu-iotests/245 | 17 ++--
tests/qemu-iotests/255 | 4 +-
tests/qemu-iotests/258 | 11 ++-
tests/qemu-iotests/298 | 17 ++--
tests/qemu-iotests/303 | 4 +-
tests/qemu-iotests/310 | 22 ++---
tests/qemu-iotests/iotests.py | 69 ++++++++-------
tests/qemu-iotests/tests/image-fleecing | 30 ++++---
.../qemu-iotests/tests/migration-permissions | 28 +++---
.../tests/mirror-ready-cancel-error | 2 +-
.../qemu-iotests/tests/nbd-reconnect-on-open | 2 +-
.../qemu-iotests/tests/stream-error-on-reset | 4 +-
ui/cocoa.m | 1 +
28 files changed, 231 insertions(+), 188 deletions(-)