[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 20/24] docs: Split out 'pc' machine model docs into their own file
From: |
Peter Maydell |
Subject: |
[PULL 20/24] docs: Split out 'pc' machine model docs into their own file |
Date: |
Mon, 23 Nov 2020 11:43:11 +0000 |
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
- [PULL 10/24] docs/system: Deprecate raspi2/raspi3 machine aliases, (continued)
- [PULL 10/24] docs/system: Deprecate raspi2/raspi3 machine aliases, Peter Maydell, 2020/11/23
- [PULL 11/24] docs/system/arm: Document the various raspi boards, Peter Maydell, 2020/11/23
- [PULL 12/24] docs/system/arm: Document OpenPOWER Witherspoon BMC model Front LEDs, Peter Maydell, 2020/11/23
- [PULL 13/24] docs/system/arm: Document the Sharp Zaurus SL-6000, Peter Maydell, 2020/11/23
- [PULL 14/24] target/arm: Make SYS_HEAPINFO work with RAM that doesn't start at 0, Peter Maydell, 2020/11/23
- [PULL 15/24] linux-user/arm: Deliver SIGTRAP for UDF patterns used as breakpoints, Peter Maydell, 2020/11/23
- [PULL 16/24] docs: Move virtio-net-failover.rst into the system manual, Peter Maydell, 2020/11/23
- [PULL 17/24] docs: Move cpu-hotplug.rst into the system manual, Peter Maydell, 2020/11/23
- [PULL 18/24] docs: Move virtio-pmem.rst into the system manual, Peter Maydell, 2020/11/23
- [PULL 19/24] docs/system/virtio-pmem.rst: Fix minor style issues, Peter Maydell, 2020/11/23
- [PULL 20/24] docs: Split out 'pc' machine model docs into their own file,
Peter Maydell <=
- [PULL 21/24] docs: Move microvm.rst into the system manual, Peter Maydell, 2020/11/23
- [PULL 22/24] docs: Move pr-manager.rst into the system manual, Peter Maydell, 2020/11/23
- [PULL 24/24] docs/system/pr-manager.rst: Fix minor docs nits, Peter Maydell, 2020/11/23
- [PULL 23/24] docs: Split qemu-pr-helper documentation into tools manual, Peter Maydell, 2020/11/23
- Re: [PULL 00/24] target-arm queue, Peter Maydell, 2020/11/23