meson: Do not define CONFIG_DEVICES on user emulation

[PATCH] meson: Do not define CONFIG_DEVICES on user emulation

Philippe Mathieu-Daudé posted 1 patch 1 year, 1 month ago

Download mbox

Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20241218151256.68625-1-philmd@linaro.org

Maintainers: Paolo Bonzini <pbonzini@redhat.com>, "Marc-André Lureau" <marcandre.lureau@redhat.com>, "Daniel P. Berrangé" <berrange@redhat.com>, "Philippe Mathieu-Daudé" <philmd@linaro.org>

meson.build | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

Expand all Fold all

[PATCH] meson: Do not define CONFIG_DEVICES on user emulation

Posted by Philippe Mathieu-Daudé 1 year, 1 month ago

CONFIG_DEVICES is not generated on user emulation, so
do not define it.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 meson.build | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index 85f74854735..d203e85d769 100644
--- a/meson.build
+++ b/meson.build
@@ -4110,7 +4110,7 @@ foreach target : target_dirs
   arch_deps = []
   c_args = ['-DCOMPILING_PER_TARGET',
             '-DCONFIG_TARGET="@0@-config-target.h"'.format(target),
-            '-DCONFIG_DEVICES="@0@-config-devices.h"'.format(target)]
+  ]
   link_args = emulator_link_args
 
   target_inc = [include_directories('target' / config_target['TARGET_BASE_ARCH'])]
@@ -4130,6 +4130,7 @@ foreach target : target_dirs
       arch_deps += hw.dependencies()
     endif
 
+    c_args += ['-DCONFIG_DEVICES="@0@-config-devices.h"'.format(target)]
     arch_srcs += config_devices_h[target]
     link_args += ['@block.syms', '@qemu.syms']
   else
-- 
2.45.2

Re: [PATCH] meson: Do not define CONFIG_DEVICES on user emulation

Posted by Philippe Mathieu-Daudé 1 year, 1 month ago

On 18/12/24 16:12, Philippe Mathieu-Daudé wrote:
> CONFIG_DEVICES is not generated on user emulation, so
> do not define it.
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   meson.build | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)

Patch queued, thanks.

Re: [PATCH] meson: Do not define CONFIG_DEVICES on user emulation

Posted by Richard Henderson 1 year, 1 month ago

On 12/18/24 09:12, Philippe Mathieu-Daudé wrote:
> CONFIG_DEVICES is not generated on user emulation, so
> do not define it.
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   meson.build | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/meson.build b/meson.build
> index 85f74854735..d203e85d769 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -4110,7 +4110,7 @@ foreach target : target_dirs
>     arch_deps = []
>     c_args = ['-DCOMPILING_PER_TARGET',
>               '-DCONFIG_TARGET="@0@-config-target.h"'.format(target),
> -            '-DCONFIG_DEVICES="@0@-config-devices.h"'.format(target)]
> +  ]
>     link_args = emulator_link_args
>   
>     target_inc = [include_directories('target' / config_target['TARGET_BASE_ARCH'])]
> @@ -4130,6 +4130,7 @@ foreach target : target_dirs
>         arch_deps += hw.dependencies()
>       endif
>   
> +    c_args += ['-DCONFIG_DEVICES="@0@-config-devices.h"'.format(target)]
>       arch_srcs += config_devices_h[target]
>       link_args += ['@block.syms', '@qemu.syms']
>     else

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>

r~