The following changes since commit 5929d7e8a0e1f43333bc3528b50397ae8dd0fd6b:
Merge remote-tracking branch 'remotes/rth/tags/pull-atomic-20161026' into staging (2016-10-27 14:06:34 +0100) are available in the git repository at: git://repo.or.cz/qemu/kevin.git tags/for-upstream for you to fetch changes up to b74fc7f78e0dd54fbae67d46552cebf81b59ae9f: iotests: Add test for NBD's blockdev-add interface (2016-10-27 19:05:23 +0200) ---------------------------------------------------------------- Block layer patches ---------------------------------------------------------------- Kevin Wolf (10): block: Use blk_co_flush() for all BB level flushes block: Use blk_co_pdiscard() for all BB level discard block: Remove bdrv_aio_pdiscard() block: Use blk_co_ioctl() for all BB level ioctls raw-posix: Don't use bdrv_ioctl() block: Remove bdrv_ioctl() block: Introduce .bdrv_co_ioctl() driver callback raw: Implement .bdrv_co_ioctl instead of .bdrv_aio_ioctl block: Remove bdrv_aio_ioctl() qemu-iotests: Fix typo for NFS with IMGOPTSSYNTAX Max Reitz (13): block/nbd: Drop trailing "." in error messages block/nbd: Reject port parameter without host block/nbd: Default port in nbd_refresh_filename() block/nbd: Use qdict_put() block/nbd: Add nbd_has_filename_options_conflict() block/nbd: Accept SocketAddress block/nbd: Use SocketAddress options qapi: Allow blockdev-add for NBD iotests.py: Add qemu_nbd function iotests.py: Allow concurrent qemu instances socket_scm_helper: Accept fd directly iotests: Add assert_json_filename_equal() method iotests: Add test for NBD's blockdev-add interface block/block-backend.c | 94 +++++++++---- block/io.c | 111 ++-------------- block/nbd.c | 234 +++++++++++++++++++++------------ block/raw-posix.c | 16 ++- block/raw_bsd.c | 9 +- block/trace-events | 1 - include/block/block.h | 8 +- include/block/block_int.h | 2 + include/sysemu/block-backend.h | 1 + qapi/block-core.json | 27 +++- tests/qemu-iotests/051.out | 4 +- tests/qemu-iotests/051.pc.out | 4 +- tests/qemu-iotests/147 | 195 +++++++++++++++++++++++++++ tests/qemu-iotests/147.out | 5 + tests/qemu-iotests/common.rc | 2 +- tests/qemu-iotests/group | 1 + tests/qemu-iotests/iotests.py | 34 ++++- tests/qemu-iotests/socket_scm_helper.c | 29 ++-- 18 files changed, 527 insertions(+), 250 deletions(-) create mode 100755 tests/qemu-iotests/147 create mode 100644 tests/qemu-iotests/147.out