From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:54375) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TbAfp-0003pO-DZ for qemu-devel@nongnu.org; Wed, 21 Nov 2012 08:49:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TbAfl-0000MF-5H for qemu-devel@nongnu.org; Wed, 21 Nov 2012 08:49:05 -0500 Received: from mx1.redhat.com ([209.132.183.28]:53747) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TbAfk-0000M4-Tb for qemu-devel@nongnu.org; Wed, 21 Nov 2012 08:49:01 -0500 From: Gerd Hoffmann Date: Wed, 21 Nov 2012 14:48:53 +0100 Message-Id: <1353505736-26577-2-git-send-email-kraxel@redhat.com> In-Reply-To: <1353505736-26577-1-git-send-email-kraxel@redhat.com> References: <1353505736-26577-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 1/2] Fix the inconsistency in x509-dh-key-file parameter List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Lei Li , Gerd Hoffmann From: Lei Li 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 Signed-off-by: Lei Li Signed-off-by: Gerd Hoffmann --- 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