Re: [PATCH v6 1/4] Add NVMM accelerator: configure and build logic

[Paolo Bonzini]

On 31/03/21 22:07, Reinoud Zandijk wrote:
> Signed-off-by: Reinoud Zandijk <reinoud@NetBSD.org>
> Signed-off-by: Kamil Rytarowski <kamil@NetBSD.org>

Incorrect order for the S-o-b headers, you should be last.

> ---
> @@ -886,7 +887,7 @@ for opt do
>     ;;
>     --python=*) python="$optarg" ; explicit_python=yes
>     ;;
> -  --sphinx-build=*) sphinx_build="$optarg"
> +  --sphinx-build-3.8-3.8=*) sphinx_build="$optarg"

Oops. :)  Another occurrence later.

> diff --git a/meson.build b/meson.build
> index c6f4b0cf5e..e33face775 100644
> --- a/meson.build
> +++ b/meson.build

The meson.build parts can be simplified by applying this patch:

diff --git a/meson.build b/meson.build
index e33face775..c4600a46a6 100644
--- a/meson.build
+++ b/meson.build
@@ -171,7 +171,7 @@ version_res = []
 coref = []
 iokit = []
 emulator_link_args = []
-nvmm = []
+nvmm = not_found
 hvf = not_found
 if targetos == 'windows'
   socket = cc.find_library('ws2_32')
@@ -197,12 +197,6 @@ elif targetos == 'openbsd'
     # Disable OpenBSD W^X if available
     emulator_link_args = 
cc.get_supported_link_arguments('-Wl,-z,wxneeded')
   endif
-elif targetos == 'netbsd'
-  if not get_option('nvmm').disabled()
-    if cc.has_header('nvmm.h')
-      nvmm = cc.find_library('nvmm')
-    endif
-  endif
 endif

 accelerators = []
@@ -235,8 +229,11 @@ if not get_option('hax').disabled()
     accelerators += 'CONFIG_HAX'
   endif
 endif
-if not get_option('nvmm').disabled()
+if targetos == 'netbsd'
   if cc.has_header('nvmm.h', required: get_option('nvmm'))
+    nvmm = cc.find_library('nvmm', required: get_option('nvmm'))
+  endif
+  if nvmm.found()
     accelerators += 'CONFIG_NVMM'
   endif
 endif
@@ -2242,7 +2239,7 @@ foreach target : target_dirs
       'name': 'qemu-system-' + target_name,
       'gui': false,
       'sources': files('softmmu/main.c'),
-      'dependencies': [nvmm]
+      'dependencies': []
     }]
     if targetos == 'windows' and (sdl.found() or gtk.found())
       execs += [{


> @@ -607,7 +623,7 @@ if have_system and not get_option('curses').disabled()
>         has_curses_h = cc.has_header('curses.h', args: curses_compile_args)
>       endif
>       if has_curses_h
> -      curses_libname_list = (targetos == 'windows' ? ['pdcurses'] : 
> ['ncursesw', 'cursesw'])
> +      curses_libname_list = (targetos == 'windows' ? ['pdcurses'] : 
> ['ncursesw', 'cursesw', 'curses'])
>         foreach curses_libname : curses_libname_list
>           libcurses = cc.find_library(curses_libname,
>                                       required: false,
> @@ -625,7 +641,7 @@ if have_system and not get_option('curses').disabled()
>       endif
>     endif
>     if not get_option('iconv').disabled()
> -    foreach link_args : [ ['-liconv'], [] ]
> +    foreach link_args : [ [], ['-liconv'] ]
>         # Programs will be linked with glib and this will bring in libiconv on 
> FreeBSD.
>         # We need to use libiconv if available because mixing libiconv's 
> headers with
>         # the system libc does not work.

Independent changes, should be posted separately.

> @@ -2226,7 +2242,7 @@ foreach target : target_dirs
>         'name': 'qemu-system-' + target_name,
>         'gui': false,
>         'sources': files('softmmu/main.c'),
> -      'dependencies': []
> +      'dependencies': [nvmm]
>       }]
>       if targetos == 'windows' and (sdl.found() or gtk.found())
>         execs += [{

Not needed yet, should be added together with the nvmm sources to the 
sourceset.

Paolo