[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 04/23] qapi: Convert simple union InputEvent to flat one
From: |
Markus Armbruster |
Subject: |
[PATCH v2 04/23] qapi: Convert simple union InputEvent to flat one |
Date: |
Fri, 17 Sep 2021 16:31:15 +0200 |
Simple unions predate flat unions. Having both complicates the QAPI
schema language and the QAPI generator. We haven't been using simple
unions in new code for a long time, because they are less flexible and
somewhat awkward on the wire.
To prepare for their removal, convert simple union InputEvent to an
equivalent flat one. Adds some boilerplate to the schema, which is a
bit ugly, but a lot easier to maintain than the simple union feature.
Cc: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
---
qapi/ui.json | 42 ++++++++++++++++++++++++++++++++++++++----
1 file changed, 38 insertions(+), 4 deletions(-)
diff --git a/qapi/ui.json b/qapi/ui.json
index 9e04f9d65d..d7567ac866 100644
--- a/qapi/ui.json
+++ b/qapi/ui.json
@@ -960,6 +960,38 @@
'data' : { 'axis' : 'InputAxis',
'value' : 'int' } }
+##
+# @InputEventKind:
+#
+# Since: 2.0
+##
+{ 'enum': 'InputEventKind',
+ 'data': [ 'key', 'btn', 'rel', 'abs' ] }
+
+##
+# @InputKeyEventWrapper:
+#
+# Since: 2.0
+##
+{ 'struct': 'InputKeyEventWrapper',
+ 'data': { 'data': 'InputKeyEvent' } }
+
+##
+# @InputBtnEventWrapper:
+#
+# Since: 2.0
+##
+{ 'struct': 'InputBtnEventWrapper',
+ 'data': { 'data': 'InputBtnEvent' } }
+
+##
+# @InputMoveEventWrapper:
+#
+# Since: 2.0
+##
+{ 'struct': 'InputMoveEventWrapper',
+ 'data': { 'data': 'InputMoveEvent' } }
+
##
# @InputEvent:
#
@@ -975,10 +1007,12 @@
# Since: 2.0
##
{ 'union' : 'InputEvent',
- 'data' : { 'key' : 'InputKeyEvent',
- 'btn' : 'InputBtnEvent',
- 'rel' : 'InputMoveEvent',
- 'abs' : 'InputMoveEvent' } }
+ 'base': { 'type': 'InputEventKind' },
+ 'discriminator': 'type',
+ 'data' : { 'key' : 'InputKeyEventWrapper',
+ 'btn' : 'InputBtnEventWrapper',
+ 'rel' : 'InputMoveEventWrapper',
+ 'abs' : 'InputMoveEventWrapper' } }
##
# @input-send-event:
--
2.31.1
- [PATCH v2 20/23] tests/qapi-schema: Purge simple unions from tests, (continued)
- [PATCH v2 20/23] tests/qapi-schema: Purge simple unions from tests, Markus Armbruster, 2021/09/17
- [PATCH v2 21/23] qapi: Drop simple unions, Markus Armbruster, 2021/09/17
- [PATCH v2 08/23] qapi: Convert simple union SocketAddressLegacy to flat one, Markus Armbruster, 2021/09/17
- [PATCH v2 14/23] test-clone-visitor: Wean off UserDefListUnion, Markus Armbruster, 2021/09/17
- [PATCH v2 18/23] test-clone-visitor: Wean off __org.qemu_x-Union1, Markus Armbruster, 2021/09/17
- [PATCH v2 22/23] tests/qapi-schema: Rename flat-union-* test cases to union-*, Markus Armbruster, 2021/09/17
- [PATCH v2 02/23] qapi: Stop enforcing "type name should not end in 'Kind', Markus Armbruster, 2021/09/17
- [PATCH v2 10/23] qapi: Convert simple union TransactionAction to flat one, Markus Armbruster, 2021/09/17
- [PATCH v2 17/23] tests/qapi-schema: Rewrite simple union TestIfUnion to be flat, Markus Armbruster, 2021/09/17
- [PATCH v2 12/23] test-qobject-input-visitor: Wean off UserDefListUnion, Markus Armbruster, 2021/09/17
- [PATCH v2 04/23] qapi: Convert simple union InputEvent to flat one,
Markus Armbruster <=