qapi: rename InputAxis values.

Lowercase them.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Daniel P. Berrange <berrange@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>

diff --git a/qapi-schema.json b/qapi-schema.json
index 011fdb6bcde19a5b26de7922fd2441700f472df3..f3e080fc13024d47fdc01699a6820dc1b1bd520a 100644 (file)
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -3753,12 +3753,9 @@
 # Position axis of a pointer input device (mouse, tablet).
 #
 # Since: 2.0
-#
-# Note that the spelling of these values may change when the
-# x-input-send-event is promoted out of experimental status.
 ##
 { 'enum'  : 'InputAxis',
-  'data'  : [ 'X', 'Y' ] }
+  'data'  : [ 'x', 'y' ] }
 
 ##
 # @InputKeyEvent

diff --git a/qmp-commands.hx b/qmp-commands.hx
index cd4d14266f670267e85d1f23779871e12d4a29d2..edfe7721c1264f5dd6a1bb7cfe3481018c2c7ad3 100644 (file)
--- a/qmp-commands.hx
+++ b/qmp-commands.hx
@@ -4717,8 +4717,8 @@ Move mouse pointer to absolute coordinates (20000, 400).
 
 -> { "execute": "x-input-send-event" ,
   "arguments": { "events": [
-               { "type": "abs", "data" : { "axis": "X", "value" : 20000 } },
-               { "type": "abs", "data" : { "axis": "Y", "value" : 400 } } ] } }
+               { "type": "abs", "data" : { "axis": "x", "value" : 20000 } },
+               { "type": "abs", "data" : { "axis": "y", "value" : 400 } } ] } }
 <- { "return": {} }
 
 EQMP

diff --git a/scripts/qapi.py b/scripts/qapi.py
index 941d7c9898a9a745d525ae03822953a3817df256..18adca753d6d7511fbcb929614159bfa86e98913 100644 (file)
--- a/scripts/qapi.py
+++ b/scripts/qapi.py
@@ -66,7 +66,6 @@ case_whitelist = [
     'CpuInfoBase',          # CPU, visible through query-cpu
     'CpuInfoMIPS',          # PC, visible through query-cpu
     'CpuInfoTricore',       # PC, visible through query-cpu
-    'InputAxis',            # TODO: drop when x-input-send-event is fixed
     'QapiErrorClass',       # all members, visible through errors
     'UuidInfo',             # UUID, visible through query-uuid
     'X86CPURegister32',     # all members, visible indirectly through qom-get