From 01df51432e6d22adcc23ccc989432b53d6bc9126 Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Tue, 12 Jan 2016 12:34:20 +0100 Subject: [PATCH] qapi: rename InputAxis values. Lowercase them. Signed-off-by: Gerd Hoffmann Reviewed-by: Daniel P. Berrange Reviewed-by: Markus Armbruster Reviewed-by: Eric Blake --- qapi-schema.json | 5 +---- qmp-commands.hx | 4 ++-- scripts/qapi.py | 1 - 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/qapi-schema.json b/qapi-schema.json index 011fdb6bcd..f3e080fc13 100644 --- 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 cd4d14266f..edfe7721c1 100644 --- 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 941d7c9898..18adca753d 100644 --- 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