Re: [PATCH v5 44/69] accel/nvmm: Expose nvmm_enabled() to common code

["Philippe Mathieu-Daudé" <philmd@linaro.org>]

On 3/7/25 12:55, Philippe Mathieu-Daudé wrote:
> Currently nvmm_enabled() is restricted to target-specific code.
> By defining CONFIG_NVMM_IS_POSSIBLE we allow its use anywhere.
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
> ---
>   include/system/nvmm.h       | 23 ++++++++++++-----------
>   accel/stubs/nvmm-stub.c     | 12 ++++++++++++
>   target/i386/nvmm/nvmm-all.c |  6 ------
>   accel/stubs/meson.build     |  1 +
>   4 files changed, 25 insertions(+), 17 deletions(-)
>   create mode 100644 accel/stubs/nvmm-stub.c
> 
> diff --git a/include/system/nvmm.h b/include/system/nvmm.h
> index 6971ddb3a5a..7390def9adb 100644
> --- a/include/system/nvmm.h
> +++ b/include/system/nvmm.h
> @@ -13,17 +13,18 @@
>   #define QEMU_NVMM_H
>   
>   #ifdef COMPILING_PER_TARGET
> -
> -#ifdef CONFIG_NVMM
> -
> -int nvmm_enabled(void);
> -
> -#else /* CONFIG_NVMM */
> -
> -#define nvmm_enabled() (0)
> -
> -#endif /* CONFIG_NVMM */
> -
> +# ifdef CONFIG_NVMM
> +#  define CONFIG_NVMM_IS_POSSIBLE
> +# endif /* !CONFIG_NVMM */
> +#else
> +# define CONFIG_NVMM_IS_POSSIBLE
>   #endif /* COMPILING_PER_TARGET */
>   
> +#ifdef CONFIG_NVMM_IS_POSSIBLE
> +extern bool nvmm_allowed;
> +#define nvmm_enabled() (nvmm_allowed)
> +#else /* !CONFIG_NVMM_IS_POSSIBLE */
> +#define nvmm_enabled() 0
> +#endif /* !CONFIG_NVMM_IS_POSSIBLE */
> +
>   #endif /* QEMU_NVMM_H */
> diff --git a/accel/stubs/nvmm-stub.c b/accel/stubs/nvmm-stub.c
> new file mode 100644
> index 00000000000..cc58114ceb3
> --- /dev/null
> +++ b/accel/stubs/nvmm-stub.c
> @@ -0,0 +1,12 @@
> +/*
> + * NVMM stubs for QEMU
> + *
> + *  Copyright (c) Linaro
> + *
> + * SPDX-License-Identifier: GPL-2.0-or-later
> + */
> +
> +#include "qemu/osdep.h"
> +#include "system/hvf.h"
> +
> +bool nvmm_allowed;

Consider this missing hunk squashed:

-- >8 --
diff --git a/target/i386/nvmm/nvmm-all.c b/target/i386/nvmm/nvmm-all.c
index a392d3fc232..b4a4d50e860 100644
--- a/target/i386/nvmm/nvmm-all.c
+++ b/target/i386/nvmm/nvmm-all.c
@@ -49 +49 @@ struct qemu_machine {
-static bool nvmm_allowed;
+bool nvmm_allowed;
---