qapi: Convert simple union InputEvent to flat one
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> Message-Id: <20210917143134.412106-5-armbru@redhat.com>
This commit is contained in:
parent
3cda299dda
commit
b6fd5434de
42
qapi/ui.json
42
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:
|
||||
|
Loading…
Reference in New Issue
Block a user