* [Qemu-devel] [PATCH 1/2] virtio-input-host-pci: cleanup types
@ 2019-05-09 9:31 Gerd Hoffmann
2019-05-09 9:31 ` [Qemu-devel] [PATCH 2/2] virtio-input: fix Kconfig dependency and Makefile Gerd Hoffmann
2019-05-09 10:27 ` [Qemu-devel] [PATCH 1/2] virtio-input-host-pci: cleanup types Marc-André Lureau
0 siblings, 2 replies; 4+ messages in thread
From: Gerd Hoffmann @ 2019-05-09 9:31 UTC (permalink / raw)
To: qemu-devel; +Cc: Gerd Hoffmann, Michael S. Tsirkin
virtio input is virtio-1.0 only, so we don't need the -transitional and
-non-transitional variants.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
hw/virtio/virtio-input-host-pci.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/hw/virtio/virtio-input-host-pci.c b/hw/virtio/virtio-input-host-pci.c
index 725a51ad30b4..f36d9b7102bc 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,11 +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",
- .parent = TYPE_VIRTIO_INPUT_PCI,
+ .generic_name = TYPE_VIRTIO_INPUT_HOST_PCI,
.instance_size = sizeof(VirtIOInputHostPCI),
.instance_init = virtio_host_initfn,
};
--
2.18.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* [Qemu-devel] [PATCH 2/2] virtio-input: fix Kconfig dependency and Makefile
2019-05-09 9:31 [Qemu-devel] [PATCH 1/2] virtio-input-host-pci: cleanup types Gerd Hoffmann
@ 2019-05-09 9:31 ` Gerd Hoffmann
2019-05-09 10:28 ` Marc-André Lureau
2019-05-09 10:27 ` [Qemu-devel] [PATCH 1/2] virtio-input-host-pci: cleanup types Marc-André Lureau
1 sibling, 1 reply; 4+ messages in thread
From: Gerd Hoffmann @ 2019-05-09 9:31 UTC (permalink / raw)
To: qemu-devel; +Cc: Gerd Hoffmann
Make VIRTIO_INPUT_HOST depend on VIRTIO_INPUT.
Use CONFIG_VIRTIO_INPUT_HOST in Makefile.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
hw/input/Kconfig | 2 +-
hw/input/Makefile.objs | 4 +---
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/hw/input/Kconfig b/hw/input/Kconfig
index 50e55e353847..889363d8aef1 100644
--- a/hw/input/Kconfig
+++ b/hw/input/Kconfig
@@ -27,7 +27,7 @@ config VIRTIO_INPUT
config VIRTIO_INPUT_HOST
bool
default y
- depends on VIRTIO && LINUX
+ depends on VIRTIO_INPUT && LINUX
config VHOST_USER_INPUT
bool
diff --git a/hw/input/Makefile.objs b/hw/input/Makefile.objs
index 3eddf00f2bba..d1de30770854 100644
--- a/hw/input/Makefile.objs
+++ b/hw/input/Makefile.objs
@@ -9,9 +9,7 @@ common-obj-$(CONFIG_TSC2005) += tsc2005.o
common-obj-$(CONFIG_VIRTIO_INPUT) += virtio-input.o
common-obj-$(CONFIG_VIRTIO_INPUT) += virtio-input-hid.o
-ifeq ($(CONFIG_LINUX),y)
-common-obj-$(CONFIG_VIRTIO_INPUT) += virtio-input-host.o
-endif
+common-obj-$(CONFIG_VIRTIO_INPUT_HOST) += virtio-input-host.o
common-obj-$(CONFIG_VHOST_USER_INPUT) += vhost-user-input.o
obj-$(CONFIG_MILKYMIST) += milkymist-softusb.o
--
2.18.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [Qemu-devel] [PATCH 2/2] virtio-input: fix Kconfig dependency and Makefile
2019-05-09 9:31 ` [Qemu-devel] [PATCH 2/2] virtio-input: fix Kconfig dependency and Makefile Gerd Hoffmann
@ 2019-05-09 10:28 ` Marc-André Lureau
0 siblings, 0 replies; 4+ messages in thread
From: Marc-André Lureau @ 2019-05-09 10:28 UTC (permalink / raw)
To: Gerd Hoffmann; +Cc: QEMU
On Thu, May 9, 2019 at 11:31 AM Gerd Hoffmann <kraxel@redhat.com> wrote:
>
> Make VIRTIO_INPUT_HOST depend on VIRTIO_INPUT.
> Use CONFIG_VIRTIO_INPUT_HOST in Makefile.
>
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
> hw/input/Kconfig | 2 +-
> hw/input/Makefile.objs | 4 +---
> 2 files changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/hw/input/Kconfig b/hw/input/Kconfig
> index 50e55e353847..889363d8aef1 100644
> --- a/hw/input/Kconfig
> +++ b/hw/input/Kconfig
> @@ -27,7 +27,7 @@ config VIRTIO_INPUT
> config VIRTIO_INPUT_HOST
> bool
> default y
> - depends on VIRTIO && LINUX
> + depends on VIRTIO_INPUT && LINUX
>
> config VHOST_USER_INPUT
> bool
> diff --git a/hw/input/Makefile.objs b/hw/input/Makefile.objs
> index 3eddf00f2bba..d1de30770854 100644
> --- a/hw/input/Makefile.objs
> +++ b/hw/input/Makefile.objs
> @@ -9,9 +9,7 @@ common-obj-$(CONFIG_TSC2005) += tsc2005.o
>
> common-obj-$(CONFIG_VIRTIO_INPUT) += virtio-input.o
> common-obj-$(CONFIG_VIRTIO_INPUT) += virtio-input-hid.o
> -ifeq ($(CONFIG_LINUX),y)
> -common-obj-$(CONFIG_VIRTIO_INPUT) += virtio-input-host.o
> -endif
> +common-obj-$(CONFIG_VIRTIO_INPUT_HOST) += virtio-input-host.o
> common-obj-$(CONFIG_VHOST_USER_INPUT) += vhost-user-input.o
>
> obj-$(CONFIG_MILKYMIST) += milkymist-softusb.o
> --
> 2.18.1
>
>
--
Marc-André Lureau
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH 1/2] virtio-input-host-pci: cleanup types
2019-05-09 9:31 [Qemu-devel] [PATCH 1/2] virtio-input-host-pci: cleanup types Gerd Hoffmann
2019-05-09 9:31 ` [Qemu-devel] [PATCH 2/2] virtio-input: fix Kconfig dependency and Makefile Gerd Hoffmann
@ 2019-05-09 10:27 ` Marc-André Lureau
1 sibling, 0 replies; 4+ messages in thread
From: Marc-André Lureau @ 2019-05-09 10:27 UTC (permalink / raw)
To: Gerd Hoffmann; +Cc: QEMU, Michael S. Tsirkin
Hi
On Thu, May 9, 2019 at 11:33 AM Gerd Hoffmann <kraxel@redhat.com> wrote:
>
> virtio input is virtio-1.0 only, so we don't need the -transitional and
> -non-transitional variants.
>
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
> ---
> hw/virtio/virtio-input-host-pci.c | 8 ++------
> 1 file changed, 2 insertions(+), 6 deletions(-)
>
> diff --git a/hw/virtio/virtio-input-host-pci.c b/hw/virtio/virtio-input-host-pci.c
> index 725a51ad30b4..f36d9b7102bc 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,11 +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",
> - .parent = TYPE_VIRTIO_INPUT_PCI,
nack, without the parent field it doesn't work
> + .generic_name = TYPE_VIRTIO_INPUT_HOST_PCI,
> .instance_size = sizeof(VirtIOInputHostPCI),
> .instance_init = virtio_host_initfn,
> };
> --
> 2.18.1
>
>
--
Marc-André Lureau
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-05-09 10:29 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-05-09 9:31 [Qemu-devel] [PATCH 1/2] virtio-input-host-pci: cleanup types Gerd Hoffmann
2019-05-09 9:31 ` [Qemu-devel] [PATCH 2/2] virtio-input: fix Kconfig dependency and Makefile Gerd Hoffmann
2019-05-09 10:28 ` Marc-André Lureau
2019-05-09 10:27 ` [Qemu-devel] [PATCH 1/2] virtio-input-host-pci: cleanup types Marc-André Lureau
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).