summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerd Hoffmann2014-08-29 10:13:28 +0200
committerGerd Hoffmann2014-09-01 10:19:03 +0200
commitcd56cc6b079f44fbcca3d8a773ae87f7479c6585 (patch)
tree0d4a522ce98c750272307463d733a8e4a82cf97c
parentqxl-render: add more sanity checks (diff)
downloadqemu-cd56cc6b079f44fbcca3d8a773ae87f7479c6585.tar.gz
qemu-cd56cc6b079f44fbcca3d8a773ae87f7479c6585.tar.xz
qemu-cd56cc6b079f44fbcca3d8a773ae87f7479c6585.zip
spice: use console index as display id
... instead of maintaining our own numbering. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
-rw-r--r--ui/spice-core.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/ui/spice-core.c b/ui/spice-core.c
index 1a2fb4b237..17a2ed3782 100644
--- a/ui/spice-core.c
+++ b/ui/spice-core.c
@@ -853,7 +853,6 @@ int qemu_spice_add_interface(SpiceBaseInstance *sin)
}
static GSList *spice_consoles;
-static int display_id;
bool qemu_spice_have_display_interface(QemuConsole *con)
{
@@ -868,7 +867,7 @@ int qemu_spice_add_display_interface(QXLInstance *qxlin, QemuConsole *con)
if (g_slist_find(spice_consoles, con)) {
return -1;
}
- qxlin->id = display_id++;
+ qxlin->id = qemu_console_get_index(con);
spice_consoles = g_slist_append(spice_consoles, con);
return qemu_spice_add_interface(&qxlin->base);
}