qemu-commits
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-commits] [qemu/qemu] 4fd811: ui: gtk: fix crash when terminal inne

From: GitHub
Subject: [Qemu-commits] [qemu/qemu] 4fd811: ui: gtk: fix crash when terminal inner-border is N...
Date: Fri, 13 May 2016 08:00:05 -0700 
  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 4fd811a6bd0b8f24f4761fc281454494c336d310
      
https://github.com/qemu/qemu/commit/4fd811a6bd0b8f24f4761fc281454494c336d310
  Author: Cole Robinson <address@hidden>
  Date:   2016-05-11 (Wed, 11 May 2016)

  Changed paths:
    M ui/gtk.c

  Log Message:
  -----------
  ui: gtk: fix crash when terminal inner-border is NULL

VTE terminal inner-border can be NULL. The vte-0.36 (API 2.90)
code checks for the condition too so I assume it's not just a bug

Fixes a crash on Fedora 24 with gtk 3.20

Signed-off-by: Cole Robinson <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 56f289f383a871e871f944c7226920b35794efe6
      
https://github.com/qemu/qemu/commit/56f289f383a871e871f944c7226920b35794efe6
  Author: Cole Robinson <address@hidden>
  Date:   2016-05-11 (Wed, 11 May 2016)

  Changed paths:
    M ui/sdl2.c

  Log Message:
  -----------
  ui: sdl2: Release grab before opening console window

sdl 2.0.4 currently has a bug which causes our UI shortcuts to fire
rapidly in succession:

  https://bugzilla.libsdl.org/show_bug.cgi?id=3287

It's a toss up whether ctrl+alt+f or ctrl+alt+2 will fire an
odd or even number of times, thus determining whether the action
succeeds or fails.

Opening monitor/serial windows is doubly broken, since it will often
lock the UI trying to grab the pointer:

  0x00007fffef3720a5 in SDL_Delay_REAL () at /lib64/libSDL2-2.0.so.0
  0x00007fffef3688ba in X11_SetWindowGrab () at /lib64/libSDL2-2.0.so.0
  0x00007fffef2f2da7 in SDL_SendWindowEvent () at /lib64/libSDL2-2.0.so.0
  0x00007fffef2f080b in SDL_SetKeyboardFocus () at /lib64/libSDL2-2.0.so.0
  0x00007fffef35d784 in X11_DispatchFocusIn.isra.8 () at /lib64/libSDL2-2.0.so.0
  0x00007fffef35dbce in X11_DispatchEvent () at /lib64/libSDL2-2.0.so.0
  0x00007fffef35ee4a in X11_PumpEvents () at /lib64/libSDL2-2.0.so.0
  0x00007fffef2eea6a in SDL_PumpEvents_REAL () at /lib64/libSDL2-2.0.so.0
  0x00007fffef2eeab5 in SDL_WaitEventTimeout_REAL () at /lib64/libSDL2-2.0.so.0
  0x000055555597eed0 in sdl2_poll_events (scon=0x55555876f928) at ui/sdl2.c:593

We can work around that hang by ungrabbing the pointer before launching
a new window. This roughly matches what our sdl1 code does

Signed-off-by: Cole Robinson <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: ee8466d0ea1db1d19e1d56817df0668eeb6924eb
      
https://github.com/qemu/qemu/commit/ee8466d0ea1db1d19e1d56817df0668eeb6924eb
  Author: Cole Robinson <address@hidden>
  Date:   2016-05-11 (Wed, 11 May 2016)

  Changed paths:
    M configure

  Log Message:
  -----------
  configure: build SDL if only SDL2 available

Right now if SDL2 is installed but not SDL1, default configure will
entirely disable SDL. Check upfront for SDL2 using pkg-config, but
still prefer SDL1 if both versions are installed.

Signed-off-by: Cole Robinson <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: e07047cfd777ec92073ed81fcb383e1857aefef1
      
https://github.com/qemu/qemu/commit/e07047cfd777ec92073ed81fcb383e1857aefef1
  Author: Cole Robinson <address@hidden>
  Date:   2016-05-11 (Wed, 11 May 2016)

  Changed paths:
    M configure

  Log Message:
  -----------
  configure: error on unknown --with-sdlabi value

I accidentally tried --with-sdlabi="1.0", and it failed much later in
a weird way. Instead, throw an error if the value isn't in our
whitelist.

Signed-off-by: Cole Robinson <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 02d34f62fdecb54637e5a66d254bd68fcbfa397f
      
https://github.com/qemu/qemu/commit/02d34f62fdecb54637e5a66d254bd68fcbfa397f
  Author: Cole Robinson <address@hidden>
  Date:   2016-05-11 (Wed, 11 May 2016)

  Changed paths:
    M configure

  Log Message:
  -----------
  configure: add echo_version helper

Simplifies printing library versions, dependent on if the library
was even found

Signed-off-by: Cole Robinson <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: f2a4e5482864455c190488dfcc2beb66b1ce5696
      
https://github.com/qemu/qemu/commit/f2a4e5482864455c190488dfcc2beb66b1ce5696
  Author: Cole Robinson <address@hidden>
  Date:   2016-05-11 (Wed, 11 May 2016)

  Changed paths:
    M configure

  Log Message:
  -----------
  configure: report GTK version

Signed-off-by: Cole Robinson <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: d6a6dba35907fbbd819a57448b98ec5392fb957c
      
https://github.com/qemu/qemu/commit/d6a6dba35907fbbd819a57448b98ec5392fb957c
  Author: Cole Robinson <address@hidden>
  Date:   2016-05-11 (Wed, 11 May 2016)

  Changed paths:
    M configure

  Log Message:
  -----------
  configure: report SDL version

Signed-off-by: Cole Robinson <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: c6feff9e09aa999b77a37f532adbb89682ecb1b6
      
https://github.com/qemu/qemu/commit/c6feff9e09aa999b77a37f532adbb89682ecb1b6
  Author: Cole Robinson <address@hidden>
  Date:   2016-05-11 (Wed, 11 May 2016)

  Changed paths:
    M configure

  Log Message:
  -----------
  configure: support vte-2.91

vte >= 0.37 expores API version 2.91, which is where all the active
development is. qemu builds and runs fine with that version, so use it
if it's available.

Signed-off-by: Cole Robinson <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 84e2dc4bf39f6ba90390b5f32aadcfcf18168e1d
      
https://github.com/qemu/qemu/commit/84e2dc4bf39f6ba90390b5f32aadcfcf18168e1d
  Author: Cole Robinson <address@hidden>
  Date:   2016-05-11 (Wed, 11 May 2016)

  Changed paths:
    M ui/gtk.c

  Log Message:
  -----------
  ui: gtk: Fix a runtime warning on vte >= 0.37

inner-border was dropped in vte API 2.91, in favor of the standard
padding style

Signed-off-by: Cole Robinson <address@hidden>
Message-id: address@hidden

[ kraxel: Fix warning with old vte version. ]

Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: bb732ee78cee8688e74b0f67ff8cc34290f5c9cf
      
https://github.com/qemu/qemu/commit/bb732ee78cee8688e74b0f67ff8cc34290f5c9cf
  Author: Cole Robinson <address@hidden>
  Date:   2016-05-11 (Wed, 11 May 2016)

  Changed paths:
    M ui/gtk.c

  Log Message:
  -----------
  ui: gtk: Fix some deprecation warnings

All device manager APIs are deprecated now. Much of our usage is
just to get the current pointer, so centralize that logic and use
the new seat APIs

Signed-off-by: Cole Robinson <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 44b31e0bc4e32abe7bca38fa2a9d8ffbbb419764
      
https://github.com/qemu/qemu/commit/44b31e0bc4e32abe7bca38fa2a9d8ffbbb419764
  Author: Michael S. Tsirkin <address@hidden>
  Date:   2016-05-12 (Thu, 12 May 2016)

  Changed paths:
    M ui/gtk.c

  Log Message:
  -----------
  ui/gtk: copy to clipboard support

This adds a menu item to copy current selection to clipboard.
Seems handy for copying out guest error messages.

Signed-off-by: Michael S. Tsirkin <address@hidden>
Message-id: address@hidden

[ kraxel: fix build with CONFIG_VTE=n ]
[ kraxel: fix build with CONFIG_VTE=n, now for real ]

Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 39414ef4e93db9041e463a097084a407d0d374f0
      
https://github.com/qemu/qemu/commit/39414ef4e93db9041e463a097084a407d0d374f0
  Author: Gerd Hoffmann <address@hidden>
  Date:   2016-05-12 (Thu, 12 May 2016)

  Changed paths:
    M include/ui/spice-display.h
    M ui/spice-display.c

  Log Message:
  -----------
  spice/gl: add & use qemu_spice_gl_monitor_config

Cc: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>


  Commit: 42ddb8aa7c0ad727537db0f1b25c7640b36ef35e
      
https://github.com/qemu/qemu/commit/42ddb8aa7c0ad727537db0f1b25c7640b36ef35e
  Author: Md Haris Iqbal <address@hidden>
  Date:   2016-05-12 (Thu, 12 May 2016)

  Changed paths:
    M ui/shader.c

  Log Message:
  -----------
  Changed malloc to g_malloc, free to g_free in ui/shader.c

Signed-off-by: Md Haris Iqbal <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: f454f49c42d4ec7bdbbb5a7d9c0c8bfb24b28ca4
      
https://github.com/qemu/qemu/commit/f454f49c42d4ec7bdbbb5a7d9c0c8bfb24b28ca4
  Author: Gonglei <address@hidden>
  Date:   2016-05-12 (Thu, 12 May 2016)

  Changed paths:
    M ui/egl-helpers.c

  Log Message:
  -----------
  egl-helpers: fix possible resource leak

CID 1352419, using g_strdup_printf instead of asprintf.

Signed-off-by: Gonglei <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 28f4a7083dcca084243e313ab18fcdb20d60334e
      
https://github.com/qemu/qemu/commit/28f4a7083dcca084243e313ab18fcdb20d60334e
  Author: Gonglei <address@hidden>
  Date:   2016-05-12 (Thu, 12 May 2016)

  Changed paths:
    M ui/spice-display.c

  Log Message:
  -----------
  spice: fix coverity complains

Remove the unnecessary NULL check.

Signed-off-by: Gonglei <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: a69fc693e9a7e51b4be08cd37bb3fb02c9386152
      
https://github.com/qemu/qemu/commit/a69fc693e9a7e51b4be08cd37bb3fb02c9386152
  Author: Gerd Hoffmann <address@hidden>
  Date:   2016-05-12 (Thu, 12 May 2016)

  Changed paths:
    M ui/gtk.c

  Log Message:
  -----------
  gtk: update grab code for gtk 3.20

Fixes the remaining gtk 3.20 warnings.

Signed-off-by: Gerd Hoffmann <address@hidden>
Reviewed-by: Cole Robinson <address@hidden>
Tested-by: Cole Robinson <address@hidden>
Message-id: address@hidden


  Commit: 6978dc4adcdf27722aa6f9e13f88a903b30a3f8d
      
https://github.com/qemu/qemu/commit/6978dc4adcdf27722aa6f9e13f88a903b30a3f8d
  Author: Alberto Garcia <address@hidden>
  Date:   2016-05-13 (Fri, 13 May 2016)

  Changed paths:
    M ui/gtk.c

  Log Message:
  -----------
  gtk: don't leak the GtkBorder with VTE 0.36

When gtk_widget_style_get() is used to get the "inner-border" style
property, it returns a copy of the GtkBorder which must be freed by
the caller.

This patch also fixes a warning about the unused 'padding' structure
with VTE 0.36.

Signed-off-by: Alberto Garcia <address@hidden>
Message-id: address@hidden
Cc: Cole Robinson <address@hidden>
Cc: Gerd Hoffmann <address@hidden>

[ kraxel: adapted to changes in ui patch queue ]

Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 70f87e0f0aa04f764dabaeb3ed71ff195748076a
      
https://github.com/qemu/qemu/commit/70f87e0f0aa04f764dabaeb3ed71ff195748076a
  Author: Peter Maydell <address@hidden>
  Date:   2016-05-13 (Fri, 13 May 2016)

  Changed paths:
    M configure
    M include/ui/spice-display.h
    M ui/egl-helpers.c
    M ui/gtk.c
    M ui/sdl2.c
    M ui/shader.c
    M ui/spice-display.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/kraxel/tags/pull-ui-20160513-1' into 
staging

gtk/sdl build tweaks
fix gtk 3.20 warnings
gtk clipboard support
spice-gl monitor config support
fix coverity warnings

# gpg: Signature made Fri 13 May 2016 13:30:39 BST using RSA key ID D3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <address@hidden>"
# gpg:                 aka "Gerd Hoffmann <address@hidden>"
# gpg:                 aka "Gerd Hoffmann (private) <address@hidden>"

* remotes/kraxel/tags/pull-ui-20160513-1:
  gtk: don't leak the GtkBorder with VTE 0.36
  gtk: update grab code for gtk 3.20
  spice: fix coverity complains
  egl-helpers: fix possible resource leak
  Changed malloc to g_malloc, free to g_free in ui/shader.c
  spice/gl: add & use qemu_spice_gl_monitor_config
  ui/gtk: copy to clipboard support
  ui: gtk: Fix some deprecation warnings
  ui: gtk: Fix a runtime warning on vte >= 0.37
  configure: support vte-2.91
  configure: report SDL version
  configure: report GTK version
  configure: add echo_version helper
  configure: error on unknown --with-sdlabi value
  configure: build SDL if only SDL2 available
  ui: sdl2: Release grab before opening console window
  ui: gtk: fix crash when terminal inner-border is NULL

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/14fccfa91eca...70f87e0f0aa0
reply via email to
[Prev in Thread] Current Thread [Next in Thread]