diff --git a/docs/formatcaps.rst b/docs/formatcaps.rst index 60f8b7caca..f37532296f 100644 --- a/docs/formatcaps.rst +++ b/docs/formatcaps.rst @@ -77,6 +77,12 @@ The ```` element consists of the following child elements: Note that not all architectures support CPU dies: if the current architecture doesn't, the value will be 0 for all CPUs. + ``cluster_id`` + Identifier for the cluster the CPU is in. + + Note that not all architectures support CPU clusters: if the current + architecture doesn't, the value will be 0 for all CPUs. + ``core_id`` Identifier for the core the CPU is in. @@ -84,7 +90,7 @@ The ```` element consists of the following child elements: List of CPUs that are in the same core. The list will include the current CPU, plus all other CPUs that have the - same values for ``socket_id``, ``die_id`` and ``core_id``. + same values for ``socket_id``, ``die_id``, ``cluster_id`` and ``core_id``. ``secmodel`` To find out default security labels for different security models you need to @@ -196,7 +202,7 @@ capabilities enabled in the chip and BIOS you will see: - + @@ -261,14 +267,14 @@ capabilities enabled in the chip and BIOS you will see: - - - - - - - - + + + + + + + + diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst index 73deaa5cb3..67d5f958d5 100644 --- a/docs/formatdomain.rst +++ b/docs/formatdomain.rst @@ -1377,7 +1377,7 @@ following collection of elements. :since:`Since 0.7.5` core2duo Intel - + @@ -1388,7 +1388,7 @@ following collection of elements. :since:`Since 0.7.5` - + ... @@ -1414,7 +1414,7 @@ In case no restrictions need to be put on CPU model and its features, a simpler ... - + ... @@ -1579,12 +1579,14 @@ In case no restrictions need to be put on CPU model and its features, a simpler ``topology`` The ``topology`` element specifies requested topology of virtual CPU provided to the guest. - Its attributes ``sockets``, ``dies`` (:since:`Since 6.1.0`), ``cores``, - and ``threads`` accept non-zero positive integer values. + Its attributes ``sockets``, ``dies`` (:since:`Since 6.1.0`), ``clusters`` + (:since:`Since 10.1.0`), ``cores``, and ``threads`` accept non-zero positive + integer values. They refer to the total number of CPU sockets, number of dies per socket, - number of cores per die, and number of threads per core, respectively. - The ``dies`` attribute is optional and will default to 1 if omitted, while - the other attributes are all mandatory. + number of clusters per die, number of cores per cluster, and number of + threads per core, respectively. + The ``dies`` and ``clusters`` attributes are optional and will default to 1 + if omitted, while the other attributes are all mandatory. Hypervisors may require that the maximum number of vCPUs specified by the ``cpus`` element equals to the number of vcpus resulting from the topology.