Message ID | 20181126200009.862-3-quintela@redhat.com |
---|---|
State | New |
Headers | show |
Series | None | expand |
On 26/11/2018 20:59, Juan Quintela wrote: > Signed-off-by: Juan Quintela <quintela@redhat.com> > --- > default-configs/virtio.mak | 1 + > hw/virtio/Makefile.objs | 1 + > hw/virtio/virtio-input-host-pci.c | 45 +++++++++++++++++++++++++++++++ > hw/virtio/virtio-pci.c | 20 -------------- > hw/virtio/virtio-pci.h | 14 ---------- > 5 files changed, 47 insertions(+), 34 deletions(-) > create mode 100644 hw/virtio/virtio-input-host-pci.c > Reviewed-by: Laurent Vivier <lvivier@redhat.com> You should add a note in the commit message you have renamed virtio_host_initfn and virtio_host_pci_info to virtio_input_host_initfn and virtio_input_host_info. Thanks, Laurent
CC: Gerd On 26/11/2018 20:59, Juan Quintela wrote: > Signed-off-by: Juan Quintela <quintela@redhat.com> > --- > default-configs/virtio.mak | 1 + > hw/virtio/Makefile.objs | 1 + > hw/virtio/virtio-input-host-pci.c | 45 +++++++++++++++++++++++++++++++ > hw/virtio/virtio-pci.c | 20 -------------- > hw/virtio/virtio-pci.h | 14 ---------- > 5 files changed, 47 insertions(+), 34 deletions(-) > create mode 100644 hw/virtio/virtio-input-host-pci.c > > diff --git a/default-configs/virtio.mak b/default-configs/virtio.mak > index 1304849018..5ae4a61018 100644 > --- a/default-configs/virtio.mak > +++ b/default-configs/virtio.mak > @@ -12,3 +12,4 @@ CONFIG_VIRTIO_RNG=y > CONFIG_SCSI=y > CONFIG_VIRTIO_SCSI=y > CONFIG_VIRTIO_SERIAL=y > +CONFIG_VIRTIO_INPUT_HOST=$(CONFIG_LINUX) > diff --git a/hw/virtio/Makefile.objs b/hw/virtio/Makefile.objs > index 4fbf7de84b..685ae1d866 100644 > --- a/hw/virtio/Makefile.objs > +++ b/hw/virtio/Makefile.objs > @@ -11,6 +11,7 @@ obj-$(call land,$(CONFIG_VIRTIO_CRYPTO),$(CONFIG_VIRTIO_PCI)) += virtio-crypto-p > > obj-$(CONFIG_LINUX) += vhost.o vhost-backend.o vhost-user.o > obj-$(CONFIG_VHOST_VSOCK) += vhost-vsock.o vhost-vsock-pci.o > +obj-$(CONFIG_VIRTIO_INPUT_HOST) += virtio-input-host-pci.o > endif > > common-obj-$(call lnot,$(call land,$(CONFIG_VIRTIO),$(CONFIG_LINUX))) += vhost-stub.o > diff --git a/hw/virtio/virtio-input-host-pci.c b/hw/virtio/virtio-input-host-pci.c > new file mode 100644 > index 0000000000..4048e2f01e > --- /dev/null > +++ b/hw/virtio/virtio-input-host-pci.c > @@ -0,0 +1,45 @@ > +/* > + * Virtio input host PCI Bindings > + * > + * This work is licensed under the terms of the GNU GPL, version 2 or > + * (at your option) any later version. See the COPYING file in the > + * top-level directory. > + */ > + > +#include "qemu/osdep.h" > + > +#include "virtio-pci.h" > +#include "hw/virtio/virtio-input.h" > + > +typedef struct VirtIOInputHostPCI VirtIOInputHostPCI; > + > +#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) > + > +struct VirtIOInputHostPCI { > + VirtIOPCIProxy parent_obj; > + VirtIOInputHost vdev; > +}; > + > +static void virtio_input_host_initfn(Object *obj) > +{ > + VirtIOInputHostPCI *dev = VIRTIO_INPUT_HOST_PCI(obj); > + > + virtio_instance_init_common(obj, &dev->vdev, sizeof(dev->vdev), > + TYPE_VIRTIO_INPUT_HOST); > +} > + > +static const TypeInfo virtio_input_host_pci_info = { > + .name = TYPE_VIRTIO_INPUT_HOST_PCI, > + .parent = TYPE_VIRTIO_INPUT_PCI, > + .instance_size = sizeof(VirtIOInputHostPCI), > + .instance_init = virtio_input_host_initfn, > +}; > + > +static void virtio_input_host_pci_register(void) > +{ > + type_register_static(&virtio_input_host_pci_info); > +} > + > +type_init(virtio_input_host_pci_register) > diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c > index 56b39a3699..97e40da9e8 100644 > --- a/hw/virtio/virtio-pci.c > +++ b/hw/virtio/virtio-pci.c > @@ -2580,23 +2580,6 @@ static const TypeInfo virtio_tablet_pci_info = { > .instance_init = virtio_tablet_initfn, > }; > > -#ifdef CONFIG_LINUX > -static void virtio_host_initfn(Object *obj) > -{ > - VirtIOInputHostPCI *dev = VIRTIO_INPUT_HOST_PCI(obj); > - > - virtio_instance_init_common(obj, &dev->vdev, sizeof(dev->vdev), > - TYPE_VIRTIO_INPUT_HOST); > -} > - > -static const TypeInfo virtio_host_pci_info = { > - .name = TYPE_VIRTIO_INPUT_HOST_PCI, > - .parent = TYPE_VIRTIO_INPUT_PCI, > - .instance_size = sizeof(VirtIOInputHostPCI), > - .instance_init = virtio_host_initfn, > -}; > -#endif > - > /* virtio-pci-bus */ > > static void virtio_pci_bus_new(VirtioBusState *bus, size_t bus_size, > @@ -2650,9 +2633,6 @@ static void virtio_pci_register_types(void) > type_register_static(&virtio_keyboard_pci_info); > type_register_static(&virtio_mouse_pci_info); > type_register_static(&virtio_tablet_pci_info); > -#ifdef CONFIG_LINUX > - type_register_static(&virtio_host_pci_info); > -#endif > type_register_static(&virtio_pci_bus_info); > type_register_static(&virtio_pci_info); > #ifdef CONFIG_VIRTFS > diff --git a/hw/virtio/virtio-pci.h b/hw/virtio/virtio-pci.h > index 25d225bc7d..cf4cbecfab 100644 > --- a/hw/virtio/virtio-pci.h > +++ b/hw/virtio/virtio-pci.h > @@ -50,7 +50,6 @@ typedef struct VHostUserBlkPCI VHostUserBlkPCI; > typedef struct VirtIORngPCI VirtIORngPCI; > typedef struct VirtIOInputPCI VirtIOInputPCI; > typedef struct VirtIOInputHIDPCI VirtIOInputHIDPCI; > -typedef struct VirtIOInputHostPCI VirtIOInputHostPCI; > typedef struct VirtIOGPUPCI VirtIOGPUPCI; > typedef struct VirtIOCryptoPCI VirtIOCryptoPCI; > > @@ -359,19 +358,6 @@ struct VirtIOInputHIDPCI { > VirtIOInputHID vdev; > }; > > -#ifdef CONFIG_LINUX > - > -#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) > - > -struct VirtIOInputHostPCI { > - VirtIOPCIProxy parent_obj; > - VirtIOInputHost vdev; > -}; > - > -#endif > - > /* > * virtio-gpu-pci: This extends VirtioPCIProxy. > */ >
Laurent Vivier <lvivier@redhat.com> wrote: > On 26/11/2018 20:59, Juan Quintela wrote: >> Signed-off-by: Juan Quintela <quintela@redhat.com> >> --- >> default-configs/virtio.mak | 1 + >> hw/virtio/Makefile.objs | 1 + >> hw/virtio/virtio-input-host-pci.c | 45 +++++++++++++++++++++++++++++++ >> hw/virtio/virtio-pci.c | 20 -------------- >> hw/virtio/virtio-pci.h | 14 ---------- >> 5 files changed, 47 insertions(+), 34 deletions(-) >> create mode 100644 hw/virtio/virtio-input-host-pci.c >> > > Reviewed-by: Laurent Vivier <lvivier@redhat.com> > > You should add a note in the commit message you have renamed > virtio_host_initfn and virtio_host_pci_info to virtio_input_host_initfn > and virtio_input_host_info. Done.
diff --git a/default-configs/virtio.mak b/default-configs/virtio.mak index 1304849018..5ae4a61018 100644 --- a/default-configs/virtio.mak +++ b/default-configs/virtio.mak @@ -12,3 +12,4 @@ CONFIG_VIRTIO_RNG=y CONFIG_SCSI=y CONFIG_VIRTIO_SCSI=y CONFIG_VIRTIO_SERIAL=y +CONFIG_VIRTIO_INPUT_HOST=$(CONFIG_LINUX) diff --git a/hw/virtio/Makefile.objs b/hw/virtio/Makefile.objs index 4fbf7de84b..685ae1d866 100644 --- a/hw/virtio/Makefile.objs +++ b/hw/virtio/Makefile.objs @@ -11,6 +11,7 @@ obj-$(call land,$(CONFIG_VIRTIO_CRYPTO),$(CONFIG_VIRTIO_PCI)) += virtio-crypto-p obj-$(CONFIG_LINUX) += vhost.o vhost-backend.o vhost-user.o obj-$(CONFIG_VHOST_VSOCK) += vhost-vsock.o vhost-vsock-pci.o +obj-$(CONFIG_VIRTIO_INPUT_HOST) += virtio-input-host-pci.o endif common-obj-$(call lnot,$(call land,$(CONFIG_VIRTIO),$(CONFIG_LINUX))) += vhost-stub.o diff --git a/hw/virtio/virtio-input-host-pci.c b/hw/virtio/virtio-input-host-pci.c new file mode 100644 index 0000000000..4048e2f01e --- /dev/null +++ b/hw/virtio/virtio-input-host-pci.c @@ -0,0 +1,45 @@ +/* + * Virtio input host PCI Bindings + * + * This work is licensed under the terms of the GNU GPL, version 2 or + * (at your option) any later version. See the COPYING file in the + * top-level directory. + */ + +#include "qemu/osdep.h" + +#include "virtio-pci.h" +#include "hw/virtio/virtio-input.h" + +typedef struct VirtIOInputHostPCI VirtIOInputHostPCI; + +#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) + +struct VirtIOInputHostPCI { + VirtIOPCIProxy parent_obj; + VirtIOInputHost vdev; +}; + +static void virtio_input_host_initfn(Object *obj) +{ + VirtIOInputHostPCI *dev = VIRTIO_INPUT_HOST_PCI(obj); + + virtio_instance_init_common(obj, &dev->vdev, sizeof(dev->vdev), + TYPE_VIRTIO_INPUT_HOST); +} + +static const TypeInfo virtio_input_host_pci_info = { + .name = TYPE_VIRTIO_INPUT_HOST_PCI, + .parent = TYPE_VIRTIO_INPUT_PCI, + .instance_size = sizeof(VirtIOInputHostPCI), + .instance_init = virtio_input_host_initfn, +}; + +static void virtio_input_host_pci_register(void) +{ + type_register_static(&virtio_input_host_pci_info); +} + +type_init(virtio_input_host_pci_register) diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c index 56b39a3699..97e40da9e8 100644 --- a/hw/virtio/virtio-pci.c +++ b/hw/virtio/virtio-pci.c @@ -2580,23 +2580,6 @@ static const TypeInfo virtio_tablet_pci_info = { .instance_init = virtio_tablet_initfn, }; -#ifdef CONFIG_LINUX -static void virtio_host_initfn(Object *obj) -{ - VirtIOInputHostPCI *dev = VIRTIO_INPUT_HOST_PCI(obj); - - virtio_instance_init_common(obj, &dev->vdev, sizeof(dev->vdev), - TYPE_VIRTIO_INPUT_HOST); -} - -static const TypeInfo virtio_host_pci_info = { - .name = TYPE_VIRTIO_INPUT_HOST_PCI, - .parent = TYPE_VIRTIO_INPUT_PCI, - .instance_size = sizeof(VirtIOInputHostPCI), - .instance_init = virtio_host_initfn, -}; -#endif - /* virtio-pci-bus */ static void virtio_pci_bus_new(VirtioBusState *bus, size_t bus_size, @@ -2650,9 +2633,6 @@ static void virtio_pci_register_types(void) type_register_static(&virtio_keyboard_pci_info); type_register_static(&virtio_mouse_pci_info); type_register_static(&virtio_tablet_pci_info); -#ifdef CONFIG_LINUX - type_register_static(&virtio_host_pci_info); -#endif type_register_static(&virtio_pci_bus_info); type_register_static(&virtio_pci_info); #ifdef CONFIG_VIRTFS diff --git a/hw/virtio/virtio-pci.h b/hw/virtio/virtio-pci.h index 25d225bc7d..cf4cbecfab 100644 --- a/hw/virtio/virtio-pci.h +++ b/hw/virtio/virtio-pci.h @@ -50,7 +50,6 @@ typedef struct VHostUserBlkPCI VHostUserBlkPCI; typedef struct VirtIORngPCI VirtIORngPCI; typedef struct VirtIOInputPCI VirtIOInputPCI; typedef struct VirtIOInputHIDPCI VirtIOInputHIDPCI; -typedef struct VirtIOInputHostPCI VirtIOInputHostPCI; typedef struct VirtIOGPUPCI VirtIOGPUPCI; typedef struct VirtIOCryptoPCI VirtIOCryptoPCI; @@ -359,19 +358,6 @@ struct VirtIOInputHIDPCI { VirtIOInputHID vdev; }; -#ifdef CONFIG_LINUX - -#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) - -struct VirtIOInputHostPCI { - VirtIOPCIProxy parent_obj; - VirtIOInputHost vdev; -}; - -#endif - /* * virtio-gpu-pci: This extends VirtioPCIProxy. */
Signed-off-by: Juan Quintela <quintela@redhat.com> --- default-configs/virtio.mak | 1 + hw/virtio/Makefile.objs | 1 + hw/virtio/virtio-input-host-pci.c | 45 +++++++++++++++++++++++++++++++ hw/virtio/virtio-pci.c | 20 -------------- hw/virtio/virtio-pci.h | 14 ---------- 5 files changed, 47 insertions(+), 34 deletions(-) create mode 100644 hw/virtio/virtio-input-host-pci.c