[PATCH 15/67] docs: formatdomain: Remove 'elementsCPU' anchor

Reworded documentation around the local link. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- docs/formatdomain.rst | 5 ++--- docs/formatdomaincaps.rst | 2 +- docs/kbase/kvm-realtime.rst | 2 +- docs/manpages/virsh.rst | 4 ++-- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst index 45f94e5fa2..e8431f972f 100644 --- a/docs/formatdomain.rst +++ b/docs/formatdomain.rst @@ -948,8 +948,8 @@ Memory Allocation or "TiB" for tebibytes (2\ :sup:`40` or 1,099,511,627,776 bytes). However, the value will be rounded up to the nearest kibibyte by libvirt, and may be further rounded to the granularity supported by the hypervisor. Some - hypervisors also enforce a minimum, such as 4000KiB. In case - `NUMA <#elementsCPU>`__ is configured for the guest the ``memory`` element + hypervisors also enforce a minimum, such as 4000KiB. In case NUMA is + configured for the guest (See `CPU model and topology`_) the ``memory`` element can be omitted. In the case of crash, optional attribute ``dumpCore`` can be used to control whether the guest memory should be included in the generated coredump or not (values "on", "off"). ``unit`` :since:`since 0.9.11` , @@ -1252,7 +1252,6 @@ Using this feature requires Fibre Channel capable HW, kernel compiled with option ``CONFIG_BLK_CGROUP_FC_APPID`` and ``nvme_fc`` kernel module loaded. :since:`Since 7.7.0` -:anchor:`<a id="elementsCPU"/>` CPU model and topology ---------------------- diff --git a/docs/formatdomaincaps.rst b/docs/formatdomaincaps.rst index 9ca7cdcc7c..d8fcf65450 100644 --- a/docs/formatdomaincaps.rst +++ b/docs/formatdomaincaps.rst @@ -165,7 +165,7 @@ CPU configuration ~~~~~~~~~~~~~~~~~ The ``cpu`` element exposes options usable for configuring `guest -CPUs <formatdomain.html#elementsCPU>`__. +CPUs <formatdomain.html#cpu-model-and-topology>`__. :: diff --git a/docs/kbase/kvm-realtime.rst b/docs/kbase/kvm-realtime.rst index 9b38aff0fd..f0a1bb7c95 100644 --- a/docs/kbase/kvm-realtime.rst +++ b/docs/kbase/kvm-realtime.rst @@ -150,7 +150,7 @@ siblings. This is achieved using the `CPU tuning config <../formatdomain.html#cp <vcpusched vcpus='0-4' scheduler='fifo' priority='1'/> </cputune> -The `guest CPU model <formatdomain.html#elementsCPU>`_ now needs to be +The `guest CPU model <formatdomain.html#cpu-model-and-topology>`_ now needs to be configured to pass through the host model unchanged, with topology matching the placement: diff --git a/docs/manpages/virsh.rst b/docs/manpages/virsh.rst index e73e590754..5cb948bb91 100644 --- a/docs/manpages/virsh.rst +++ b/docs/manpages/virsh.rst @@ -895,7 +895,7 @@ domain capabilities XML (printed by ``domcapabilities`` command). In addition to the <cpu> element itself, this command accepts full domain XML, capabilities XML, or domain capabilities XML containing the CPU definition. For more information on guest CPU definition see: -`https://libvirt.org/formatdomain.html#elementsCPU <https://libvirt.org/formatdomain.html#elementsCPU>`__. If *--error* is +`https://libvirt.org/formatdomain.html#elementsCPU <https://libvirt.org/formatdomain.html#cpu-model-and-topology>`__. If *--error* is specified, the command will return an error when the given CPU is incompatible with host CPU and a message providing more details about the incompatibility will be printed out. If *--validate* is specified, validates @@ -943,7 +943,7 @@ host CPU model found in the domain capabilities XML (printed by the ``domcapabilities`` command). In addition to the <cpu> element itself, this command accepts full domain XML, capabilities XML, or domain capabilities XML containing the CPU definition. For more information on guest CPU definition -see: `https://libvirt.org/formatdomain.html#elementsCPU <https://libvirt.org/formatdomain.html#elementsCPU>`__. +see: `https://libvirt.org/formatdomain.html#elementsCPU <https://libvirt.org/formatdomain.html#cpu-model-and-topology>`__. The *virttype* option specifies the virtualization type (usable in the 'type' attribute of the <domain> top level element from the domain XML). *emulator* -- 2.35.3