aboutsummaryrefslogtreecommitdiff
path: root/qemu-options.hx
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2010-01-21 10:57:58 -0600
committerAnthony Liguori <aliguori@us.ibm.com>2010-01-24 09:37:26 -0600
commit292444cb87f3b883146ee30628a5922b1cde4073 (patch)
tree0d44e6ecf5d6229ffc0e0f1131ab42c58912d673 /qemu-options.hx
parent6530a97bdde4504e6658e5017b5b0ab22e1e62d3 (diff)
Load global config files by default
A new option, -nodefconfig is introduced to prevent loading from the default config location. Otherwise, two configuration files will be searched for, qemu.conf and target-<TARGET_NAME>.conf. To ensure that the default configuration is overridden by a user specified config, we introduce a two stage option parsing mechanism. Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'qemu-options.hx')
-rw-r--r--qemu-options.hx9
1 files changed, 9 insertions, 0 deletions
diff --git a/qemu-options.hx b/qemu-options.hx
index ee60d8ad11..9294e07cbb 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -1965,6 +1965,15 @@ STEXI
@item -writeconfig @var{file}
Write device configuration to @var{file}.
ETEXI
+DEF("nodefconfig", 0, QEMU_OPTION_nodefconfig,
+ "-nodefconfig\n"
+ " do not load default config files at startup\n")
+STEXI
+@item -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.
+ETEXI
HXCOMM This is the last statement. Insert new options before this line!
STEXI