diff options
| author | Peter Maydell | 2016-03-01 12:15:00 +0100 |
|---|---|---|
| committer | Peter Maydell | 2016-03-01 12:15:00 +0100 |
| commit | 0b85d735831d69ff4ba776e7067ef2e285b234cf (patch) | |
| tree | 4c6ab9473a345766c3e6fe3f8742426a80c5242f /include/ui/console.h | |
| parent | Merge remote-tracking branch 'remotes/kraxel/tags/pull-vga-20160301-1' into s... (diff) | |
| parent | qapi: promote input-send-event to stable (diff) | |
| download | qemu-0b85d735831d69ff4ba776e7067ef2e285b234cf.tar.gz qemu-0b85d735831d69ff4ba776e7067ef2e285b234cf.tar.xz 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 'include/ui/console.h')
| -rw-r--r-- | include/ui/console.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/ui/console.h b/include/ui/console.h index 6631b9690a..f63697182f 100644 --- a/include/ui/console.h +++ b/include/ui/console.h @@ -378,6 +378,8 @@ void graphic_hw_gl_block(QemuConsole *con, bool block); QemuConsole *qemu_console_lookup_by_index(unsigned int index); QemuConsole *qemu_console_lookup_by_device(DeviceState *dev, uint32_t head); +QemuConsole *qemu_console_lookup_by_device_name(const char *device_id, + uint32_t head, Error **errp); bool qemu_console_is_visible(QemuConsole *con); bool qemu_console_is_graphic(QemuConsole *con); bool qemu_console_is_fixedsize(QemuConsole *con); |