The following changes since commit 2f93a3ecdd3bb060bd04f698ccafe66efd98563a:
Merge remote-tracking branch 'remotes/davidhildenbrand/tags/s390x-tcg-2019-09-23' into staging (2019-09-23 15:44:52 +0100) are available in the Git repository at: https://repo.or.cz/qemu/ericb.git tags/pull-nbd-2019-09-24-v2 for you to fetch changes up to da5e1169183ca6eb6fb470dc32ed1bfc24d1d406: util/qemu-sockets: fix keep_alive handling in inet_connect_saddr (2019-09-25 08:15:44 -0500) For v2 - add one more patch ---------------------------------------------------------------- nbd patches for 2019-09-24 - Improved error message for plaintext client of encrypted server - Fix various assertions when -object iothread is in use - Silence a Coverity error for use-after-free on error path ---------------------------------------------------------------- Eric Blake (3): nbd/client: Add hint when TLS is missing nbd: Grab aio context lock in more places tests: Use iothreads during iotest 223 Sergio Lopez (1): nbd/server: attach client channel to the export's AioContext Vladimir Sementsov-Ogievskiy (1): util/qemu-sockets: fix keep_alive handling in inet_connect_saddr include/block/nbd.h | 1 + blockdev-nbd.c | 14 ++++++++++++-- nbd/client.c | 1 + nbd/server.c | 27 +++++++++++++++++++++++---- util/qemu-sockets.c | 5 +++-- tests/qemu-iotests/223 | 6 ++++-- tests/qemu-iotests/223.out | 1 + tests/qemu-iotests/233.out | 2 ++ 8 files changed, 47 insertions(+), 10 deletions(-) -- 2.21.0
