mirror of
https://github.com/xemu-project/xemu.git
synced 2025-02-08 13:17:52 +00:00
spice: remove the single monitor config logic
Introduced in commit 9c956e646178fee8c14ce7dfae5a9d7cb901876c ("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:
parent
5eaf1e48ff
commit
6244f988bf
@ -674,28 +674,10 @@ static int interface_client_monitors_config(QXLInstance *sin,
|
||||
|
||||
info = *dpy_get_ui_info(ssd->dcl.con);
|
||||
|
||||
if (mc->num_of_monitors == 1) {
|
||||
/*
|
||||
* New spice-server version which filters the list of monitors
|
||||
* to only include those that belong to our display channel.
|
||||
*
|
||||
* 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;
|
||||
}
|
||||
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);
|
||||
|
Loading…
x
Reference in New Issue
Block a user