diff options
| author | Peter Maydell | 2018-03-08 12:26:13 +0100 |
|---|---|---|
| committer | Peter Maydell | 2018-03-08 12:26:14 +0100 |
| commit | 3ef91576b96de7051dacc2132cddfb486b46e863 (patch) | |
| tree | 8ae5b6109272dfc7ae177cb086b2afaaac7bd12b /ui/vnc-auth-vencrypt.c | |
| parent | Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging (diff) | |
| parent | qio: non-default context for TLS handshake (diff) | |
| download | qemu-3ef91576b96de7051dacc2132cddfb486b46e863.tar.gz qemu-3ef91576b96de7051dacc2132cddfb486b46e863.tar.xz qemu-3ef91576b96de7051dacc2132cddfb486b46e863.zip | |
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 'ui/vnc-auth-vencrypt.c')
| -rw-r--r-- | ui/vnc-auth-vencrypt.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ui/vnc-auth-vencrypt.c b/ui/vnc-auth-vencrypt.c index 7833631275..d99ea362c1 100644 --- a/ui/vnc-auth-vencrypt.c +++ b/ui/vnc-auth-vencrypt.c @@ -128,6 +128,7 @@ static int protocol_client_vencrypt_auth(VncState *vs, uint8_t *data, size_t len qio_channel_tls_handshake(tls, vnc_tls_handshake_done, vs, + NULL, NULL); } return 0; |