From: Peter Maydell <peter.maydell@linaro.org>
To: qemu-devel@nongnu.org
Subject: [PULL 20/24] docs: Split out 'pc' machine model docs into their own file
Date: Mon, 23 Nov 2020 11:43:11 +0000 [thread overview]
Message-ID: <20201123114315.13372-21-peter.maydell@linaro.org> (raw)
In-Reply-To: <20201123114315.13372-1-peter.maydell@linaro.org>
Currently target-i386.rst includes the documentation of the 'pc'
machine model inline. Split it out into its own file, in a
similar way to target-i386.rst; this gives us a place to put
documentation of other i386 machine models, such as 'microvm'.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
---
docs/system/i386/pc.rst | 7 +++++++
docs/system/target-i386.rst | 18 +++++++++++++-----
2 files changed, 20 insertions(+), 5 deletions(-)
create mode 100644 docs/system/i386/pc.rst
diff --git a/docs/system/i386/pc.rst b/docs/system/i386/pc.rst
new file mode 100644
index 00000000000..d543c11a5cd
--- /dev/null
+++ b/docs/system/i386/pc.rst
@@ -0,0 +1,7 @@
+i440fx PC (``pc-i440fx``, ``pc``)
+=================================
+
+Peripherals
+~~~~~~~~~~~
+
+.. include:: ../target-i386-desc.rst.inc
diff --git a/docs/system/target-i386.rst b/docs/system/target-i386.rst
index 51be03d881f..1612ddba907 100644
--- a/docs/system/target-i386.rst
+++ b/docs/system/target-i386.rst
@@ -1,14 +1,22 @@
.. _QEMU-PC-System-emulator:
-x86 (PC) System emulator
-------------------------
+x86 System emulator
+-------------------
.. _pcsys_005fdevices:
-Peripherals
-~~~~~~~~~~~
+Board-specific documentation
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.. include:: target-i386-desc.rst.inc
+..
+ This table of contents should be kept sorted alphabetically
+ by the title text of each file, which isn't the same ordering
+ as an alphabetical sort by filename.
+
+.. toctree::
+ :maxdepth: 1
+
+ i386/pc
.. include:: cpu-models-x86.rst.inc
--
2.20.1
next prev parent reply other threads:[~2020-11-23 11:49 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-23 11:42 [PULL 00/24] target-arm queue Peter Maydell
2020-11-23 11:42 ` [PULL 01/24] target/arm: fix stage 2 page-walks in 32-bit emulation Peter Maydell
2020-11-23 11:42 ` [PULL 02/24] hw/arm: Fix bad print format specifiers Peter Maydell
2020-11-23 11:42 ` [PULL 03/24] hw/intc: fix heap-buffer-overflow in rxicu_realize() Peter Maydell
2020-11-23 11:42 ` [PULL 04/24] MAINTAINERS: Cover system/arm/cpu-features.rst with ARM TCG CPUs Peter Maydell
2020-11-23 11:42 ` [PULL 05/24] MAINTAINERS: Cover system/arm/aspeed.rst with ASPEED BMC machines Peter Maydell
2020-11-23 11:42 ` [PULL 06/24] MAINTAINERS: Cover system/arm/nuvoton.rst with Nuvoton NPCM7xx Peter Maydell
2020-11-23 11:42 ` [PULL 07/24] MAINTAINERS: Fix system/arm/orangepi.rst path Peter Maydell
2020-11-23 11:42 ` [PULL 08/24] MAINTAINERS: Cover system/arm/sbsa.rst with SBSA-REF machine Peter Maydell
2020-11-23 11:43 ` [PULL 09/24] MAINTAINERS: Cover system/arm/sx1.rst with OMAP machines Peter Maydell
2020-11-23 11:43 ` [PULL 10/24] docs/system: Deprecate raspi2/raspi3 machine aliases Peter Maydell
2020-11-23 11:43 ` [PULL 11/24] docs/system/arm: Document the various raspi boards Peter Maydell
2020-11-23 11:43 ` [PULL 12/24] docs/system/arm: Document OpenPOWER Witherspoon BMC model Front LEDs Peter Maydell
2020-11-23 11:43 ` [PULL 13/24] docs/system/arm: Document the Sharp Zaurus SL-6000 Peter Maydell
2020-11-23 11:43 ` [PULL 14/24] target/arm: Make SYS_HEAPINFO work with RAM that doesn't start at 0 Peter Maydell
2020-11-23 11:43 ` [PULL 15/24] linux-user/arm: Deliver SIGTRAP for UDF patterns used as breakpoints Peter Maydell
2020-11-23 11:43 ` [PULL 16/24] docs: Move virtio-net-failover.rst into the system manual Peter Maydell
2020-11-23 11:43 ` [PULL 17/24] docs: Move cpu-hotplug.rst " Peter Maydell
2020-11-23 11:43 ` [PULL 18/24] docs: Move virtio-pmem.rst " Peter Maydell
2020-11-23 11:43 ` [PULL 19/24] docs/system/virtio-pmem.rst: Fix minor style issues Peter Maydell
2020-11-23 11:43 ` Peter Maydell [this message]
2020-11-23 11:43 ` [PULL 21/24] docs: Move microvm.rst into the system manual Peter Maydell
2020-11-23 11:43 ` [PULL 22/24] docs: Move pr-manager.rst " Peter Maydell
2020-11-23 11:43 ` [PULL 23/24] docs: Split qemu-pr-helper documentation into tools manual Peter Maydell
2020-11-23 11:43 ` [PULL 24/24] docs/system/pr-manager.rst: Fix minor docs nits Peter Maydell
2020-11-23 17:03 ` [PULL 00/24] target-arm queue Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201123114315.13372-21-peter.maydell@linaro.org \
--to=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).