diff options
author | Gerd Hoffmann <kraxel@redhat.com> | 2013-10-11 22:39:59 +0200 |
---|---|---|
committer | Gerd Hoffmann <kraxel@redhat.com> | 2013-10-17 12:42:54 +0200 |
commit | 9fa032866daae68357d99abc725c18fe9ed4b61b (patch) | |
tree | 759b86785e2a11fcd65c743b8afaf25ec725635e /ui/spice-display.c | |
parent | 35b2122db446a03be9b88f540e865930efd01d6a (diff) | |
download | hqemu-9fa032866daae68357d99abc725c18fe9ed4b61b.zip hqemu-9fa032866daae68357d99abc725c18fe9ed4b61b.tar.gz |
spice: fix multihead support
This patch fixes spice display initialization to handle
multihead properly.
spice-core now keeps track of which QemuConsole has a spice
display channel attached to it and which has not. It also
manages display channel ids.
spice-display looks at all QemuConsoles and will pick up any
graphic console not yet bound to a spice channel (which in practice
are all non-qxl graphic devices).
Result is that
(a) you'll get a spice client window for each graphical device
now (first only without this patch), and
(b) mixing qxl and non-qxl vga cards works properly.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'ui/spice-display.c')
-rw-r--r-- | ui/spice-display.c | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/ui/spice-display.c b/ui/spice-display.c index c15c555..f23a318 100644 --- a/ui/spice-display.c +++ b/ui/spice-display.c @@ -612,21 +612,38 @@ static const DisplayChangeListenerOps display_listener_ops = { .dpy_refresh = display_refresh, }; -void qemu_spice_display_init(DisplayState *ds) +static void qemu_spice_display_init_one(QemuConsole *con) { SimpleSpiceDisplay *ssd = g_new0(SimpleSpiceDisplay, 1); qemu_spice_display_init_common(ssd); ssd->qxl.base.sif = &dpy_interface.base; - qemu_spice_add_interface(&ssd->qxl.base); + qemu_spice_add_display_interface(&ssd->qxl, con); assert(ssd->worker); qemu_spice_create_host_memslot(ssd); ssd->dcl.ops = &display_listener_ops; - ssd->dcl.con = qemu_console_lookup_by_index(0); + ssd->dcl.con = con; register_displaychangelistener(&ssd->dcl); qemu_spice_create_host_primary(ssd); } + +void qemu_spice_display_init(void) +{ + QemuConsole *con; + int i; + + for (i = 0;; i++) { + con = qemu_console_lookup_by_index(i); + if (!con || !qemu_console_is_graphic(con)) { + break; + } + if (qemu_spice_have_display_interface(con)) { + continue; + } + qemu_spice_display_init_one(con); + } +} |