[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 5/9] spice: remove the single monitor config logic
From: |
Gerd Hoffmann |
Subject: |
[PULL 5/9] spice: remove the single monitor config logic |
Date: |
Tue, 29 Sep 2020 11:57:13 +0200 |
From: Marc-André Lureau <marcandre.lureau@redhat.com>
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>
---
ui/spice-display.c | 26 ++++----------------------
1 file changed, 4 insertions(+), 22 deletions(-)
diff --git a/ui/spice-display.c b/ui/spice-display.c
index 625d9232b95a..b304c13149a8 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);
--
2.27.0
- [PULL 0/9] Vga 20200929 patches, Gerd Hoffmann, 2020/09/29
- [PULL 1/9] virtio-gpu-3d: fix abnormal display after a warm reboot, Gerd Hoffmann, 2020/09/29
- [PULL 4/9] ui: add getter for UIInfo, Gerd Hoffmann, 2020/09/29
- [PULL 9/9] ppc/pseries: enable big-endian-framebuffer quirk for bochs-display and virtio-vga, Gerd Hoffmann, 2020/09/29
- [PULL 8/9] virtio-vga: implement big-endian-framebuffer property, Gerd Hoffmann, 2020/09/29
- [PULL 7/9] virtio-gpu: set physical dimensions for EDID, Gerd Hoffmann, 2020/09/29
- [PULL 2/9] edid: fix physical display size computation, Gerd Hoffmann, 2020/09/29
- [PULL 5/9] spice: remove the single monitor config logic,
Gerd Hoffmann <=
- [PULL 6/9] spice: get monitors physical dimension, Gerd Hoffmann, 2020/09/29
- [PULL 3/9] edid: use physical dimensions if available, Gerd Hoffmann, 2020/09/29
- Re: [PULL 0/9] Vga 20200929 patches, Peter Maydell, 2020/09/29