Marc-André Lureau <marcandre.lur...@gmail.com> writes:
> Hi
>
> On Thu, Aug 5, 2021 at 5:57 PM Markus Armbruster <arm...@redhat.com> wrote:
>
>> marcandre.lur...@redhat.com writes:
>>
>> > From: Marc-André Lureau <marcandre.lur...@redhat.com>
>> >
>> > Signed-off-by: Marc-André Lureau <marcandre.lur...@redhat.com>
>> > Reviewed-by: Stefan Hajnoczi <stefa...@redhat.com>
>> > Tested-by: John Snow <js...@redhat.com>
>> > Reviewed-by: Markus Armbruster <arm...@redhat.com>
[...]
>> Missing:
>>
>> diff --git a/qapi/ui.json b/qapi/ui.json
>> index fd9677d48e..aed2bec4ab 100644
>> --- a/qapi/ui.json
>> +++ b/qapi/ui.json
>> @@ -1136,7 +1136,8 @@
>> { 'name': 'gtk', 'if': 'defined(CONFIG_GTK)' },
>> { 'name': 'sdl', 'if': 'defined(CONFIG_SDL)' },
>> { 'name': 'egl-headless',
>> - 'if': 'defined(CONFIG_OPENGL) && defined(CONFIG_GBM)' },
>> + 'if': { 'all': [ 'defined(CONFIG_OPENGL)',
>> + 'defined(CONFIG_GBM)' ] } },
>> { 'name': 'curses', 'if': 'defined(CONFIG_CURSES)' },
>> { 'name': 'cocoa', 'if': 'defined(CONFIG_COCOA)' },
>> { 'name': 'spice-app', 'if': 'defined(CONFIG_SPICE)'} ] }
>> @@ -1167,7 +1168,8 @@
>> 'gtk': { 'type': 'DisplayGTK', 'if': 'defined(CONFIG_GTK)' },
>> 'curses': { 'type': 'DisplayCurses', 'if': 'defined(CONFIG_CURSES)'
>> },
>> 'egl-headless': { 'type': 'DisplayEGLHeadless',
>> - 'if': 'defined(CONFIG_OPENGL) &&
>> defined(CONFIG_GBM)' }
>> + 'if': { 'all': [ 'defined(CONFIG_OPENGL)',
>> + 'defined(CONFIG_GBM)' ] } }
>> }
>> }
>>
>>
>> You make up for it in PATCH 10. Can tidy up in my tree.
>>
>>
> Ah yes, those are new in the rebase. I think they could either be squashed
> in this patch (with update title), or a new patch. Leaving to the last
> patch isn't really a big issue either I suppose.
>
> Thanks in advance for cleaning it up if you take it :)
I'm squashing it into PATCH 06, which already has similar changes to
tests/qapi-schema/qapi-schema-test.json.
