diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-10-28 12:06:41 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-10-28 12:06:41 +0100 |
| commit | 9879b75873cacc88cdee490f6ab481e8ce766c69 (patch) | |
| tree | c5a575eed03a36c2824d8c061132e2adb6690497 /block/replication.c | |
| parent | 86398328467d78c84d8e3341f098f4697148a665 (diff) | |
| parent | b74fc7f78e0dd54fbae67d46552cebf81b59ae9f (diff) | |
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
Block layer patches
# gpg: Signature made Thu 27 Oct 2016 18:15:47 BST
# gpg: using RSA key 0x7F09B272C88F2FD6
# 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: (23 commits)
iotests: Add test for NBD's blockdev-add interface
iotests: Add assert_json_filename_equal() method
socket_scm_helper: Accept fd directly
iotests.py: Allow concurrent qemu instances
iotests.py: Add qemu_nbd function
qapi: Allow blockdev-add for NBD
block/nbd: Use SocketAddress options
block/nbd: Accept SocketAddress
block/nbd: Add nbd_has_filename_options_conflict()
block/nbd: Use qdict_put()
block/nbd: Default port in nbd_refresh_filename()
block/nbd: Reject port parameter without host
block/nbd: Drop trailing "." in error messages
qemu-iotests: Fix typo for NFS with IMGOPTSSYNTAX
block: Remove bdrv_aio_ioctl()
raw: Implement .bdrv_co_ioctl instead of .bdrv_aio_ioctl
block: Introduce .bdrv_co_ioctl() driver callback
block: Remove bdrv_ioctl()
raw-posix: Don't use bdrv_ioctl()
block: Use blk_co_ioctl() for all BB level ioctls
...
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'block/replication.c')
0 files changed, 0 insertions, 0 deletions