Merge remote-tracking branch 'remotes/kraxel/tags/pull-socket-20160120-1' into staging

[mirror_qemu.git] / ui / vnc.c

diff --git a/ui/vnc.c b/ui/vnc.c
index 4c303cee96a24331908c4adfd07efee3a96c1aea..339f8c35b2e1a4330c94abfe3739ef30c33d48fc 100644 (file)
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -3134,6 +3134,7 @@ static void vnc_display_close(VncDisplay *vs)
     vs->subauth = VNC_AUTH_INVALID;
     if (vs->tlscreds) {
         object_unparent(OBJECT(vs->tlscreds));
+        vs->tlscreds = NULL;
     }
     g_free(vs->tlsaclname);
     vs->tlsaclname = NULL;
@@ -3611,7 +3612,7 @@ void vnc_display_open(const char *id, Error **errp)
             qemu_opt_get(opts, "x509") ||
             qemu_opt_get(opts, "x509verify")) {
             error_setg(errp,
-                       "'credid' parameter is mutually exclusive with "
+                       "'tls-creds' parameter is mutually exclusive with "
                        "'tls', 'x509' and 'x509verify' parameters");
             goto fail;
         }