Re: [Qemu-devel] [PATCH 09/14] check: Only test virtio-balloon when it is compiled in

[Cornelia Huck]

On Tue, 17 Jul 2018 14:04:09 +0200
Juan Quintela <address@hidden> wrote:

> Signed-off-by: Juan Quintela <address@hidden>
> ---
>  hw/virtio/virtio-pci.c | 5 ++++-
>  tests/Makefile.include | 6 +++---
>  2 files changed, 7 insertions(+), 4 deletions(-)
> 
> diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c
> index 3a01fe90f0..bdbc7ab78d 100644
> --- a/hw/virtio/virtio-pci.c
> +++ b/hw/virtio/virtio-pci.c
> @@ -2287,7 +2287,7 @@ static const TypeInfo vhost_vsock_pci_info = {
>  #endif
>  
>  /* virtio-balloon-pci */
> -
> +#ifdef CONFIG_VIRTIO_BALLOON
>  static Property virtio_balloon_pci_properties[] = {
>      DEFINE_PROP_UINT32("class", VirtIOPCIProxy, class_code, 0),
>      DEFINE_PROP_END_OF_LIST(),
> @@ -2341,6 +2341,7 @@ static const TypeInfo virtio_balloon_pci_info = {
>      .instance_init = virtio_balloon_pci_instance_init,
>      .class_init    = virtio_balloon_pci_class_init,
>  };
> +#endif
>  
>  /* virtio-serial-pci */
>  
> @@ -2711,7 +2712,9 @@ static void virtio_pci_register_types(void)
>      type_register_static(&vhost_user_blk_pci_info);
>  #endif
>      type_register_static(&virtio_scsi_pci_info);
> +#ifdef CONFIG_VIRTIO_BALLOON
>      type_register_static(&virtio_balloon_pci_info);
> +#endif
>      type_register_static(&virtio_serial_pci_info);
>      type_register_static(&virtio_net_pci_info);
>  #ifdef CONFIG_VHOST_SCSI

You only make virtio-balloon-pci conditional...

> diff --git a/tests/Makefile.include b/tests/Makefile.include
> index 9193945c24..bb30c56795 100644
> --- a/tests/Makefile.include
> +++ b/tests/Makefile.include
> @@ -191,8 +191,8 @@ gcov-files-virtioserial-y += hw/char/virtio-console.c
>  gcov-files-virtio-y += i386-softmmu/hw/virtio/virtio.c
>  check-qtest-virtio-y += tests/virtio-net-test$(EXESUF)
>  gcov-files-virtio-y += i386-softmmu/hw/net/virtio-net.c
> -check-qtest-virtio-y += tests/virtio-balloon-test$(EXESUF)
> -gcov-files-virtio-y += i386-softmmu/hw/virtio/virtio-balloon.c
> +check-qtest-virtio-$(CONFIG_VIRTIO_BALLOON) += 
> tests/virtio-balloon-test$(EXESUF)
> +gcov-files-virtio-$(CONFIG_VIRTIO_BALLOON) += 
> i386-softmmu/hw/virtio/virtio-balloon.c
>  check-qtest-virtio-y += tests/virtio-blk-test$(EXESUF)
>  gcov-files-virtio-y += i386-softmmu/hw/block/virtio-blk.c
>  check-qtest-virtio-y += tests/virtio-rng-test$(EXESUF)
> @@ -397,7 +397,7 @@ check-qtest-s390x-$(CONFIG_SLIRP) += 
> tests/test-netfilter$(EXESUF)
>  check-qtest-s390x-$(CONFIG_POSIX) += tests/test-filter-mirror$(EXESUF)
>  check-qtest-s390x-$(CONFIG_POSIX) += tests/test-filter-redirector$(EXESUF)
>  check-qtest-s390x-y += tests/drive_del-test$(EXESUF)
> -check-qtest-s390x-y += tests/virtio-balloon-test$(EXESUF)
> +check-qtest-s390x-$(CONFIG_VIRTIO_BALLOON) += 
> tests/virtio-balloon-test$(EXESUF)

...but the test uses virtio-balloon-ccw on s390x.

>  check-qtest-s390x-y += tests/virtio-console-test$(EXESUF)
>  check-qtest-s390x-y += tests/virtio-serial-test$(EXESUF)
>  check-qtest-s390x-y += tests/cpu-plug-test$(EXESUF)

Same for the other virtio device types.