aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2021-04-01 23:34:16 +0100
committerPeter Maydell <peter.maydell@linaro.org>2021-04-01 23:34:16 +0100
commit50a9b4499ca99a439b400f715f9475b1702f4e87 (patch)
tree9a96927b459f81d2705a5e1c30e86ce91fe8c0ce /docs
parent415fa2fe91e2a49fe8d56d6aacc8f8db82c74775 (diff)
parentca89d15f8e42f2e5eac5bd200af38fdbfb32e875 (diff)
downloadqemu-50a9b4499ca99a439b400f715f9475b1702f4e87.zip
qemu-50a9b4499ca99a439b400f715f9475b1702f4e87.tar.gz
qemu-50a9b4499ca99a439b400f715f9475b1702f4e87.tar.bz2
Merge remote-tracking branch 'remotes/thuth-gitlab/tags/pull-request-2021-04-01' into staging
* Updates for the MAINTAINERS file * Some small documentation updates * Some small misc fixes # gpg: Signature made Thu 01 Apr 2021 13:30:39 BST # gpg: using RSA key 27B88847EEE0250118F3EAB92ED9D774FE702DB5 # gpg: issuer "thuth@redhat.com" # gpg: Good signature from "Thomas Huth <th.huth@gmx.de>" [full] # gpg: aka "Thomas Huth <thuth@redhat.com>" [full] # gpg: aka "Thomas Huth <huth@tuxfamily.org>" [full] # gpg: aka "Thomas Huth <th.huth@posteo.de>" [unknown] # Primary key fingerprint: 27B8 8847 EEE0 2501 18F3 EAB9 2ED9 D774 FE70 2DB5 * remotes/thuth-gitlab/tags/pull-request-2021-04-01: device-crash-test: Ignore errors about a bus not being available docs: Fix typo in the default name of the qemu-system-x86_64 binary docs: Remove obsolete paragraph about config-target.mak util/compatfd.c: Fixed style issues qom: Fix default values in help MAINTAINERS: Mark SH-4 hardware emulation orphan MAINTAINERS: Mark RX hardware emulation orphan MAINTAINERS: add virtio-fs mailing list MAINTAINERS: Drop the line with Xiang Zheng MAINTAINERS: replace Huawei's email to personal one MAINTAINERS: Drop the lines with Sarah Harris MAINTAINERS: add/replace backups for some s390 areas MAINTAINERS: Fix tests/migration maintainers Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'docs')
-rw-r--r--docs/defs.rst.inc2
-rw-r--r--docs/devel/build-system.rst8
2 files changed, 1 insertions, 9 deletions
diff --git a/docs/defs.rst.inc b/docs/defs.rst.inc
index 48d05aa..52d6454 100644
--- a/docs/defs.rst.inc
+++ b/docs/defs.rst.inc
@@ -10,6 +10,6 @@
incorrectly in boldface.
.. |qemu_system| replace:: qemu-system-x86_64
-.. |qemu_system_x86| replace:: qemu_system-x86_64
+.. |qemu_system_x86| replace:: qemu-system-x86_64
.. |I2C| replace:: I\ :sup:`2`\ C
.. |I2S| replace:: I\ :sup:`2`\ S
diff --git a/docs/devel/build-system.rst b/docs/devel/build-system.rst
index 69ce308..7ef36f4 100644
--- a/docs/devel/build-system.rst
+++ b/docs/devel/build-system.rst
@@ -426,14 +426,6 @@ Built by configure:
build outputs. Variables which are potentially different for each
emulator target are defined by the next file...
-`$TARGET-NAME/config-target.mak`
- TARGET-NAME is the name of a system or userspace emulator, for example,
- x86_64-softmmu denotes the system emulator for the x86_64 architecture.
- This file contains the variables which need to vary on a per-target
- basis. For example, it will indicate whether KVM or Xen are enabled for
- the target and any other potential custom libraries needed for linking
- the target.
-
Built by Meson: