[Xen-changelog] [qemu-upstream-unstable] Fix the inconsistency in x509-dh-key-file parameter

[patchbot@xxxxxxx]

commit 9995c0b706a2270a49c5bebbcda0b62263a31aa3
Author: Lei Li <lilei@xxxxxxxxxxxxxxxxxx>
Date:   Mon Nov 19 17:15:08 2012 +0800

    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@xxxxxxxxx>
    Signed-off-by: Lei Li <lilei@xxxxxxxxxxxxxxxxxx>
    Signed-off-by: Gerd Hoffmann <kraxel@xxxxxxxxxx>
---
 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");
     }
 
--
generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog