Re: [PULL 50/55] virtfs: convert to meson

[Bruce Rogers]

On Thu, 2021-01-07 at 15:49 +0100, Paolo Bonzini wrote:
> On 07/01/21 14:58, Bruce Rogers wrote:
> > I noticed that for me, this broke the building of virtfs-proxy-
> > helper.
> > I've not yet figured out what the fix should be, but thought you'd
> > want
> > to know.
> 
> Possibly:
> 
> diff --git a/fsdev/meson.build b/fsdev/meson.build
> index 7dd1cc9bfb..65455a179e 100644
> --- a/fsdev/meson.build
> +++ b/fsdev/meson.build
> @@ -8,7 +8,7 @@ fsdev_ss.add(when: ['CONFIG_FSDEV_9P'], if_true:
> files(
>   ), if_false: files('qemu-fsdev-dummy.c'))
>   softmmu_ss.add_all(when: 'CONFIG_LINUX', if_true: fsdev_ss)
> 
> -have_virtfs_proxy_helper = have_tools and libattr.found() and 
> libcap_ng.found() and 'CONFIG_VIRTFS' in config_host
> +have_virtfs_proxy_helper = have_tools and libattr.found() and 
> libcap_ng.found() and have_virtfs
>   if have_virtfs_proxy_helper
>     executable('virtfs-proxy-helper',
>                files('virtfs-proxy-helper.c', '9p-marshal.c', 
> '9p-iov-marshal.c'),
> diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build
> index 450af3e51c..b8e19bbc81 100644
> --- a/tests/qtest/meson.build
> +++ b/tests/qtest/meson.build
> @@ -199,7 +199,9 @@ qos_test_ss.add(
>     'virtio-serial-test.c',
>     'vmxnet3-test.c',
>   )
> -qos_test_ss.add(when: 'CONFIG_VIRTFS', if_true: files('virtio-9p-
> test.c'))
> +if have_virtfs
> +  qos_test_ss.add(files('virtio-9p-test.c'))
> +endif
>   qos_test_ss.add(when: 'CONFIG_VHOST_USER', if_true: 
> files('vhost-user-test.c'))
> 
>   tpmemu_files = ['tpm-emu.c', 'tpm-util.c', 'tpm-tests.c']
> 
> Since CONFIG_VIRTFS does not exist anymore.  Sorry.
> 
> Paolo
> 

Looks like that solves the issue. Thanks.
- Bruce