diff options
author | Peter Maydell | 2017-12-15 10:52:07 +0100 |
---|---|---|
committer | Peter Maydell | 2017-12-15 10:52:07 +0100 |
commit | 1c3b51a796a8eacfa5dfc840f0d8b736246167d4 (patch) | |
tree | df953b807ab8ae2e265af308dac877683cf39af2 /include | |
parent | Merge remote-tracking branch 'remotes/dgilbert/tags/pull-hmp-20171214' into s... (diff) | |
parent | xen/pt: Set is_express to avoid out-of-bounds write (diff) | |
download | qemu-1c3b51a796a8eacfa5dfc840f0d8b736246167d4.tar.gz qemu-1c3b51a796a8eacfa5dfc840f0d8b736246167d4.tar.xz qemu-1c3b51a796a8eacfa5dfc840f0d8b736246167d4.zip |
Merge remote-tracking branch 'remotes/sstabellini/tags/xen-20171214-tag' into staging
Xen 2017/12/14
# gpg: Signature made Fri 15 Dec 2017 00:26:26 GMT
# gpg: using RSA key 0x894F8F4870E1AE90
# gpg: Good signature from "Stefano Stabellini <stefano.stabellini@eu.citrix.com>"
# gpg: aka "Stefano Stabellini <sstabellini@kernel.org>"
# Primary key fingerprint: D04E 33AB A51F 67BA 07D3 0AEA 894F 8F48 70E1 AE90
* remotes/sstabellini/tags/xen-20171214-tag:
xen/pt: Set is_express to avoid out-of-bounds write
xenfb: activate input handlers for raw pointer devices
xenfb: Add [feature|request]-raw-pointer
xenfb: Use Input Handlers directly
ui: generate qcode to linux mappings
xen-disk: use an IOThread per instance
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
-rw-r--r-- | include/ui/input.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/ui/input.h b/include/ui/input.h index f8cee43f65..5cc76d6e41 100644 --- a/include/ui/input.h +++ b/include/ui/input.h @@ -77,4 +77,7 @@ extern const guint16 qemu_input_map_qcode_to_qnum[]; extern const guint qemu_input_map_qnum_to_qcode_len; extern const guint16 qemu_input_map_qnum_to_qcode[]; +extern const guint qemu_input_map_qcode_to_linux_len; +extern const guint16 qemu_input_map_qcode_to_linux[]; + #endif /* INPUT_H */ |