qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: Wolfgang Bumiller <w.bumiller@proxmox.com>,
	Gerd Hoffmann <kraxel@redhat.com>
Subject: [Qemu-devel] [PULL 4/4] vnc: fix tls-creds error message
Date: Mon, 18 Jan 2016 16:53:44 +0100	[thread overview]
Message-ID: <1453132424-15520-5-git-send-email-kraxel@redhat.com> (raw)
In-Reply-To: <1453132424-15520-1-git-send-email-kraxel@redhat.com>

From: Wolfgang Bumiller <w.bumiller@proxmox.com>

The parameter is called 'tls-creds', 'credid' is just the
variable name in the code.

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
Reviewed-by: Daniel P. Berrange <berrange@redhat.com>
Message-id: 1452681360-29239-1-git-send-email-w.bumiller@proxmox.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 ui/vnc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/vnc.c b/ui/vnc.c
index c2d3773..85e3462 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -3606,7 +3606,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;
         }
-- 
1.8.3.1

  parent reply	other threads:[~2016-01-18 15:53 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-01-18 15:53 [Qemu-devel] [PULL 0/4] ui patch queue Gerd Hoffmann
2016-01-18 15:53 ` [Qemu-devel] [PULL 1/4] gtk: implement set_echo Gerd Hoffmann
2016-01-18 15:53 ` [Qemu-devel] [PULL 2/4] vnc: clear vs->tlscreds after unparenting it Gerd Hoffmann
2016-01-18 15:53 ` [Qemu-devel] [PULL 3/4] Fix corner-case when using VNC+SASL+SPICE Gerd Hoffmann
2016-01-18 15:53 ` Gerd Hoffmann [this message]
2016-01-18 17:09 ` [Qemu-devel] [PULL 0/4] ui patch queue Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1453132424-15520-5-git-send-email-kraxel@redhat.com \
    --to=kraxel@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=w.bumiller@proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).