diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-07-03 12:05:31 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-07-03 12:05:31 +0100 |
| commit | 35360642d043c2a5366e8a04a10e5545e7353bd5 (patch) | |
| tree | 199b00c475dfa1a15eefe6a84fc065498092f346 /hw | |
| parent | 5317b0f6d4bb581c5c8f88f31138ee301ad2b7e5 (diff) | |
| parent | 496eacaa67653023540e090fb70b7caba429bbc0 (diff) | |
| download | qemu-35360642d043c2a5366e8a04a10e5545e7353bd5.zip qemu-35360642d043c2a5366e8a04a10e5545e7353bd5.tar.gz qemu-35360642d043c2a5366e8a04a10e5545e7353bd5.tar.bz2 | |
Merge remote-tracking branch 'remotes/kraxel/tags/pull-input-20150703-1' into staging
virtio-input: add input routing support, update multiseat docs.
# gpg: Signature made Fri Jul 3 11:22:33 2015 BST 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-20150703-1:
update pci-bridge-seat section in docs/multiseat.txt
virtio-input: add input routing support
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/input/virtio-input-hid.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/hw/input/virtio-input-hid.c b/hw/input/virtio-input-hid.c index 32cc94a..616a815 100644 --- a/hw/input/virtio-input-hid.c +++ b/hw/input/virtio-input-hid.c @@ -252,7 +252,11 @@ static void virtio_input_handle_sync(DeviceState *dev) static void virtio_input_hid_realize(DeviceState *dev, Error **errp) { VirtIOInputHID *vhid = VIRTIO_INPUT_HID(dev); + vhid->hs = qemu_input_handler_register(dev, vhid->handler); + if (vhid->display && vhid->hs) { + qemu_input_handler_bind(vhid->hs, vhid->display, vhid->head, NULL); + } } static void virtio_input_hid_unrealize(DeviceState *dev, Error **errp) @@ -301,10 +305,17 @@ static void virtio_input_hid_handle_status(VirtIOInput *vinput, } } +static Property virtio_input_hid_properties[] = { + DEFINE_PROP_STRING("display", VirtIOInputHID, display), + DEFINE_PROP_UINT32("head", VirtIOInputHID, head, 0), +}; + static void virtio_input_hid_class_init(ObjectClass *klass, void *data) { + DeviceClass *dc = DEVICE_CLASS(klass); VirtIOInputClass *vic = VIRTIO_INPUT_CLASS(klass); + dc->props = virtio_input_hid_properties; vic->realize = virtio_input_hid_realize; vic->unrealize = virtio_input_hid_unrealize; vic->change_active = virtio_input_hid_change_active; |