summary refs log tree commit diff stats
path: root/scripts
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2016-03-01 11:15:00 +0000
committerPeter Maydell <peter.maydell@linaro.org>2016-03-01 11:15:00 +0000
commit0b85d735831d69ff4ba776e7067ef2e285b234cf (patch)
tree4c6ab9473a345766c3e6fe3f8742426a80c5242f /scripts
parentd9c7737e57d1c5d8505d09b2803ca140875c9657 (diff)
parent6575ccddf4e7c2484bc14b10d5e89f57506c3953 (diff)
downloadfocaccia-qemu-0b85d735831d69ff4ba776e7067ef2e285b234cf.tar.gz
focaccia-qemu-0b85d735831d69ff4ba776e7067ef2e285b234cf.zip
Merge remote-tracking branch 'remotes/kraxel/tags/pull-input-20160301-1' into staging
qapi: fix input-send-event and promote to stable

# gpg: Signature made Tue 01 Mar 2016 08:19:52 GMT using RSA key ID D3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"

* remotes/kraxel/tags/pull-input-20160301-1:
  qapi: promote input-send-event to stable
  qapi: rename InputAxis values.
  qapi: rename input buttons
  qapi: switch x-input-send-event from console to device+head
  console: add & use qemu_console_lookup_by_device_name

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/qapi.py2
1 files changed, 0 insertions, 2 deletions
diff --git a/scripts/qapi.py b/scripts/qapi.py
index 8497777d94..18adca753d 100644
--- a/scripts/qapi.py
+++ b/scripts/qapi.py
@@ -66,8 +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
-    'InputButton',          # 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