[Spice-commits] Changes to 'rebase/spice-next'

[Gerd Hoffmann]

New branch 'rebase/spice-next' available with the following commits:
commit 8357e5a0dbd23c135cec118ffddbc3620fe493ef
Author: Gerd Hoffmann <kraxel at redhat.com>
Date:   Wed Nov 21 14:41:48 2012 +0100

    spice: add new spice-server callbacks to ui/spice-display.c
    
    Otherwise qemu crashes with non-qxl graphics cards.
    
    Signed-off-by: Gerd Hoffmann <kraxel at redhat.com>

commit c56773436f78efd255a2271861024a0ee487a532
Author: Lei Li <lilei at linux.vnet.ibm.com>
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 at gmail.com>
    Signed-off-by: Lei Li <lilei at linux.vnet.ibm.com>
    Signed-off-by: Gerd Hoffmann <kraxel at redhat.com>