aboutsummaryrefslogtreecommitdiff
path: root/qemu-options.hx
diff options
context:
space:
mode:
authorEduardo Habkost <ehabkost@redhat.com>2012-05-02 13:07:29 -0300
committerAnthony Liguori <aliguori@us.ibm.com>2012-05-10 12:37:57 -0500
commitf29a56147b66845914d0a645bf9b4c5bb9a6af57 (patch)
tree907eae26d1dc9c1ca7b77bcf487a487698a37d70 /qemu-options.hx
parent3ed2d9ee1f7a09129df2694ba9fae2f7c5abf050 (diff)
downloadqemu-arm-f29a56147b66845914d0a645bf9b4c5bb9a6af57.tar.gz
implement -no-user-config command-line option (v3)
Changes v2 -> v3: - Rebase against latest qemu.git Changes v1 -> v2: - Change 'userconfig' field/variables to bool instead of int - Coding style change Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'qemu-options.hx')
-rw-r--r--qemu-options.hx16
1 files changed, 13 insertions, 3 deletions
diff --git a/qemu-options.hx b/qemu-options.hx
index a169792f07..7d0b054dd5 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -2685,9 +2685,19 @@ DEF("nodefconfig", 0, QEMU_OPTION_nodefconfig,
STEXI
@item -nodefconfig
@findex -nodefconfig
-Normally QEMU loads a configuration file from @var{sysconfdir}/qemu.conf and
-@var{sysconfdir}/target-@var{ARCH}.conf on startup. The @code{-nodefconfig}
-option will prevent QEMU from loading these configuration files at startup.
+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
+DEF("no-user-config", 0, QEMU_OPTION_nouserconfig,
+ "-no-user-config\n"
+ " do not load 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}.
ETEXI
DEF("trace", HAS_ARG, QEMU_OPTION_trace,
"-trace [events=<file>][,file=<file>]\n"