[Qemu-commits] [qemu/qemu] bc4ca8: gitattributes: Cover Objective-C source files

[Peter Maydell]

  Branch: refs/heads/staging
  Home:   https://github.com/qemu/qemu
  Commit: bc4ca8efba3ee38e6b3773fb0ed783380bf9c1bd
      
https://github.com/qemu/qemu/commit/bc4ca8efba3ee38e6b3773fb0ed783380bf9c1bd
  Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
  Date:   2022-03-29 (Tue, 29 Mar 2022)

  Changed paths:
    M .gitattributes

  Log Message:
  -----------
  gitattributes: Cover Objective-C source files

Apple's Git distribution actually carries a similar file which
annotates *.m:
https://github.com/apple-opensource/Git/blob/73/gitattributes

See comments in commit 29cf16db23 ("buildsys: Help git-diff
adding .gitattributes config file") for details.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Christian Schoenebeck <qemu_oss@crudebyte.com>
Message-Id: <20220317130326.39188-1-philippe.mathieu.daude@gmail.com>


  Commit: 47281859f66bdab1974fb122cab2cbb4a1c9af7f
      
https://github.com/qemu/qemu/commit/47281859f66bdab1974fb122cab2cbb4a1c9af7f
  Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
  Date:   2022-03-29 (Tue, 29 Mar 2022)

  Changed paths:
    M include/qemu/main-loop.h

  Log Message:
  -----------
  main-loop: Disable block backend global state assertion on Cocoa

Since commit 0439c5a462 ("block/block-backend.c: assertions for
block-backend") QEMU crashes when using Cocoa on Darwin hosts.

Example on macOS:

  $ qemu-system-i386
  Assertion failed: (qemu_in_main_thread()), function blk_all_next, file 
block-backend.c, line 552.
  Abort trap: 6

Looking with lldb:

  Assertion failed: (qemu_in_main_thread()), function blk_all_next, file 
block-backend.c, line 552.
  Process 76914 stopped
  * thread #1, queue = 'com.apple.main-thread', stop reason = hit program assert
     frame #4: 0x000000010057c2d4 qemu-system-i386`blk_all_next.cold.1
  at block-backend.c:552:5 [opt]
      549    */
      550   BlockBackend *blk_all_next(BlockBackend *blk)
      551   {
  --> 552       GLOBAL_STATE_CODE();
      553       return blk ? QTAILQ_NEXT(blk, link)
      554                  : QTAILQ_FIRST(&block_backends);
      555   }
  Target 1: (qemu-system-i386) stopped.

  (lldb) bt
  * thread #1, queue = 'com.apple.main-thread', stop reason = hit program assert
     frame #0: 0x00000001908c99b8 libsystem_kernel.dylib`__pthread_kill + 8
     frame #1: 0x00000001908fceb0 libsystem_pthread.dylib`pthread_kill + 288
     frame #2: 0x000000019083a314 libsystem_c.dylib`abort + 164
     frame #3: 0x000000019083972c libsystem_c.dylib`__assert_rtn + 300
   * frame #4: 0x000000010057c2d4 qemu-system-i386`blk_all_next.cold.1 at 
block-backend.c:552:5 [opt]
     frame #5: 0x00000001003c00b4 
qemu-system-i386`blk_all_next(blk=<unavailable>) at block-backend.c:552:5 [opt]
     frame #6: 0x00000001003d8f04 
qemu-system-i386`qmp_query_block(errp=0x0000000000000000) at qapi.c:591:16 [opt]
     frame #7: 0x000000010003ab0c qemu-system-i386`main [inlined] 
addRemovableDevicesMenuItems at cocoa.m:1756:21 [opt]
     frame #8: 0x000000010003ab04 qemu-system-i386`main(argc=<unavailable>, 
argv=<unavailable>) at cocoa.m:1980:5 [opt]
     frame #9: 0x00000001012690f4 dyld`start + 520

As we are in passed release 7.0 hard freeze, disable the block
backend assertion which, while being valuable during development,
is not helpful to users. We'll restore this assertion immediately
once 7.0 is released and work on a fix.

Suggested-by: Akihiko Odaki <akihiko.odaki@gmail.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Akihiko Odaki <akihiko.odaki@gmail.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Message-Id: <20220325183707.85733-1-philippe.mathieu.daude@gmail.com>


  Commit: d6b6dea77e1e27b4644e71e0b9cc6009d56198d0
      
https://github.com/qemu/qemu/commit/d6b6dea77e1e27b4644e71e0b9cc6009d56198d0
  Author: Akihiko Odaki <akihiko.odaki@gmail.com>
  Date:   2022-03-29 (Tue, 29 Mar 2022)

  Changed paths:
    M ui/cocoa.m

  Log Message:
  -----------
  ui/cocoa: Respect left-command-key option

Signed-off-by: Akihiko Odaki <akihiko.odaki@gmail.com>
Fixes: 4797adce5f ("ui/cocoa: add option to swap Option and Command")
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20220317152949.68666-1-akihiko.odaki@gmail.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>


  Commit: 1699d00e5b6f78bf2df8346189e847dfa575c622
      
https://github.com/qemu/qemu/commit/1699d00e5b6f78bf2df8346189e847dfa575c622
  Author: Akihiko Odaki <akihiko.odaki@gmail.com>
  Date:   2022-03-29 (Tue, 29 Mar 2022)

  Changed paths:
    M ui/console.c

  Log Message:
  -----------
  ui/console: Check console before emitting GL event

Without this change, The GL output of a console overwrites the
other consoles and makes them unusable.

Signed-off-by: Akihiko Odaki <akihiko.odaki@gmail.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20220325161216.74582-1-akihiko.odaki@gmail.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>


  Commit: 44064550d98a680e2ff55fdd783ac19d850ac8ca
      
https://github.com/qemu/qemu/commit/44064550d98a680e2ff55fdd783ac19d850ac8ca
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2022-03-29 (Tue, 29 Mar 2022)

  Changed paths:
    M .gitattributes
    M include/qemu/main-loop.h
    M ui/cocoa.m
    M ui/console.c

  Log Message:
  -----------
  Merge tag 'darwin-20220329' of https://github.com/philmd/qemu into staging

Darwin patches

- UI fixes

# gpg: Signature made Mon 28 Mar 2022 23:42:21 BST
# gpg:                using RSA key FAABE75E12917221DCFD6BB2E3E32C2CDEADC0DE
# gpg: Good signature from "Philippe Mathieu-Daudé (F4BUG) <f4bug@amsat.org>" 
[unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: FAAB E75E 1291 7221 DCFD  6BB2 E3E3 2C2C DEAD C0DE

* tag 'darwin-20220329' of https://github.com/philmd/qemu:
  ui/console: Check console before emitting GL event
  ui/cocoa: Respect left-command-key option
  main-loop: Disable block backend global state assertion on Cocoa
  gitattributes: Cover Objective-C source files

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>


Compare: https://github.com/qemu/qemu/compare/bed1fa2fbe5f...44064550d98a