From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:38158) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TaNSM-0001AC-FN for qemu-devel@nongnu.org; Mon, 19 Nov 2012 04:15:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TaNSJ-0004EL-8N for qemu-devel@nongnu.org; Mon, 19 Nov 2012 04:15:54 -0500 Received: from e23smtp08.au.ibm.com ([202.81.31.141]:59097) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TaNSH-0004Cs-2s for qemu-devel@nongnu.org; Mon, 19 Nov 2012 04:15:51 -0500 Received: from /spool/local by e23smtp08.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 19 Nov 2012 19:14:27 +1000 Received: from d23av01.au.ibm.com (d23av01.au.ibm.com [9.190.234.96]) by d23relay05.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id qAJ94mLY42008714 for ; Mon, 19 Nov 2012 20:04:49 +1100 Received: from d23av01.au.ibm.com (loopback [127.0.0.1]) by d23av01.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id qAJ9FQ80021953 for ; Mon, 19 Nov 2012 20:15:26 +1100 From: Lei Li Date: Mon, 19 Nov 2012 17:15:08 +0800 Message-Id: <1353316508-16816-1-git-send-email-lilei@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH] 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: kraxel@redhat.com, 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 --- 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.7.6