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: Gerd Hoffmann <kraxel@redhat.com>
diff --git a/spice-qemu-char.c b/spice-qemu-char.c index 4eb85ae..b2586c2 100644 --- a/spice-qemu-char.c +++ b/spice-qemu-char.c
@@ -293,4 +293,16 @@ 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
diff --git a/ui/qemu-spice.h b/ui/qemu-spice.h index 5669767..642f012 100644 --- a/ui/qemu-spice.h +++ b/ui/qemu-spice.h
@@ -48,6 +48,7 @@ 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 */
diff --git a/ui/spice-core.c b/ui/spice-core.c index 59ce5f6..ac46deb 100644 --- a/ui/spice-core.c +++ b/ui/spice-core.c
@@ -714,6 +714,10 @@ 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)