Re: [PATCH v14 1/8] net/vmnet: add vmnet dependency and customizable option

[Akihiko Odaki <akihiko.odaki@gmail.com>]

On 2022/02/26 1:52, Vladislav Yaroshchuk wrote:
> vmnet.framework dependency is added with 'vmnet' option
> to enable or disable it. Default value is 'auto'.
> 
> vmnet features to be used are available since macOS 11.0,
> corresponding probe is created into meson.build.
> 
> Signed-off-by: Vladislav Yaroshchuk <Vladislav.Yaroshchuk@jetbrains.com>
> ---
>   meson.build                   | 16 +++++++++++++++-
>   meson_options.txt             |  2 ++
>   scripts/meson-buildoptions.sh |  3 +--
>   3 files changed, 18 insertions(+), 3 deletions(-)
> 
> diff --git a/meson.build b/meson.build
> index 8df40bfac4..d3a791e6c4 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -522,6 +522,18 @@ if cocoa.found() and get_option('gtk').enabled()
>     error('Cocoa and GTK+ cannot be enabled at the same time')
>   endif
>   
> +vmnet = dependency('appleframeworks', modules: 'vmnet', required: get_option('vmnet'))
> +if vmnet.found() and not cc.has_header_symbol('vmnet/vmnet.h',
> +                                              'VMNET_BRIDGED_MODE',
> +                                              dependencies: vmnet)
> +  vmnet = not_found
> +  if get_option('vmnet').enabled()
> +    error('vmnet.framework API is outdated')
> +  else
> +    warning('vmnet.framework API is outdated, disabling')
> +  endif
> +endif
> +
>   seccomp = not_found
>   if not get_option('seccomp').auto() or have_system or have_tools
>     seccomp = dependency('libseccomp', version: '>=2.3.0',
> @@ -1536,6 +1548,7 @@ config_host_data.set('CONFIG_SNAPPY', snappy.found())
>   config_host_data.set('CONFIG_TPM', have_tpm)
>   config_host_data.set('CONFIG_USB_LIBUSB', libusb.found())
>   config_host_data.set('CONFIG_VDE', vde.found())
> +config_host_data.set('CONFIG_VMNET', vmnet.found())
>   config_host_data.set('CONFIG_VHOST_USER_BLK_SERVER', have_vhost_user_blk_server)
>   config_host_data.set('CONFIG_VNC', vnc.found())
>   config_host_data.set('CONFIG_VNC_JPEG', jpeg.found())
> @@ -3564,7 +3577,8 @@ summary(summary_info, bool_yn: true, section: 'Crypto')
>   # Libraries
>   summary_info = {}
>   if targetos == 'darwin'
> -  summary_info += {'Cocoa support':   cocoa}
> +  summary_info += {'Cocoa support':           cocoa}
> +  summary_info += {'vmnet.framework support': vmnet}
>   endif
>   summary_info += {'SDL support':       sdl}
>   summary_info += {'SDL image support': sdl_image}
> diff --git a/meson_options.txt b/meson_options.txt
> index 52b11cead4..d2c0b6b412 100644
> --- a/meson_options.txt
> +++ b/meson_options.txt
> @@ -175,6 +175,8 @@ option('netmap', type : 'feature', value : 'auto',
>          description: 'netmap network backend support')
>   option('vde', type : 'feature', value : 'auto',
>          description: 'vde network backend support')
> +option('vmnet', type : 'feature', value : 'auto',
> +       description: 'vmnet.framework network backend support')
>   option('virglrenderer', type : 'feature', value : 'auto',
>          description: 'virgl rendering support')
>   option('vnc', type : 'feature', value : 'auto',
> diff --git a/scripts/meson-buildoptions.sh b/scripts/meson-buildoptions.sh
> index 9ee684ef03..7c37f13384 100644
> --- a/scripts/meson-buildoptions.sh
> +++ b/scripts/meson-buildoptions.sh
> @@ -116,6 +116,7 @@ meson_options_help() {
>     printf "%s\n" '  usb-redir       libusbredir support'
>     printf "%s\n" '  vde             vde network backend support'
>     printf "%s\n" '  vdi             vdi image format support'
> +  printf "%s\n" '  vmnet           vmnet.framework network backend support'
>     printf "%s\n" '  vhost-user-blk-server'
>     printf "%s\n" '                  build vhost-user-blk server'
>     printf "%s\n" '  virglrenderer   virgl rendering support'
> @@ -333,8 +334,6 @@ _meson_option_parse() {
>       --disable-usb-redir) printf "%s" -Dusb_redir=disabled ;;
>       --enable-vde) printf "%s" -Dvde=enabled ;;
>       --disable-vde) printf "%s" -Dvde=disabled ;;
> -    --enable-vdi) printf "%s" -Dvdi=enabled ;;
> -    --disable-vdi) printf "%s" -Dvdi=disabled ;;
>       --enable-vhost-user-blk-server) printf "%s" -Dvhost_user_blk_server=enabled ;;
>       --disable-vhost-user-blk-server) printf "%s" -Dvhost_user_blk_server=disabled ;;
>       --enable-virglrenderer) printf "%s" -Dvirglrenderer=enabled ;;

--enable-vdi and --disable-vdi are mistakenly dropped.