diff options
| author | Peter Maydell | 2017-02-20 14:38:34 +0100 |
|---|---|---|
| committer | Peter Maydell | 2017-02-20 14:38:34 +0100 |
| commit | 6753e4ed150ca1f94651aad06c031680a0be6cac (patch) | |
| tree | 32b143279ec3db819f40d33e1b539ffdde699a5b /qapi-schema.json | |
| parent | Merge remote-tracking branch 'remotes/huth/tags/coldfire-20170219' into staging (diff) | |
| parent | Add wctablet device (diff) | |
| download | qemu-6753e4ed150ca1f94651aad06c031680a0be6cac.tar.gz qemu-6753e4ed150ca1f94651aad06c031680a0be6cac.tar.xz qemu-6753e4ed150ca1f94651aad06c031680a0be6cac.zip | |
Merge remote-tracking branch 'remotes/kraxel/tags/pull-input-20170220-1' into staging
input: add wctablet, ps2 fix
# gpg: Signature made Mon 20 Feb 2017 11:42:12 GMT
# gpg: using RSA key 0x4CB6D8EED3E87138
# 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>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138
* remotes/kraxel/tags/pull-input-20170220-1:
Add wctablet device
ps2: fix mouse mappings for right/middle button
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qapi-schema.json')
| -rw-r--r-- | qapi-schema.json | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/qapi-schema.json b/qapi-schema.json index baa0d263d6..e9a6364b7d 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -4890,7 +4890,7 @@ # # Configuration info for the new chardev backend. # -# Since: 1.4 (testdev since 2.2) +# Since: 1.4 (testdev since 2.2, wctablet since 2.9) ## { 'union': 'ChardevBackend', 'data': { 'file' : 'ChardevFile', 'serial' : 'ChardevHostdev', @@ -4902,6 +4902,7 @@ 'null' : 'ChardevCommon', 'mux' : 'ChardevMux', 'msmouse': 'ChardevCommon', + 'wctablet' : 'ChardevCommon', 'braille': 'ChardevCommon', 'testdev': 'ChardevCommon', 'stdio' : 'ChardevStdio', |