aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/devel/build-system.rst8
-rw-r--r--docs/devel/kconfig.rst2
-rw-r--r--docs/system/replay.rst2
3 files changed, 4 insertions, 8 deletions
diff --git a/docs/devel/build-system.rst b/docs/devel/build-system.rst
index 64efa26b90..0f990bb3e9 100644
--- a/docs/devel/build-system.rst
+++ b/docs/devel/build-system.rst
@@ -460,17 +460,13 @@ Built by configure:
``config-host.mak``
When configure has determined the characteristics of the build host it
- will write them to this file for use in ``Makefile`` and to a smaller
- extent ``meson.build``. These include the paths to various tools and a
- variety of ``CONFIG_*`` variables related to optionally enabled features.
+ will write the paths to various tools to this file, for use in ``Makefile``
+ and to a smaller extent ``meson.build``.
``config-host.mak`` is also used as a dependency checking mechanism. If make
sees that the modification timestamp on configure is newer than that on
``config-host.mak``, then configure will be re-run.
- The variables defined here apply to all QEMU
- build outputs.
-
``config-meson.cross``
A Meson "cross file" (or native file) used to communicate the paths to
diff --git a/docs/devel/kconfig.rst b/docs/devel/kconfig.rst
index e3a544e463..73f52de106 100644
--- a/docs/devel/kconfig.rst
+++ b/docs/devel/kconfig.rst
@@ -316,6 +316,6 @@ variable::
host_kconfig = \
(have_tpm ? ['CONFIG_TPM=y'] : []) + \
- ('CONFIG_LINUX' in config_host ? ['CONFIG_LINUX=y'] : []) + \
+ (targetos == 'linux' ? ['CONFIG_LINUX=y'] : []) + \
(have_ivshmem ? ['CONFIG_IVSHMEM=y'] : []) + \
...
diff --git a/docs/system/replay.rst b/docs/system/replay.rst
index 3105327423..ca7c17c63d 100644
--- a/docs/system/replay.rst
+++ b/docs/system/replay.rst
@@ -181,7 +181,7 @@ Audio data is recorded and replay automatically. The command line for recording
and replaying must contain identical specifications of audio hardware, e.g.:
.. parsed-literal::
- -soundhw ac97
+ -audio pa,model=ac97
Serial ports
------------