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 /hw/virtio/virtio-input-host-pci.c | |
| parent | 04d6556c5c91d6b00c70df7b85e1715a7c7870df (diff) | |
| parent | 503591cb6c28c3ddbe38ea50cab2f0dd3d6cd929 (diff) | |
| download | focaccia-qemu-082b4061a4a28549bcb22ba3bab8e477e4fca018.tar.gz focaccia-qemu-082b4061a4a28549bcb22ba3bab8e477e4fca018.zip | |
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 'hw/virtio/virtio-input-host-pci.c')
| -rw-r--r-- | hw/virtio/virtio-input-host-pci.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/hw/virtio/virtio-input-host-pci.c b/hw/virtio/virtio-input-host-pci.c index 725a51ad30..124c4f3447 100644 --- a/hw/virtio/virtio-input-host-pci.c +++ b/hw/virtio/virtio-input-host-pci.c @@ -13,7 +13,7 @@ typedef struct VirtIOInputHostPCI VirtIOInputHostPCI; -#define TYPE_VIRTIO_INPUT_HOST_PCI "virtio-input-host-pci-base" +#define TYPE_VIRTIO_INPUT_HOST_PCI "virtio-input-host-pci" #define VIRTIO_INPUT_HOST_PCI(obj) \ OBJECT_CHECK(VirtIOInputHostPCI, (obj), TYPE_VIRTIO_INPUT_HOST_PCI) @@ -31,10 +31,7 @@ static void virtio_host_initfn(Object *obj) } static const VirtioPCIDeviceTypeInfo virtio_input_host_pci_info = { - .base_name = TYPE_VIRTIO_INPUT_HOST_PCI, - .generic_name = "virtio-input-host-pci", - .transitional_name = "virtio-input-host-pci-transitional", - .non_transitional_name = "virtio-input-host-pci-non-transitional", + .generic_name = TYPE_VIRTIO_INPUT_HOST_PCI, .parent = TYPE_VIRTIO_INPUT_PCI, .instance_size = sizeof(VirtIOInputHostPCI), .instance_init = virtio_host_initfn, |