[Qemu-devel] [PULL 0/2] Ui 20181029 patches

[Qemu-devel] [PULL 0/2] Ui 20181029 patches

[Gerd Hoffmann]

The following changes since commit 285278ca785f5fa9a570927e1c0958a2ca2b2150:

  Merge remote-tracking branch 'remotes/famz/tags/testing-pull-request' into staging (2018-10-27 19:55:08 +0100)

are available in the git repository at:

  git://git.kraxel.org/qemu tags/ui-20181029-pull-request

for you to fetch changes up to 9c956e646178fee8c14ce7dfae5a9d7cb901876c:

  spice: prepare for upcoming spice-server change (2018-10-29 14:38:17 +0100)

----------------------------------------------------------------
ui: sdl+spice tweaks.

----------------------------------------------------------------

Gerd Hoffmann (1):
  spice: prepare for upcoming spice-server change

Sebastian Krzyszkowiak (1):
  SDL: set a hint to not bypass the window compositor

 ui/sdl2.c          |  3 +++
 ui/spice-display.c | 26 ++++++++++++++++++++++----
 2 files changed, 25 insertions(+), 4 deletions(-)

-- 
2.9.3

[Qemu-devel] [PULL 1/2] SDL: set a hint to not bypass the window compositor

[Gerd Hoffmann]

From: Sebastian Krzyszkowiak <dos@dosowisko.net>

Without that, window effects in KWin get suspended as soon as any
qemu-sdl window becomes visible. While the SDL default makes sense
for games, it's not really suitable for QEMU.

Signed-off-by: Sebastian Krzyszkowiak <dos@dosowisko.net>
Message-id: 20181024143748.4425-1-dos@dosowisko.net
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 ui/sdl2.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ui/sdl2.c b/ui/sdl2.c
index 2696b95c79..a10b6e3a08 100644
--- a/ui/sdl2.c
+++ b/ui/sdl2.c
@@ -786,6 +786,9 @@ static void sdl2_display_init(DisplayState *ds, DisplayOptions *o)
                 SDL_GetError());
         exit(1);
     }
+#ifdef SDL_HINT_VIDEO_X11_NET_WM_BYPASS_COMPOSITOR /* only available since SDL 2.0.8 */
+    SDL_SetHint(SDL_HINT_VIDEO_X11_NET_WM_BYPASS_COMPOSITOR, "0");
+#endif
     SDL_SetHint(SDL_HINT_GRAB_KEYBOARD, "1");
     memset(&info, 0, sizeof(info));
     SDL_VERSION(&info.version);
-- 
2.9.3

[Qemu-devel] [PULL 2/2] spice: prepare for upcoming spice-server change

[Gerd Hoffmann]

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
---
 ui/spice-display.c | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/ui/spice-display.c b/ui/spice-display.c
index 2f8adb6b9f..52f8cb5ae1 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);
-- 
2.9.3

Re: [Qemu-devel] [PULL 0/2] Ui 20181029 patches

[Peter Maydell]

On 29 October 2018 at 14:18, Gerd Hoffmann <kraxel@redhat.com> wrote:
> The following changes since commit 285278ca785f5fa9a570927e1c0958a2ca2b2150:
>
>   Merge remote-tracking branch 'remotes/famz/tags/testing-pull-request' into staging (2018-10-27 19:55:08 +0100)
>
> are available in the git repository at:
>
>   git://git.kraxel.org/qemu tags/ui-20181029-pull-request
>
> for you to fetch changes up to 9c956e646178fee8c14ce7dfae5a9d7cb901876c:
>
>   spice: prepare for upcoming spice-server change (2018-10-29 14:38:17 +0100)
>
> ----------------------------------------------------------------
> ui: sdl+spice tweaks.
>
> ----------------------------------------------------------------
>
> Gerd Hoffmann (1):
>   spice: prepare for upcoming spice-server change
>
> Sebastian Krzyszkowiak (1):
>   SDL: set a hint to not bypass the window compositor
>
>  ui/sdl2.c          |  3 +++
>  ui/spice-display.c | 26 ++++++++++++++++++++++----
>  2 files changed, 25 insertions(+), 4 deletions(-)

Applied, thanks.

-- PMM