[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 7/8] spice-qemu-char: register spicevmc ports during
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 7/8] spice-qemu-char: register spicevmc ports during qemu_spice_init() |
Date: |
Mon, 17 Dec 2012 14:04:38 +0100 |
From: Marc-André Lureau <address@hidden>
Do the delayed registration of spicevmc ports after Spice server is
initialized.
Signed-off-by: Gerd Hoffmann <address@hidden>
---
spice-qemu-char.c | 12 ++++++++++++
ui/qemu-spice.h | 1 +
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 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 59ce5f6..ac46deb 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.1
- [Qemu-devel] [PULL 0/8] spice patch queue, Gerd Hoffmann, 2012/12/17
- [Qemu-devel] [PATCH 4/8] spice-qemu-char: factor out CharDriverState creation, Gerd Hoffmann, 2012/12/17
- [Qemu-devel] [PATCH 3/8] spice-qemu-char: write to chardev whatever amount it can read, Gerd Hoffmann, 2012/12/17
- [Qemu-devel] [PATCH 6/8] spice-qemu-char: keep a list of spice chardev, Gerd Hoffmann, 2012/12/17
- [Qemu-devel] [PATCH 7/8] spice-qemu-char: register spicevmc ports during qemu_spice_init(),
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 8/8] docs: add spice-port-fqdn.txt, Gerd Hoffmann, 2012/12/17
- [Qemu-devel] [PATCH 2/8] qxl+vnc: register a vm state change handler for dummy spice_server, Gerd Hoffmann, 2012/12/17
- [Qemu-devel] [PATCH 5/8] spice-qemu-char: add spiceport chardev, Gerd Hoffmann, 2012/12/17
- [Qemu-devel] [PATCH 1/8] qxl: save qemu_create_displaysurface_from result, Gerd Hoffmann, 2012/12/17
- Re: [Qemu-devel] [PULL 0/8] spice patch queue, Anthony Liguori, 2012/12/18