diff options
| author | Peter Maydell | 2017-10-10 14:25:46 +0200 |
|---|---|---|
| committer | Peter Maydell | 2017-10-10 14:25:46 +0200 |
| commit | 567d0a19c7998fa366598b83d5a6e5f0759d3ea9 (patch) | |
| tree | 7cac6341df37f80a05a7d71bdabe1ff3892c9994 /qemu-options.hx | |
| parent | Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging (diff) | |
| parent | x86: Correct translation of some rdgsbase and wrgsbase encodings (diff) | |
| download | qemu-567d0a19c7998fa366598b83d5a6e5f0759d3ea9.tar.gz qemu-567d0a19c7998fa366598b83d5a6e5f0759d3ea9.tar.xz qemu-567d0a19c7998fa366598b83d5a6e5f0759d3ea9.zip | |
Merge remote-tracking branch 'remotes/ehabkost/tags/x86-and-machine-pull-request' into staging
x86 and machine queue, 2017-10-09
Includes x86, QOM, CPU, and option/config parsing patches.
Highlights:
* Deprecation of -nodefconfig option;
* MachineClass::valid_cpu_types field.
# gpg: Signature made Tue 10 Oct 2017 03:31:33 BST
# gpg: using RSA key 0x2807936F984DC5A6
# gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>"
# Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF D1AA 2807 936F 984D C5A6
* remotes/ehabkost/tags/x86-and-machine-pull-request:
x86: Correct translation of some rdgsbase and wrgsbase encodings
vl: exit if maxcpus is negative
qom: update doc comment for type_register[_static]()
config: qemu_config_parse() return number of config groups
qemu-options: Deprecate -nodefconfig
vl: Eliminate defconfig variable
machine: Add a valid_cpu_types property
qom/cpu: move cpu_model null check to cpu_class_by_name()
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qemu-options.hx')
| -rw-r--r-- | qemu-options.hx | 17 |
1 files changed, 4 insertions, 13 deletions
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" |