Re: [PATCH 1/1] hw/s390x: fix build for virtio-9p-ccw

[Cornelia Huck <cohuck@redhat.com>]

On Thu, 18 Feb 2021 04:40:59 +0100
Halil Pasic <pasic@linux.ibm.com> wrote:

> Commit  2c44220d05 ("meson: convert hw/arch*"), which migrated the old
> Makefile.objs to meson.build  accidentally excluded virtio-ccw-9p.c and
> thus the virtio-9p-ccw device from the build (and potentially also
> included the file virtio-ccw-blk.c twice in the source set). And since
> CONFIG_VIRTFS can't be used the way it was used here (see commit
> 2c9dce0196 ("meson: do not use CONFIG_VIRTFS")), the preconditions have
> to be written differently.
> 
> Let's fix this!
> 
> Signed-off-by: Halil Pasic <pasic@linux.ibm.com>
> Fixes: 2c44220d05 ("meson: convert hw/arch*")
> Reported-by: Jakob Naucke <jakob.naucke@ibm.com>
> Cc: qemu-stable@nongnu.org
> ---
>  hw/s390x/meson.build | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/hw/s390x/meson.build b/hw/s390x/meson.build
> index 2a7818d94b..91495b5631 100644
> --- a/hw/s390x/meson.build
> +++ b/hw/s390x/meson.build
> @@ -40,7 +40,9 @@ virtio_ss.add(when: 'CONFIG_VIRTIO_NET', if_true: files('virtio-ccw-net.c'))
>  virtio_ss.add(when: 'CONFIG_VIRTIO_RNG', if_true: files('virtio-ccw-rng.c'))
>  virtio_ss.add(when: 'CONFIG_VIRTIO_SCSI', if_true: files('virtio-ccw-scsi.c'))
>  virtio_ss.add(when: 'CONFIG_VIRTIO_SERIAL', if_true: files('virtio-ccw-serial.c'))
> -virtio_ss.add(when: ['CONFIG_VIRTIO_9P', 'CONFIG_VIRTFS'], if_true: files('virtio-ccw-blk.c'))
> +if have_virtfs
> +  virtio_ss.add(when: 'CONFIG_VIRTIO_9P', if_true: files('virtio-ccw-9p.c'))
> +endif
>  virtio_ss.add(when: 'CONFIG_VHOST_VSOCK', if_true: files('vhost-vsock-ccw.c'))
>  virtio_ss.add(when: 'CONFIG_VHOST_USER_FS', if_true: files('vhost-user-fs-ccw.c'))
>  s390x_ss.add_all(when: 'CONFIG_VIRTIO_CCW', if_true: virtio_ss)
> 
> base-commit: 1af5629673bb5c1592d993f9fb6119a62845f576

Thanks, applied.