[PATCH 0/2] meson: fix device module builds

[PATCH 0/2] meson: fix device module builds

[Gerd Hoffmann]

Gerd Hoffmann (2):
  meson: fix module config
  meson: remove duplicate qxl sources

 hw/display/meson.build | 2 --
 meson.build            | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

-- 
2.27.0

[PATCH 1/2] meson: fix module config

[Gerd Hoffmann]

Use all config symbols not only the host ones.
Needed to make sure device configs like CONFIG_QXL
are used for modules too.

Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index 5aaa3647305d..837061cdfff6 100644
--- a/meson.build
+++ b/meson.build
@@ -844,7 +844,7 @@ softmmu_mods = []
 foreach d, list : modules
   foreach m, module_ss : list
     if enable_modules and targetos != 'windows'
-      module_ss = module_ss.apply(config_host, strict: false)
+      module_ss = module_ss.apply(config_all, strict: false)
       sl = static_library(d + '-' + m, [genh, module_ss.sources()],
                           dependencies: [modulecommon, module_ss.dependencies()], pic: true)
       if d == 'block'
-- 
2.27.0

[PATCH 2/2] meson: remove duplicate qxl sources

[Gerd Hoffmann]

We should add sources to the softmmu_ss or module_ss but not both.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 hw/display/meson.build | 2 --
 1 file changed, 2 deletions(-)

diff --git a/hw/display/meson.build b/hw/display/meson.build
index 78adaf9db463..ef8eb093acbb 100644
--- a/hw/display/meson.build
+++ b/hw/display/meson.build
@@ -45,8 +45,6 @@ if config_all_devices.has_key('CONFIG_QXL')
   hw_display_modules += {'qxl': qxl_ss}
 endif
 
-softmmu_ss.add(when: 'CONFIG_QXL', if_true: files('qxl.c', 'qxl-logger.c', 'qxl-render.c'))
-
 softmmu_ss.add(when: 'CONFIG_DPCD', if_true: files('dpcd.c'))
 softmmu_ss.add(when: 'CONFIG_XLNX_ZYNQMP_ARM', if_true: files('xlnx_dp.c'))
 
-- 
2.27.0

Re: [PATCH 2/2] meson: remove duplicate qxl sources

[Philippe Mathieu-Daudé]

On 9/7/20 9:19 AM, Gerd Hoffmann wrote:
> We should add sources to the softmmu_ss or module_ss but not both.
> 
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
> ---
>  hw/display/meson.build | 2 --
>  1 file changed, 2 deletions(-)
> 
> diff --git a/hw/display/meson.build b/hw/display/meson.build
> index 78adaf9db463..ef8eb093acbb 100644
> --- a/hw/display/meson.build
> +++ b/hw/display/meson.build
> @@ -45,8 +45,6 @@ if config_all_devices.has_key('CONFIG_QXL')
>    hw_display_modules += {'qxl': qxl_ss}
>  endif
>  
> -softmmu_ss.add(when: 'CONFIG_QXL', if_true: files('qxl.c', 'qxl-logger.c', 'qxl-render.c'))
> -
>  softmmu_ss.add(when: 'CONFIG_DPCD', if_true: files('dpcd.c'))
>  softmmu_ss.add(when: 'CONFIG_XLNX_ZYNQMP_ARM', if_true: files('xlnx_dp.c'))
>  

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>