On Fri, May 10, 2019 at 12:51:36PM +0200, Gerd Hoffmann wrote: > virtio input is virtio-1.0 only, so we don't need the -transitional and > -non-transitional variants. > > Signed-off-by: Gerd Hoffmann <kra...@redhat.com>
Reviewed-by: Michael S. Tsirkin <m...@redhat.com> I assume you are merging this? > --- > hw/virtio/virtio-input-host-pci.c | 7 ++----- > 1 file changed, 2 insertions(+), 5 deletions(-) > > diff --git a/hw/virtio/virtio-input-host-pci.c > b/hw/virtio/virtio-input-host-pci.c > index 725a51ad30b4..124c4f344742 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, > -- > 2.18.1