Re: [PATCH v2] docs: build-system: rename "default-configs" to "configs"

[Thomas Huth <thuth@redhat.com>]

On 23/05/2023 15.31, Kashyap Chamarthy wrote:
> Commit 812b31d3f9 (configs: rename default-configs to configs and
> reorganise, 2021-07-07) did the rename.
> 
> Reflect that update also in the documentation.
> 
> Signed-off-by: Kashyap Chamarthy <kchamart@redhat.com>
> ---
>   docs/devel/build-system.rst | 12 +++++------
>   docs/devel/kconfig.rst      | 40 ++++++++++++++++++++-----------------
>   2 files changed, 28 insertions(+), 24 deletions(-)
> 
> diff --git a/docs/devel/build-system.rst b/docs/devel/build-system.rst
> index 1894721743..20ebcc9ac6 100644
> --- a/docs/devel/build-system.rst
> +++ b/docs/devel/build-system.rst
...
> @@ -457,7 +457,7 @@ Built by Meson:
>     TARGET-NAME is again the name of a system or userspace emulator. The
>     config-devices.mak file is automatically generated by make using the
>     scripts/make_device_config.sh program, feeding it the
> -  default-configs/$TARGET-NAME file as input.
> +  configs/$TARGET-NAME file as input.

This hunk does not apply anymore - but I think it can simply be dropped now.

>   ``config-host.h``, ``$TARGET_NAME-config-target.h``, ``$TARGET_NAME-config-devices.h``
>     These files are used by source code to determine what features are
> diff --git a/docs/devel/kconfig.rst b/docs/devel/kconfig.rst
> index e3a544e463..73118e5106 100644
> --- a/docs/devel/kconfig.rst
> +++ b/docs/devel/kconfig.rst
> @@ -38,11 +38,11 @@ originated in the Linux kernel, though it was heavily simplified and
>   the handling of dependencies is stricter in QEMU.
>   
>   Unlike Linux, there is no user interface to edit the configuration, which
> -is instead specified in per-target files under the ``default-configs/``
> +is instead specified in per-target files under the ``configs/target/``

I think the Kconfig-related files are rather the ones in configs/devices/ , 
so I'd use that directory here instead.

>   directory of the QEMU source tree.  This is because, unlike Linux,
> -configuration and dependencies can be treated as a black box when building
> -QEMU; the default configuration that QEMU ships with should be okay in
> -almost all cases.
> +configuration and dependencies can be treated as a black box when
> +building QEMU; the default configuration that QEMU ships with should be
> +okay in almost all cases.

Why did you change the above three lines?

>   The Kconfig language
>   --------------------
> @@ -103,11 +103,12 @@ directives can be included:
>   **default value**: ``default <value> [if <expr>]``
>   
>     Default values are assigned to the config symbol if no other value was
> -  set by the user via ``default-configs/*.mak`` files, and only if
> -  ``select`` or ``depends on`` directives do not force the value to true
> -  or false respectively.  ``<value>`` can be ``y`` or ``n``; it cannot
> -  be an arbitrary Boolean expression.  However, a condition for applying
> -  the default value can be added with ``if``.
> +  set by the user via
> +  ``configs/devices/TARGETNAME-softmmu/*.mak`` files, and only
> +  if ``select`` or ``depends on`` directives do not force the value to
> +  true or false respectively.  ``<value>`` can be ``y`` or ``n``; it
> +  cannot be an arbitrary Boolean expression.  However, a condition for
> +  applying the default value can be added with ``if``.
>   
>     A configuration element can have any number of default values (usually,
>     if more than one default is present, they will have different
> @@ -119,8 +120,8 @@ directives can be included:
>     This is similar to ``select`` as it applies a lower limit of ``y``
>     to another symbol.  However, the lower limit is only a default
>     and the "implied" symbol's value may still be set to ``n`` from a
> -  ``default-configs/*.mak`` files.  The following two examples are
> -  equivalent::
> +  ``configs/devices/TARGETNAME-softmmu/*.mak`` files.  The following
> +  two examples are equivalent::
>   
>       config FOO
>         bool
> @@ -146,8 +147,9 @@ declares its dependencies in different ways:
>         bool
>   
>     Subsystems always default to false (they have no ``default`` directive)
> -  and are never visible in ``default-configs/*.mak`` files.  It's
> -  up to other symbols to ``select`` whatever subsystems they require.
> +  and are never visible in ``configs/devices/TARGETNAME-softmmu/*.mak``
> +  files.  It's up to other symbols to ``select`` whatever subsystems
> +  they require.
>   
>     They sometimes have ``select`` directives to bring in other required
>     subsystems or buses.  For example, ``AUX`` (the DisplayPort auxiliary
> @@ -229,7 +231,8 @@ declares its dependencies in different ways:
>     cannot be started at all without it.  It should be listed under
>     ``imply`` if (depending on the QEMU command line) the board may or
>     may not be started without it.  Boards also default to false; they are
> -  enabled by the ``default-configs/*.mak`` for the target they apply to.
> +  enabled by the ``configs/targets/TARGETNAME-softmmu/*.mak`` for the

Should be configs/devices/... here, too, I think.

  Thomas