Skip to content

Commit c2c7f33

Browse files
committed
docs/system: move x86 CPU configuration to a separate document
Currently, cpu-models-x86.rst.inc is included in target-i386.rst directly. To make the toctree more homogeneous when adding more documentation, include it through a first-class .rst file. Together with the previous changes to the man page skeletons, this also frees "===" for the headings, so that cpu-models-x86.rst.inc need not assume anything about the headings used by target-i386.rst. Reviewed-by: Peter Maydell <[email protected]> Signed-off-by: Paolo Bonzini <[email protected]>
1 parent f0c1507 commit c2c7f33

File tree

3 files changed

+10
-3
lines changed

3 files changed

+10
-3
lines changed

docs/system/cpu-models-x86.rst.inc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Recommendations for KVM CPU model configuration on x86 hosts
2-
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2+
============================================================
33

44
The information that follows provides recommendations for configuring
55
CPU models on x86 hosts. The goals are to maximise performance, while
@@ -368,7 +368,7 @@ featureset, which prevents guests having optimal performance.
368368

369369

370370
Syntax for configuring CPU models
371-
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
371+
=================================
372372

373373
The examples below illustrate the approach to configuring the various
374374
CPU models / features in QEMU and libvirt.

docs/system/i386/cpu.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
.. include:: ../cpu-models-x86.rst.inc

docs/system/target-i386.rst

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,13 @@ Board-specific documentation
1919
i386/microvm
2020
i386/pc
2121

22-
.. include:: cpu-models-x86.rst.inc
22+
Architectural features
23+
~~~~~~~~~~~~~~~~~~~~~~
24+
25+
.. toctree::
26+
:maxdepth: 1
27+
28+
i386/cpu
2329

2430
.. _pcsys_005freq:
2531

0 commit comments

Comments
 (0)