aboutsummaryrefslogtreecommitdiff
path: root/ui
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2018-10-12 13:45:51 +0200
committerGerd Hoffmann <kraxel@redhat.com>2018-10-29 14:38:17 +0100
commit9c956e646178fee8c14ce7dfae5a9d7cb901876c (patch)
tree9ede3776cae814f7b7fa0494a42579e3ba34a61c /ui
parent8c2b816fc5bf9d30138ac068d1665e473c7cb4bf (diff)
downloadqemu-9c956e646178fee8c14ce7dfae5a9d7cb901876c.zip
qemu-9c956e646178fee8c14ce7dfae5a9d7cb901876c.tar.gz
qemu-9c956e646178fee8c14ce7dfae5a9d7cb901876c.tar.bz2
spice: prepare for upcoming spice-server change
Future spice-server versions will call the client_monitors_config callback with the monitors list filtered to only include the monitors of the given display channel (aka QXLInstance). Luckily this is easily detectable at runtime, so we can prepare for that in advance and also make qemu compatible with both old and new spice-server versions. While being at it also use the console index instead of head number as array index. The later doesn't work correctly in case multiple display devices are present. Cc: spice-devel@lists.freedesktop.org Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Reviewed-by: Lukáš Hrázký <lhrazky@redhat.com> Message-id: 20181012114551.28809-1-kraxel@redhat.com
Diffstat (limited to 'ui')
-rw-r--r--ui/spice-display.c26
1 files changed, 22 insertions, 4 deletions
diff --git a/ui/spice-display.c b/ui/spice-display.c
index 2f8adb6..52f8cb5 100644
--- a/ui/spice-display.c
+++ b/ui/spice-display.c
@@ -674,10 +674,28 @@ static int interface_client_monitors_config(QXLInstance *sin,
memset(&info, 0, sizeof(info));
- head = qemu_console_get_head(ssd->dcl.con);
- if (mc->num_of_monitors > head) {
- info.width = mc->monitors[head].width;
- info.height = mc->monitors[head].height;
+ 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;
+ }
}
trace_qemu_spice_ui_info(ssd->qxl.id, info.width, info.height);