david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

spice: use console index as display id

Browse Source 
... instead of maintaining our own numbering.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Gerd Hoffmann 2014-08-29 10:13:28 +02:00
parent 503b3b33fe
commit cd56cc6b07
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ui/spice-core.c
View File

@ -853,7 +853,6 @@ int qemu_spice_add_interface(SpiceBaseInstance *sin)
} }
static GSList *spice_consoles; static GSList *spice_consoles;
static int display_id;
bool qemu_spice_have_display_interface(QemuConsole *con) 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)) { if (g_slist_find(spice_consoles, con)) {
return -1; return -1;
} }
qxlin->id = display_id++; qxlin->id = qemu_console_get_index(con);
spice_consoles = g_slist_append(spice_consoles, con); spice_consoles = g_slist_append(spice_consoles, con);
return qemu_spice_add_interface(&qxlin->base); return qemu_spice_add_interface(&qxlin->base);
} }