qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: Lei Li <lilei@linux.vnet.ibm.com>, Gerd Hoffmann <kraxel@redhat.com>
Subject: [Qemu-devel] [PATCH 1/2] Fix the inconsistency in x509-dh-key-file parameter
Date: Wed, 21 Nov 2012 14:48:53 +0100	[thread overview]
Message-ID: <1353505736-26577-2-git-send-email-kraxel@redhat.com> (raw)
In-Reply-To: <1353505736-26577-1-git-send-email-kraxel@redhat.com>

From: Lei Li <lilei@linux.vnet.ibm.com>

Commit c448e8552b0f6135dabddf944a7110f929c08320 (spice: tls
support) added options to the -spice command line. But there
is an inconsistency between the declaration of the option
'x509-dh-key-file' to -spice command line and its parameter
parsing 'x509-dh-file' in function qemu_spice_init.

https://bugs.launchpad.net/qemu/+bug/1035042

Reported-by: Alon Bar-Lev <alon.barlev@gmail.com>
Signed-off-by: Lei Li <lilei@linux.vnet.ibm.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 ui/spice-core.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ui/spice-core.c b/ui/spice-core.c
index 5147365..261c6f2 100644
--- a/ui/spice-core.c
+++ b/ui/spice-core.c
@@ -610,7 +610,7 @@ void qemu_spice_init(void)
         }
 
         x509_key_password = qemu_opt_get(opts, "x509-key-password");
-        x509_dh_file = qemu_opt_get(opts, "x509-dh-file");
+        x509_dh_file = qemu_opt_get(opts, "x509-dh-key-file");
         tls_ciphers = qemu_opt_get(opts, "tls-ciphers");
     }
 
-- 
1.7.1

  reply	other threads:[~2012-11-21 13:49 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-11-21 13:48 [Qemu-devel] [PULL for-1.3 0/2] spice patch queue Gerd Hoffmann
2012-11-21 13:48 ` Gerd Hoffmann [this message]
2012-11-21 13:48 ` [Qemu-devel] [PATCH 1/2] vga: fix bochs alignment issue Gerd Hoffmann
2012-11-21 13:48 ` [Qemu-devel] [PATCH 2/2] spice: add new spice-server callbacks to ui/spice-display.c Gerd Hoffmann
2012-11-21 13:48 ` [Qemu-devel] [PATCH 2/2] vga: fix mmio vga register mapping Gerd Hoffmann
2012-11-21 13:53 ` [Qemu-devel] [PULL for-1.3 0/2] spice patch queue Gerd Hoffmann
2012-11-26 15:34 ` Anthony Liguori

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=1353505736-26577-2-git-send-email-kraxel@redhat.com \
    --to=kraxel@redhat.com \
    --cc=lilei@linux.vnet.ibm.com \
    --cc=qemu-devel@nongnu.org \
    /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).