[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC PATCH v2 13/15] Revert "qapi-events: add 'if' conditio
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [RFC PATCH v2 13/15] Revert "qapi-events: add 'if' condition to implicit event enum" |
Date: |
Tue, 18 Dec 2018 19:22:32 +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.
Signed-off-by: Markus Armbruster <address@hidden>
# Conflicts:
# scripts/qapi/events.py
---
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 e988e43941..c944ba90b8 100644
--- a/scripts/qapi/events.py
+++ b/scripts/qapi/events.py
@@ -194,7 +194,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] [RFC PATCH v2 00/15] qapi: add #if pre-processor conditions to generated code (part 3), Markus Armbruster, 2018/12/18
- [Qemu-devel] [RFC PATCH v2 01/15] qapi: Belatedly update docs for commit 9c2f56e9f9d, Markus Armbruster, 2018/12/18
- [Qemu-devel] [RFC PATCH v2 04/15] build-sys: move qmp-introspect per target, Markus Armbruster, 2018/12/18
- [Qemu-devel] [RFC PATCH v2 03/15] qapi: Generate QAPIEvent stuff into separate files WIP, Markus Armbruster, 2018/12/18
- [Qemu-devel] [RFC PATCH v2 02/15] qapi: Eliminate indirection through qmp_event_get_func_emit(), Markus Armbruster, 2018/12/18
- [Qemu-devel] [RFC PATCH v2 12/15] qapi: remove qmp_unregister_command(), Markus Armbruster, 2018/12/18
- [Qemu-devel] [RFC PATCH v2 13/15] Revert "qapi-events: add 'if' condition to implicit event enum",
Markus Armbruster <=
- [Qemu-devel] [RFC PATCH v2 08/15] target.json: add a note about query-cpu* not being s390x-specific, Markus Armbruster, 2018/12/18
- [Qemu-devel] [RFC PATCH v2 15/15] qapi: move RTC_CHANGE to the target schema, Markus Armbruster, 2018/12/18
- [Qemu-devel] [RFC PATCH v2 11/15] qapi: make query-cpu-definitions depend on specific targets, Markus Armbruster, 2018/12/18
- [Qemu-devel] [RFC PATCH v2 10/15] qapi: make query-cpu-model-expansion depend on s390 or x86, Markus Armbruster, 2018/12/18
- [Qemu-devel] [RFC PATCH v2 05/15] qapi: New module target.json, Markus Armbruster, 2018/12/18
- [Qemu-devel] [RFC PATCH v2 09/15] qapi: make query-gic-capabilities depend on TARGET_ARM, Markus Armbruster, 2018/12/18
- [Qemu-devel] [RFC PATCH v2 06/15] qapi: make rtc-reset-reinjection and SEV depend on TARGET_I386, Markus Armbruster, 2018/12/18
- [Qemu-devel] [RFC PATCH v2 14/15] qmp: Deprecate query-events in favor of query-qmp-schema, Markus Armbruster, 2018/12/18