From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:33364) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TgGhw-0001Zd-DD for qemu-devel@nongnu.org; Wed, 05 Dec 2012 10:16:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TgGhe-0007nN-TN for qemu-devel@nongnu.org; Wed, 05 Dec 2012 10:16:14 -0500 Received: from mail-ea0-f173.google.com ([209.85.215.173]:52749) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TgGhe-0007kY-FQ for qemu-devel@nongnu.org; Wed, 05 Dec 2012 10:16:02 -0500 Received: by mail-ea0-f173.google.com with SMTP id i13so2196644eaa.4 for ; Wed, 05 Dec 2012 07:16:01 -0800 (PST) From: "=?UTF-8?q?Marc-Andr=C3=A9=20Lureau?=" Date: Wed, 5 Dec 2012 16:15:36 +0100 Message-Id: <1354720537-12097-5-git-send-email-marcandre.lureau@redhat.com> In-Reply-To: <1354720537-12097-1-git-send-email-marcandre.lureau@redhat.com> References: <1354720537-12097-1-git-send-email-marcandre.lureau@redhat.com> Subject: [Qemu-devel] [PATCH 5/6] spice-qemu-char: register spicevmc ports during qemu_spice_init() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , alevy@redhat.com, kraxel@redhat.com Do the delayed registration of spicevmc ports after Spice server is initialized. --- spice-qemu-char.c | 12 ++++++++++++ ui/qemu-spice.h | 1 + ui/spice-core.c | 4 ++++ 3 files changed, 17 insertions(+) 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 @@ 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 5669767..642f012 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 261c6f2..ddbcd08 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) -- 1.7.11.7