mbox

[PULL,0/4] Darwin patches for 2022-03-29

Message ID 20220328224012.32737-1-philippe.mathieu.daude@gmail.com (mailing list archive)
State New, archived
Headers show

Pull-request

https://github.com/philmd/qemu.git tags/darwin-20220329

Message

Philippe Mathieu-Daudé March 28, 2022, 10:40 p.m. UTC
From: Philippe Mathieu-Daudé <f4bug@amsat.org>

The following changes since commit 27fc9f365d6f60ff86c2e2be57289bb47a2be882:

  Merge tag 'pull-ppc-20220326' of https://github.com/legoater/qemu into staging (2022-03-28 10:16:33 +0100)

are available in the Git repository at:

  https://github.com/philmd/qemu.git tags/darwin-20220329

for you to fetch changes up to a4fd374364d4e23e0861273aaf7ff2ebddd57a17:

  ui/console: Check console before emitting GL event (2022-03-29 00:19:37 +0200)

----------------------------------------------------------------
Darwin patches

- UI fixes

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

Akihiko Odaki (2):
  ui/cocoa: Respect left-command-key option
  ui/console: Check console before emitting GL event

Philippe Mathieu-Daudé (2):
  gitattributes: Cover Objective-C source files
  qemu/main-loop: Disable block backend global state assertion on Cocoa

 .gitattributes           |  1 +
 include/qemu/main-loop.h | 13 +++++++++++++
 ui/cocoa.m               |  3 ++-
 ui/console.c             | 21 +++++++++++++++++++++
 4 files changed, 37 insertions(+), 1 deletion(-)

Comments

Philippe Mathieu-Daudé March 29, 2022, 10:27 a.m. UTC | #1
Hi Peter,

On 29/3/22 00:40, Philippe Mathieu-Daudé wrote:
> From: Philippe Mathieu-Daudé <f4bug@amsat.org>
> 
> The following changes since commit 27fc9f365d6f60ff86c2e2be57289bb47a2be882:
> 
>    Merge tag 'pull-ppc-20220326' of https://github.com/legoater/qemu into staging (2022-03-28 10:16:33 +0100)
> 
> are available in the Git repository at:
> 
>    https://github.com/philmd/qemu.git tags/darwin-20220329
> 
> for you to fetch changes up to a4fd374364d4e23e0861273aaf7ff2ebddd57a17:
> 
>    ui/console: Check console before emitting GL event (2022-03-29 00:19:37 +0200)
> 
> ----------------------------------------------------------------
> Darwin patches
> 
> - UI fixes
> 
> ----------------------------------------------------------------
> 
> Akihiko Odaki (2):
>    ui/cocoa: Respect left-command-key option
>    ui/console: Check console before emitting GL event
> 
> Philippe Mathieu-Daudé (2):
>    gitattributes: Cover Objective-C source files
>    qemu/main-loop: Disable block backend global state assertion on Cocoa

Do you mind putting this PR on hold to see Hanna's answer whether we
take her patch instead:
https://lore.kernel.org/qemu-devel/dab63073-d532-2795-fce4-77bd0839f578@gmail.com/

Thanks,

Phil.
Hanna Czenczek March 29, 2022, 12:10 p.m. UTC | #2
On 29.03.22 12:27, Philippe Mathieu-Daudé wrote:
> Hi Peter,
>
> On 29/3/22 00:40, Philippe Mathieu-Daudé wrote:
>> From: Philippe Mathieu-Daudé <f4bug@amsat.org>
>>
>> The following changes since commit 
>> 27fc9f365d6f60ff86c2e2be57289bb47a2be882:
>>
>>    Merge tag 'pull-ppc-20220326' of https://github.com/legoater/qemu 
>> into staging (2022-03-28 10:16:33 +0100)
>>
>> are available in the Git repository at:
>>
>>    https://github.com/philmd/qemu.git tags/darwin-20220329
>>
>> for you to fetch changes up to a4fd374364d4e23e0861273aaf7ff2ebddd57a17:
>>
>>    ui/console: Check console before emitting GL event (2022-03-29 
>> 00:19:37 +0200)
>>
>> ----------------------------------------------------------------
>> Darwin patches
>>
>> - UI fixes
>>
>> ----------------------------------------------------------------
>>
>> Akihiko Odaki (2):
>>    ui/cocoa: Respect left-command-key option
>>    ui/console: Check console before emitting GL event
>>
>> Philippe Mathieu-Daudé (2):
>>    gitattributes: Cover Objective-C source files
>>    qemu/main-loop: Disable block backend global state assertion on Cocoa
>
> Do you mind putting this PR on hold to see Hanna's answer whether we
> take her patch instead:
> https://lore.kernel.org/qemu-devel/dab63073-d532-2795-fce4-77bd0839f578@gmail.com/

To explicitly reply here (too): I would like to rebase my patch (and 
subsequent PR) on this PR here.  I’d therefore like this PR to proceed 
(if possible).

Hanna
Peter Maydell March 29, 2022, 3:38 p.m. UTC | #3
On Mon, 28 Mar 2022 at 23:40, Philippe Mathieu-Daudé
<philippe.mathieu.daude@gmail.com> wrote:
>
> From: Philippe Mathieu-Daudé <f4bug@amsat.org>
>
> The following changes since commit 27fc9f365d6f60ff86c2e2be57289bb47a2be882:
>
>   Merge tag 'pull-ppc-20220326' of https://github.com/legoater/qemu into staging (2022-03-28 10:16:33 +0100)
>
> are available in the Git repository at:
>
>   https://github.com/philmd/qemu.git tags/darwin-20220329
>
> for you to fetch changes up to a4fd374364d4e23e0861273aaf7ff2ebddd57a17:
>
>   ui/console: Check console before emitting GL event (2022-03-29 00:19:37 +0200)
>
> ----------------------------------------------------------------
> Darwin patches
>
> - UI fixes
>
> ----------------------------------------------------------------


Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/7.0
for any user-visible changes.

-- PMM
Philippe Mathieu-Daudé March 29, 2022, 5:03 p.m. UTC | #4
On 29/3/22 14:10, Hanna Reitz wrote:
> On 29.03.22 12:27, Philippe Mathieu-Daudé wrote:
>> Hi Peter,
>>
>> On 29/3/22 00:40, Philippe Mathieu-Daudé wrote:
>>> From: Philippe Mathieu-Daudé <f4bug@amsat.org>
>>>
>>> The following changes since commit 
>>> 27fc9f365d6f60ff86c2e2be57289bb47a2be882:
>>>
>>>    Merge tag 'pull-ppc-20220326' of https://github.com/legoater/qemu 
>>> into staging (2022-03-28 10:16:33 +0100)
>>>
>>> are available in the Git repository at:
>>>
>>>    https://github.com/philmd/qemu.git tags/darwin-20220329
>>>
>>> for you to fetch changes up to a4fd374364d4e23e0861273aaf7ff2ebddd57a17:
>>>
>>>    ui/console: Check console before emitting GL event (2022-03-29 
>>> 00:19:37 +0200)
>>>
>>> ----------------------------------------------------------------
>>> Darwin patches
>>>
>>> - UI fixes
>>>
>>> ----------------------------------------------------------------
>>>
>>> Akihiko Odaki (2):
>>>    ui/cocoa: Respect left-command-key option
>>>    ui/console: Check console before emitting GL event
>>>
>>> Philippe Mathieu-Daudé (2):
>>>    gitattributes: Cover Objective-C source files
>>>    qemu/main-loop: Disable block backend global state assertion on Cocoa
>>
>> Do you mind putting this PR on hold to see Hanna's answer whether we
>> take her patch instead:
>> https://lore.kernel.org/qemu-devel/dab63073-d532-2795-fce4-77bd0839f578@gmail.com/ 
>>
> 
> To explicitly reply here (too): I would like to rebase my patch (and 
> subsequent PR) on this PR here.  I’d therefore like this PR to proceed 
> (if possible).

I couldn't update earlier due to a power outage...

Thanks Hanna for following up, and Peter for merging!

Phil.