From patchwork Wed Nov 21 13:48:53 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 200763 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id A52782C0093 for ; Thu, 22 Nov 2012 00:49:52 +1100 (EST) Received: from localhost ([::1]:44605 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TbAgY-0005Uy-PR for incoming@patchwork.ozlabs.org; Wed, 21 Nov 2012 08:49:50 -0500 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 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id qALDmwBB016967 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 21 Nov 2012 08:48:58 -0500 Received: from rincewind.home.kraxel.org (ovpn-116-26.ams2.redhat.com [10.36.116.26]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id qALDmvCS022885; Wed, 21 Nov 2012 08:48:57 -0500 Received: by rincewind.home.kraxel.org (Postfix, from userid 500) id 8E25B40078; Wed, 21 Nov 2012 14:48:56 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org 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> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Lei Li , Gerd Hoffmann Subject: [Qemu-devel] [PATCH 1/2] Fix the inconsistency in x509-dh-key-file parameter X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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"); }