[Qemu-commits] [qemu/qemu] dff742: ui: Fix hanging up Cocoa display on macOS 10.15 (C...

[Peter Maydell]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: dff742ad27efa474ec04accdbf422c9acfd3e30e
      
https://github.com/qemu/qemu/commit/dff742ad27efa474ec04accdbf422c9acfd3e30e
  Author: Hikaru Nishida <address@hidden>
  Date:   2019-10-18 (Fri, 18 Oct 2019)

  Changed paths:
    M ui/cocoa.m

  Log Message:
  -----------
  ui: Fix hanging up Cocoa display on macOS 10.15 (Catalina)

macOS API documentation says that before applicationDidFinishLaunching
is called, any events will not be processed. However, some events are
fired before it is called in macOS Catalina. This causes deadlock of
iothread_lock in handleEvent while it will be released after the
app_started_sem is posted.
This patch avoids processing events before the app_started_sem is
posted to prevent this deadlock.

Buglink: https://bugs.launchpad.net/qemu/+bug/1847906
Signed-off-by: Hikaru Nishida <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: cd54ea456dbb2c704e8eb88c8ef4d3316aec133b
      
https://github.com/qemu/qemu/commit/cd54ea456dbb2c704e8eb88c8ef4d3316aec133b
  Author: Matthew Kilgore <address@hidden>
  Date:   2019-10-18 (Fri, 18 Oct 2019)

  Changed paths:
    M ui/curses.c

  Log Message:
  -----------
  curses: use the bit mask constants provided by curses

The curses API provides the A_ATTRIBUTES and A_CHARTEXT bit masks for
getting the attributes and character parts of a chtype, respectively. We
should use provided constants instead of using 0xff.

Signed-off-by: Matthew Kilgore <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Samuel Thibault <address@hidden>
Tested-by: Samuel Thibault <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 30f5a9dd7a6252d31fb73ab5193f3be1be7766c7
      
https://github.com/qemu/qemu/commit/30f5a9dd7a6252d31fb73ab5193f3be1be7766c7
  Author: Matthew Kilgore <address@hidden>
  Date:   2019-10-18 (Fri, 18 Oct 2019)

  Changed paths:
    M ui/curses.c

  Log Message:
  -----------
  curses: correctly pass the color pair to setcchar()

The current code does not correctly pass the color pair information to
setcchar(), it instead always passes zero. This results in the curses
output always being in white on black.

This patch fixes this by using PAIR_NUMBER() to retrieve the color pair
number from the chtype value, and then passes that value as an argument
to setcchar().

Signed-off-by: Matthew Kilgore <address@hidden>
Reviewed-by: Samuel Thibault <address@hidden>
Tested-by: Samuel Thibault <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 707f75070a94c28889f887deef0ab4da09e25ddf
      
https://github.com/qemu/qemu/commit/707f75070a94c28889f887deef0ab4da09e25ddf
  Author: Laurent Vivier <address@hidden>
  Date:   2019-10-18 (Fri, 18 Oct 2019)

  Changed paths:
    M ui/input-barrier.c

  Log Message:
  -----------
  ui: fix keymap file search in input-barrier object

If we try to start QEMU with "-k en-us", qemu prints a message and exits
with:

    qemu-system-i386: could not read keymap file: 'en-us'

It's because this function is called way too early, before
qemu_add_data_dir() is called, and so qemu_find_file() fails.

To fix that, move init_keyboard_layout() from the class init function to the
instance init function.

Reported-by: Anthony PERARD <address@hidden>
Reviewed-by: Anthony PERARD <address@hidden>
Signed-off-by: Laurent Vivier <address@hidden>
Message-id: address@hidden
Fixes: 6105683da35b ("ui: add an embedded Barrier client")
Signed-off-by: Laurent Vivier <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 51cd65b18fbb105fda1a38081053f023a32cc7a9
      
https://github.com/qemu/qemu/commit/51cd65b18fbb105fda1a38081053f023a32cc7a9
  Author: Peter Maydell <address@hidden>
  Date:   2019-10-18 (Fri, 18 Oct 2019)

  Changed paths:
    M ui/cocoa.m
    M ui/curses.c
    M ui/input-barrier.c

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

ui: bugfixes for cocoa, curses and input-barrier.

# gpg: Signature made Fri 18 Oct 2019 11:16:53 BST
# gpg:                using RSA key 4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <address@hidden>" [full]
# gpg:                 aka "Gerd Hoffmann <address@hidden>" [full]
# gpg:                 aka "Gerd Hoffmann (private) <address@hidden>" [full]
# Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138

* remotes/kraxel/tags/ui-20191018-pull-request:
  ui: fix keymap file search in input-barrier object
  curses: correctly pass the color pair to setcchar()
  curses: use the bit mask constants provided by curses
  ui: Fix hanging up Cocoa display on macOS 10.15 (Catalina)

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


Compare: https://github.com/qemu/qemu/compare/d52932ed34e6...51cd65b18fbb