Commit afd0b409 authored by Marc-André Lureau's avatar Marc-André Lureau Committed by Gerd Hoffmann
Browse files

spice-qemu-char: register spicevmc ports during qemu_spice_init() 



Do the delayed registration of spicevmc ports after Spice server is
initialized.

Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent 7a5448ce

spice-qemu-char.c

+12 −0
Original line number Diff line number Diff line
@@ -293,4 +293,16 @@ CharDriverState *qemu_chr_open_spice_port(QemuOpts *opts) 


    return chr;

}



void qemu_spice_register_ports(void)

{

    SpiceCharDriver *s;



    QLIST_FOREACH(s, &spice_chars, next) {

        if (s->sin.portname == NULL) {

            continue;

        }

        vmc_register_interface(s);

    }

}

#endif

ui/qemu-spice.h

+1 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ void do_info_spice(Monitor *mon, QObject **ret_data); 
CharDriverState *qemu_chr_open_spice(QemuOpts *opts);

#if SPICE_SERVER_VERSION >= 0x000c02

CharDriverState *qemu_chr_open_spice_port(QemuOpts *opts);

void qemu_spice_register_ports(void);

#endif



#else  /* CONFIG_SPICE */

ui/spice-core.c

+4 −0
Original line number Diff line number Diff line
@@ -714,6 +714,10 @@ void qemu_spice_init(void) 
    g_free(x509_key_file);

    g_free(x509_cert_file);

    g_free(x509_cacert_file);



#if SPICE_SERVER_VERSION >= 0x000c02

    qemu_spice_register_ports();

#endif

}



int qemu_spice_add_interface(SpiceBaseInstance *sin)