diff options
author | Peter Maydell <peter.maydell@linaro.org> | 2019-05-13 12:46:47 +0100 |
---|---|---|
committer | Peter Maydell <peter.maydell@linaro.org> | 2019-05-13 12:46:48 +0100 |
commit | 082b4061a4a28549bcb22ba3bab8e477e4fca018 (patch) | |
tree | 4dc5d995a1a4106ad79d7153cad25510cd8e4c83 /MAINTAINERS | |
parent | 04d6556c5c91d6b00c70df7b85e1715a7c7870df (diff) | |
parent | 503591cb6c28c3ddbe38ea50cab2f0dd3d6cd929 (diff) |
Merge remote-tracking branch 'remotes/kraxel/tags/input-20190513-v2-pull-request' into staging
input: add vhost-user-input, virtio-input fixes.
# gpg: Signature made Mon 13 May 2019 07:52:39 BST
# gpg: using RSA key 4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" [full]
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>" [full]
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>" [full]
# Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138
* remotes/kraxel/tags/input-20190513-v2-pull-request:
virtio-input: fix Kconfig dependency and Makefile
virtio-input-host-pci: cleanup types
util: simplify unix_listen()
Add vhost-user-input-pci
Add vhost-user-backend
libvhost-user: add PROTOCOL_F_CONFIG if {set, get}_config
libvhost-user: fix -Waddress-of-packed-member
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index f25729a06d..a73a61a546 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1485,6 +1485,8 @@ F: hw/*/*vhost* F: docs/interop/vhost-user.json F: docs/interop/vhost-user.txt F: contrib/vhost-user-*/ +F: backends/vhost-user.c +F: include/sysemu/vhost-user-backend.h virtio M: Michael S. Tsirkin <mst@redhat.com> @@ -1526,6 +1528,7 @@ L: qemu-s390x@nongnu.org virtio-input M: Gerd Hoffmann <kraxel@redhat.com> S: Maintained +F: hw/input/vhost-user-input.c F: hw/input/virtio-input*.c F: include/hw/virtio/virtio-input.h |