[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v3 15/17] Revert "qapi-events: add 'if' conditio
From: |
Marc-André Lureau |
Subject: |
Re: [Qemu-devel] [PATCH v3 15/17] Revert "qapi-events: add 'if' condition to implicit event enum" |
Date: |
Wed, 6 Feb 2019 19:30:23 +0100 |
Hi
On Wed, Feb 6, 2019 at 7:17 PM Markus Armbruster <address@hidden> wrote:
>
> This reverts commit 7bd263490590ee6fcf34ecb6203437e22f6e5a9c.
>
> The commit applied the events' conditions to the members of enum
> QAPIEvent. Awkward, because it renders QAPIEvent unusable in
> target-independent code as soon as we make an event target-dependent.
Well, my solution didn't have this problem iirc. You could mention
that by having target-specific event enums, we could solve this.
It might be worth a FIXME too.
> Reverting this has the following effects:
>
> * ui/vnc.c can remain target independent.
>
> * monitor_qapi_event_conf[] doesn't have to muck around with #ifdef.
>
> * query-events again doesn't reflect conditionals. I'm going to
> deprecate it in favor of query-qmp-schema.
>
> Signed-off-by: Markus Armbruster <address@hidden>
But that's ok for now:
Reviewed-by: Marc-André Lureau <address@hidden>
> ---
> scripts/qapi/events.py | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/scripts/qapi/events.py b/scripts/qapi/events.py
> index 28bbc3745d..2067660be4 100644
> --- a/scripts/qapi/events.py
> +++ b/scripts/qapi/events.py
> @@ -193,7 +193,9 @@ void %(event_emit)s(%(event_enum)s event, QDict *qdict);
> self._genc.add(gen_event_send(name, arg_type, boxed,
> self._event_enum_name,
> self._event_emit_name))
> - self._event_enum_members.append(QAPISchemaMember(name, ifcond))
> + # Note: we generate the enum member regardless of @ifcond, to
> + # keep the enumeration usable in target-independent code.
> + self._event_enum_members.append(QAPISchemaMember(name))
>
>
> def gen_events(schema, output_dir, prefix):
> --
> 2.17.2
>
- [Qemu-devel] [PATCH v3 01/17] qapi: Belatedly document modular code generation, (continued)
- [Qemu-devel] [PATCH v3 01/17] qapi: Belatedly document modular code generation, Markus Armbruster, 2019/02/06
- [Qemu-devel] [PATCH v3 02/17] qapi: Fix up documentation for recent commit a95291007b2, Markus Armbruster, 2019/02/06
- [Qemu-devel] [PATCH v3 11/17] qapi: make query-gic-capabilities depend on TARGET_ARM, Markus Armbruster, 2019/02/06
- [Qemu-devel] [PATCH v3 05/17] qapi: Generate QAPIEvent stuff into separate files, Markus Armbruster, 2019/02/06
- [Qemu-devel] [PATCH v3 14/17] qapi: remove qmp_unregister_command(), Markus Armbruster, 2019/02/06
- [Qemu-devel] [PATCH v3 12/17] qapi: make query-cpu-model-expansion depend on s390 or x86, Markus Armbruster, 2019/02/06
- [Qemu-devel] [PATCH v3 15/17] Revert "qapi-events: add 'if' condition to implicit event enum", Markus Armbruster, 2019/02/06
- Re: [Qemu-devel] [PATCH v3 15/17] Revert "qapi-events: add 'if' condition to implicit event enum",
Marc-André Lureau <=
- [Qemu-devel] [PATCH v3 07/17] qapi: New module target.json, Markus Armbruster, 2019/02/06
- [Qemu-devel] [PATCH v3 13/17] qapi: make query-cpu-definitions depend on specific targets, Markus Armbruster, 2019/02/06
- [Qemu-devel] [PATCH v3 04/17] qapi: Prepare for system modules other than 'builtin', Markus Armbruster, 2019/02/06
- [Qemu-devel] [PATCH v3 09/17] qapi: make s390 commands depend on TARGET_S390X, Markus Armbruster, 2019/02/06
- [Qemu-devel] [PATCH v3 10/17] target.json: add a note about query-cpu* not being s390x-specific, Markus Armbruster, 2019/02/06