aboutsummaryrefslogtreecommitdiff
path: root/ui
diff options
context:
space:
mode:
authorMarc-André Lureau <marcandre.lureau@redhat.com>2020-09-27 18:57:49 +0400
committerGerd Hoffmann <kraxel@redhat.com>2020-09-29 10:08:25 +0200
commit6244f988bfd9ded0daafcabf728455e94e099bff (patch)
treea2cf2ac4b12dfe08df982b105c2ac1ffc1fee38b /ui
parent5eaf1e48ff397185ec2f702f9968787d4d29e3c4 (diff)
downloadqemu-6244f988bfd9ded0daafcabf728455e94e099bff.zip
qemu-6244f988bfd9ded0daafcabf728455e94e099bff.tar.gz
qemu-6244f988bfd9ded0daafcabf728455e94e099bff.tar.bz2
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>
Diffstat (limited to 'ui')
-rw-r--r--ui/spice-display.c26
1 files changed, 4 insertions, 22 deletions
diff --git a/ui/spice-display.c b/ui/spice-display.c
index 625d923..b304c13 100644
--- a/ui/spice-display.c
+++ b/ui/spice-display.c
@@ -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);