Re: [Qemu-devel] [PATCH 2/2] qemu-options: Deprecate -nodefconfig

[Markus Armbruster <armbru@redhat.com>]

Eduardo Habkost <ehabkost@redhat.com> writes:

> Since 2012 (commit ba6212d8 "Eliminate cpus-x86_64.conf file") we
> have no default config files that would be disabled using
> -nodefconfig.  Update documentation and document -nodefconfig as
> deprecated.
>
> Cc: Markus Armbruster <armbru@redhat.com>
> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
> ---
>  qemu-options.hx | 13 +++++++------
>  1 file changed, 7 insertions(+), 6 deletions(-)
>
> diff --git a/qemu-options.hx b/qemu-options.hx
> index 39225ae6c3..bc52e79184 100644
> --- a/qemu-options.hx
> +++ b/qemu-options.hx
> @@ -4069,24 +4069,25 @@ output to stdout. This can be later used as input file for @code{-readconfig} op
>  ETEXI
>  DEF("nodefconfig", 0, QEMU_OPTION_nodefconfig,
>      "-nodefconfig\n"
> -    "                do not load default config files at startup\n",
> +    "                do not load default config files at startup (deprecated)\n",
>      QEMU_ARCH_ALL)

Suggest to go one step farther:

   HXCOMM Deprecated, same as -no-user-config
   DEF("nodefconfig", 0, QEMU_OPTION_nodefconfig, "", QEMU_ARCH_ALL)

If you do, STEXI ... ETEXI needs to go, too.

>  STEXI
>  @item -nodefconfig
>  @findex -nodefconfig
> -Normally QEMU loads configuration files from @var{sysconfdir} and @var{datadir} at startup.
> -The @code{-nodefconfig} option will prevent QEMU from loading any of those config files.
> +This option was used to disable loading of config files from @var{sysconfdir}
> +and @var{datadir}, but it is deprecated as QEMU doesn't load any config files
> +from @var{datadir} anymore.  To disable loading of config files from
> +@var{sysconfdir}, use @code{-no-user-config} instead.
>  ETEXI

This information needs should (also) go into appendix "Deprecated
features", as Daniel pointed out.

>  DEF("no-user-config", 0, QEMU_OPTION_nouserconfig,
>      "-no-user-config\n"
> -    "                do not load user-provided config files at startup\n",
> +    "                do not load default user-provided config files at startup\n",
>      QEMU_ARCH_ALL)
>  STEXI
>  @item -no-user-config
>  @findex -no-user-config
>  The @code{-no-user-config} option makes QEMU not load any of the user-provided
> -config files on @var{sysconfdir}, but won't make it skip the QEMU-provided config
> -files from @var{datadir}.
> +config files on @var{sysconfdir}.

s/on/in/

>  ETEXI
>  DEF("trace", HAS_ARG, QEMU_OPTION_trace,
>      "-trace [[enable=]<pattern>][,events=<file>][,file=<file>]\n"