diff options
| author | Eduardo Habkost <ehabkost@redhat.com> | 2017-10-04 00:00:25 -0300 |
|---|---|---|
| committer | Eduardo Habkost <ehabkost@redhat.com> | 2017-10-09 23:21:52 -0300 |
| commit | 3478eae990d0373a5a3614f9293e16ebb50e5cb6 (patch) | |
| tree | b7d6335682951fdf1fc0a077af203b03dcc5e2ca | |
| parent | 1ea06c398cda2600974860ec7020cbbe9682e382 (diff) | |
qemu-options: Deprecate -nodefconfig
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>
Acked-by: Alistair Francis <alistair.francis@xilinx.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Message-Id: <20171004030025.7866-3-ehabkost@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Daniel P. Berrange <berrange@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
| -rw-r--r-- | qemu-doc.texi | 4 | ||||
| -rw-r--r-- | qemu-options.hx | 17 |
2 files changed, 8 insertions, 13 deletions
diff --git a/qemu-doc.texi b/qemu-doc.texi index ecd186a159..d8bb2c664f 100644 --- a/qemu-doc.texi +++ b/qemu-doc.texi @@ -2496,6 +2496,10 @@ would automatically enable USB support on the machine type. If using the new syntax, USB support must be explicitly enabled via the ``-machine usb=on'' argument. +@subsection -nodefconfig (since 2.11.0) + +The ``-nodefconfig`` argument is a synonym for ``-no-user-config``. + @section qemu-img command line arguments @subsection convert -s (since 2.0.0) diff --git a/qemu-options.hx b/qemu-options.hx index 39225ae6c3..981742d191 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -4067,26 +4067,17 @@ Write device configuration to @var{file}. The @var{file} can be either filename command line and device configuration into file or dash @code{-}) character to print the output to stdout. This can be later used as input file for @code{-readconfig} option. ETEXI -DEF("nodefconfig", 0, QEMU_OPTION_nodefconfig, - "-nodefconfig\n" - " do not load default config files at startup\n", - QEMU_ARCH_ALL) -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. -ETEXI +HXCOMM Deprecated, same as -no-user-config +DEF("nodefconfig", 0, QEMU_OPTION_nodefconfig, "", QEMU_ARCH_ALL) 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}. ETEXI DEF("trace", HAS_ARG, QEMU_OPTION_trace, "-trace [[enable=]<pattern>][,events=<file>][,file=<file>]\n" |