mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

spice: remove the single monitor config logic

Browse Source 
Introduced in commit 9c956e6461 ("spice:
prepare for upcoming spice-server change"), the new logic never
materialized in the spice server source tree. Let's remove it for now,
until it actually changes in Spice.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-id: 20200927145751.365446-5-marcandre.lureau@redhat.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Marc-André Lureau 2020-09-27 18:57:49 +04:00 committed by Gerd Hoffmann
parent 5eaf1e48ff
commit 6244f988bf
1 changed files with 4 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
ui/spice-display.c
View File

@ -674,28 +674,10 @@ static int interface_client_monitors_config(QXLInstance *sin,
info = *dpy_get_ui_info(ssd->dcl.con); info = *dpy_get_ui_info(ssd->dcl.con);
if (mc->num_of_monitors == 1) { head = qemu_console_get_index(ssd->dcl.con);
/* if (mc->num_of_monitors > head) {
* New spice-server version which filters the list of monitors info.width = mc->monitors[head].width;
* to only include those that belong to our display channel. info.height = mc->monitors[head].height;
*
* single-head configuration (where filtering doesn't matter)
* takes this code path too.
*/
info.width = mc->monitors[0].width;
info.height = mc->monitors[0].height;
} else {
/*
* Old spice-server which gives us all monitors, so we have to
* figure ourself which entry we need. Array index is the
* channel_id, which is the qemu console index, see
* qemu_spice_add_display_interface().
*/
head = qemu_console_get_index(ssd->dcl.con);
if (mc->num_of_monitors > head) {
info.width = mc->monitors[head].width;
info.height = mc->monitors[head].height;
}
} }
trace_qemu_spice_ui_info(ssd->qxl.id, info.width, info.height); trace_qemu_spice_ui_info(ssd->qxl.id, info.width, info.height);