summaryrefslogtreecommitdiffstats
path: root/qemu-doc.texi
diff options
context:
space:
mode:
authorPeter Maydell2017-10-10 14:25:46 +0200
committerPeter Maydell2017-10-10 14:25:46 +0200
commit567d0a19c7998fa366598b83d5a6e5f0759d3ea9 (patch)
tree7cac6341df37f80a05a7d71bdabe1ff3892c9994 /qemu-doc.texi
parentMerge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging (diff)
parentx86: Correct translation of some rdgsbase and wrgsbase encodings (diff)
downloadqemu-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-doc.texi')
-rw-r--r--qemu-doc.texi4
1 files changed, 4 insertions, 0 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)