diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-03-08 11:26:13 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-03-08 11:26:14 +0000 |
| commit | 3ef91576b96de7051dacc2132cddfb486b46e863 (patch) | |
| tree | 8ae5b6109272dfc7ae177cb086b2afaaac7bd12b /nbd/client.c | |
| parent | 854a4436dd313eaeb51c275d00526d60437915d2 (diff) | |
| parent | 1939ccdaa61ce6a1f57d83277b3d41d3a9ad3c58 (diff) | |
Merge remote-tracking branch 'remotes/berrange/tags/qio-next-pull-request' into staging
# gpg: Signature made Wed 07 Mar 2018 11:24:41 GMT
# gpg: using RSA key BE86EBB415104FDF
# gpg: Good signature from "Daniel P. Berrange <dan@berrange.com>"
# gpg: aka "Daniel P. Berrange <berrange@redhat.com>"
# Primary key fingerprint: DAF3 A6FD B26B 6291 2D0E 8E3F BE86 EBB4 1510 4FDF
* remotes/berrange/tags/qio-next-pull-request:
qio: non-default context for TLS handshake
qio: non-default context for async conn
qio: non-default context for threaded qtask
qio: store gsources for net listeners
qio: introduce qio_channel_add_watch_{full|source}
qio: rename qio_task_thread_result
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'nbd/client.c')
| -rw-r--r-- | nbd/client.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/nbd/client.c b/nbd/client.c index 9c3fe4aaa6..dcad23a053 100644 --- a/nbd/client.c +++ b/nbd/client.c @@ -579,6 +579,7 @@ static QIOChannel *nbd_receive_starttls(QIOChannel *ioc, qio_channel_tls_handshake(tioc, nbd_tls_handshake, &data, + NULL, NULL); if (!data.complete) { |