[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 16/18] Revert "qapi-events: add 'if' condition to
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH v4 16/18] Revert "qapi-events: add 'if' condition to implicit event enum" |
Date: |
Thu, 14 Feb 2019 10:30:51 +0100 |
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.
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.
Another option would be to split target-dependent parts off enum
QAPIEvent into a target-dependent enum. Doesn't seem worthwhile right
now.
Signed-off-by: Markus Armbruster <address@hidden>
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 v4 00/18] qapi: add #if pre-processor conditions to generated code (part 3), Markus Armbruster, 2019/02/14
- [Qemu-devel] [PATCH v4 11/18] target.json: add a note about query-cpu* not being s390x-specific, Markus Armbruster, 2019/02/14
- [Qemu-devel] [PATCH v4 18/18] qapi: move RTC_CHANGE to the target schema, Markus Armbruster, 2019/02/14
- [Qemu-devel] [PATCH v4 02/18] qapi: Fix up documentation for recent commit a95291007b2, Markus Armbruster, 2019/02/14
- [Qemu-devel] [PATCH v4 16/18] Revert "qapi-events: add 'if' condition to implicit event enum",
Markus Armbruster <=
- [Qemu-devel] [PATCH v4 04/18] qapi: Prepare for system modules other than 'builtin', Markus Armbruster, 2019/02/14
- [Qemu-devel] [PATCH v4 08/18] qapi: New module target.json, Markus Armbruster, 2019/02/14
- [Qemu-devel] [PATCH v4 05/18] qapi: Generate QAPIEvent stuff into separate files, Markus Armbruster, 2019/02/14
- [Qemu-devel] [PATCH v4 15/18] qapi: remove qmp_unregister_command(), Markus Armbruster, 2019/02/14
- [Qemu-devel] [PATCH v4 13/18] qapi: make query-cpu-model-expansion depend on s390 or x86, Markus Armbruster, 2019/02/14
- [Qemu-devel] [PATCH v4 06/18] build-sys: move qmp-introspect per target, Markus Armbruster, 2019/02/14
- [Qemu-devel] [PATCH v4 07/18] build: Deal with all of QAPI's .o in qapi/Makefile.objs, Markus Armbruster, 2019/02/14