On 14/10/21 01:04, Will Cohen wrote:
> From: Keno Fischer <keno@juliacomputing.com>
>
> Signed-off-by: Keno Fischer <keno@juliacomputing.com>
> Signed-off-by: Michael Roitzsch <reactorcontrol@icloud.com>
> ---
> fsdev/meson.build | 1 +
> meson.build | 17 ++++++++++-------
> 2 files changed, 11 insertions(+), 7 deletions(-)
>
> diff --git a/fsdev/meson.build b/fsdev/meson.build
> index adf57cc43e..b632b66348 100644
> --- a/fsdev/meson.build
> +++ b/fsdev/meson.build
> @@ -7,6 +7,7 @@ fsdev_ss.add(when: ['CONFIG_FSDEV_9P'], if_true: files(
> 'qemu-fsdev.c',
> ), if_false: files('qemu-fsdev-dummy.c'))
> softmmu_ss.add_all(when: 'CONFIG_LINUX', if_true: fsdev_ss)
> +softmmu_ss.add_all(when: 'CONFIG_DARWIN', if_true: fsdev_ss)
>
> if have_virtfs_proxy_helper
> executable('virtfs-proxy-helper',
> diff --git a/meson.build b/meson.build
> index 99a0a3e689..5e777b271d 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -1203,17 +1203,20 @@ have_host_block_device = (targetos != 'darwin' or
> # config-host.h #
> #################
>
> -have_virtfs = (targetos == 'linux' and
> - have_system and
> - libattr.found() and
> - libcap_ng.found())
> +if targetos == 'linux'
> + have_virtfs = (have_system and
> + libattr.found() and
> + libcap_ng.found())
> +elif targetos == 'darwin'
> + have_virtfs = have_system
> +endif
>
> -have_virtfs_proxy_helper = have_virtfs and have_tools
> +have_virtfs_proxy_helper = targetos == 'linux' and have_virtfs and have_tools
>
> if get_option('virtfs').enabled()
> if not have_virtfs
> - if targetos != 'linux'
> - error('virtio-9p (virtfs) requires Linux')
> + if targetos != 'linux' and targetos != 'darwin'
> + error('virtio-9p (virtfs) requires Linux or Darwin')
> elif not libcap_ng.found() or not libattr.found()
> error('virtio-9p (virtfs) requires libcap-ng-devel and libattr-devel')
> elif not have_system
>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>