[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 4/8] qemu-options: Deprecate -nodefconfig
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PULL v2 4/8] qemu-options: Deprecate -nodefconfig |
Date: |
Mon, 9 Oct 2017 23:39:57 -0300 |
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 <address@hidden>
Acked-by: Alistair Francis <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Reviewed-by: Daniel P. Berrange <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>
---
qemu-doc.texi | 4 ++++
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.
address@hidden -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
address@hidden -nodefconfig
address@hidden -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"
--
2.13.6
- [Qemu-devel] [PULL v2 0/8] x86 and machine queue, 2017-10-09, Eduardo Habkost, 2017/10/09
- [Qemu-devel] [PULL v2 1/8] qom/cpu: move cpu_model null check to cpu_class_by_name(), Eduardo Habkost, 2017/10/09
- [Qemu-devel] [PULL v2 2/8] machine: Add a valid_cpu_types property, Eduardo Habkost, 2017/10/09
- [Qemu-devel] [PULL v2 3/8] vl: Eliminate defconfig variable, Eduardo Habkost, 2017/10/09
- [Qemu-devel] [PULL v2 4/8] qemu-options: Deprecate -nodefconfig,
Eduardo Habkost <=
- [Qemu-devel] [PULL v2 6/8] qom: update doc comment for type_register[_static](), Eduardo Habkost, 2017/10/09
- [Qemu-devel] [PULL v2 5/8] config: qemu_config_parse() return number of config groups, Eduardo Habkost, 2017/10/09
- [Qemu-devel] [PULL v2 7/8] vl: exit if maxcpus is negative, Eduardo Habkost, 2017/10/09
- [Qemu-devel] [PULL v2 8/8] x86: Correct translation of some rdgsbase and wrgsbase encodings, Eduardo Habkost, 2017/10/09
- Re: [Qemu-devel] [PULL v2 0/8] x86 and machine queue, 2017-10-09, Peter Maydell, 2017/10/10