diff options
| author | Marc-André Lureau <marcandre.lureau@gmail.com> | 2012-12-05 16:15:36 +0100 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2012-12-17 14:01:41 +0100 |
| commit | afd0b4091fef7a1290cf76c6da8c9a24a3553d58 (patch) | |
| tree | 1767494c613b76b47f9075fe2599a0823da6330e | |
| parent | 7a5448ce6ef140a20b1a090d50aeb4248d0a9ffd (diff) | |
| download | focaccia-qemu-afd0b4091fef7a1290cf76c6da8c9a24a3553d58.tar.gz focaccia-qemu-afd0b4091fef7a1290cf76c6da8c9a24a3553d58.zip | |
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>
| -rw-r--r-- | spice-qemu-char.c | 12 | ||||
| -rw-r--r-- | ui/qemu-spice.h | 1 | ||||
| -rw-r--r-- | ui/spice-core.c | 4 |
3 files changed, 17 insertions, 0 deletions
diff --git a/spice-qemu-char.c b/spice-qemu-char.c index 4eb85ae798..b2586c263d 100644 --- a/spice-qemu-char.c +++ b/spice-qemu-char.c @@ -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 diff --git a/ui/qemu-spice.h b/ui/qemu-spice.h index 5669767de0..642f012690 100644 --- a/ui/qemu-spice.h +++ b/ui/qemu-spice.h @@ -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 */ diff --git a/ui/spice-core.c b/ui/spice-core.c index 59ce5f6370..ac46deb2be 100644 --- a/ui/spice-core.c +++ b/ui/spice-core.c @@ -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) |