From: Lei Li <lilei@linux.vnet.ibm.com>
Date: Mon, 19 Nov 2012 09:15:08 +0000 (+0800)
Subject: Fix the inconsistency in x509-dh-key-file parameter
X-Git-Tag: v1.3.0-rc1~33^2~1
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=9995c0b706a2270a49c5bebbcda0b62263a31aa3;p=qemu.git

Fix the inconsistency in x509-dh-key-file parameter

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>
---

diff --git a/ui/spice-core.c b/ui/spice-core.c
index 51473650c..261c6f2c1 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");
     }