forked from rpms/libvirt
102 lines
4.7 KiB
Diff
102 lines
4.7 KiB
Diff
|
From c9113d8cd9d68c932175ea63b634fc5cb7e51ef2 Mon Sep 17 00:00:00 2001
|
||
|
|
Message-Id: <c9113d8cd9d68c932175ea63b634fc5cb7e51ef2@dist-git>
|
||
|
|
From: Pavel Hrdina <phrdina@redhat.com>
|
||
|
|
Date: Thu, 4 Mar 2021 12:57:56 +0100
|
||
|
|
Subject: [PATCH] docs: use proper cpu quota value in our documentation
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
Commit <d505b8af58912ae1e1a211fabc9995b19bd40828> changed the cpu quota
|
||
|
|
value that reflects what kernel allows but did not update our
|
||
|
|
documentation.
|
||
|
|
|
||
|
|
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
|
||
|
|
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
|
||
|
|
(cherry picked from commit 992635b142b261cedb6075e459918418fe6e6962)
|
||
|
|
|
||
|
|
Conflicts:
|
||
|
|
docs/formatdomain.rst
|
||
|
|
- missing in downstream, we use formatdomain.html.in
|
||
|
|
|
||
|
|
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1798463
|
||
|
|
|
||
|
|
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
|
||
|
|
Message-Id: <ba20be50c3bde1668cb214253e5ef8f212fc062b.1614858616.git.phrdina@redhat.com>
|
||
|
|
Reviewed-by: Ján Tomko <jtomko@redhat.com>
|
||
|
|
---
|
||
|
|
docs/formatdomain.html.in | 8 ++++----
|
||
|
|
docs/manpages/virsh.rst | 2 +-
|
||
|
|
docs/schemas/domaincommon.rng | 2 +-
|
||
|
|
3 files changed, 6 insertions(+), 6 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
|
||
|
|
index 127dd13cc0..4341e256a8 100644
|
||
|
|
--- a/docs/formatdomain.html.in
|
||
|
|
+++ b/docs/formatdomain.html.in
|
||
|
|
@@ -872,7 +872,7 @@
|
||
|
|
bandwidth (unit: microseconds). A domain with <code>quota</code> as any
|
||
|
|
negative value indicates that the domain has infinite bandwidth for
|
||
|
|
vCPU threads, which means that it is not bandwidth controlled. The value
|
||
|
|
- should be in range [1000, 18446744073709551] or less than 0. A quota
|
||
|
|
+ should be in range [1000, 17592186044415] or less than 0. A quota
|
||
|
|
with value 0 means no value. You can use this feature to ensure that all
|
||
|
|
vCPUs run at the same speed.
|
||
|
|
<span class="since">Only QEMU driver support since 0.9.4, LXC since
|
||
|
|
@@ -894,7 +894,7 @@
|
||
|
|
domain. A domain with <code>global_quota</code> as any negative
|
||
|
|
value indicates that the domain has infinite bandwidth, which means that
|
||
|
|
it is not bandwidth controlled. The value should be in range
|
||
|
|
- [1000, 18446744073709551] or less than 0. A <code>global_quota</code>
|
||
|
|
+ [1000, 17592186044415] or less than 0. A <code>global_quota</code>
|
||
|
|
with value 0 means no value.
|
||
|
|
<span class="since">Only QEMU driver support since 1.3.3</span>
|
||
|
|
</dd>
|
||
|
|
@@ -915,7 +915,7 @@
|
||
|
|
excluding vCPUs). A domain with <code>emulator_quota</code> as any negative
|
||
|
|
value indicates that the domain has infinite bandwidth for emulator threads
|
||
|
|
(those excluding vCPUs), which means that it is not bandwidth controlled.
|
||
|
|
- The value should be in range [1000, 18446744073709551] or less than 0. A
|
||
|
|
+ The value should be in range [1000, 17592186044415] or less than 0. A
|
||
|
|
quota with value 0 means no value.
|
||
|
|
<span class="since">Only QEMU driver support since 0.10.0</span>
|
||
|
|
</dd>
|
||
|
|
@@ -937,7 +937,7 @@
|
||
|
|
<code>iothread_quota</code> as any negative value indicates that the
|
||
|
|
domain IOThreads have infinite bandwidth, which means that it is
|
||
|
|
not bandwidth controlled. The value should be in range
|
||
|
|
- [1000, 18446744073709551] or less than 0. An <code>iothread_quota</code>
|
||
|
|
+ [1000, 17592186044415] or less than 0. An <code>iothread_quota</code>
|
||
|
|
with value 0 means no value. You can use this feature to ensure that
|
||
|
|
all IOThreads run at the same speed.
|
||
|
|
<span class="since">Only QEMU driver support since 2.1.0</span>
|
||
|
|
diff --git a/docs/manpages/virsh.rst b/docs/manpages/virsh.rst
|
||
|
|
index 0804465d44..a5b95c1123 100644
|
||
|
|
--- a/docs/manpages/virsh.rst
|
||
|
|
+++ b/docs/manpages/virsh.rst
|
||
|
|
@@ -3715,7 +3715,7 @@ XEN_CREDIT scheduler.
|
||
|
|
``Note``: The vcpu_period, emulator_period, and iothread_period parameters
|
||
|
|
have a valid value range of 1000-1000000 or 0, and the vcpu_quota,
|
||
|
|
emulator_quota, and iothread_quota parameters have a valid value range of
|
||
|
|
-1000-18446744073709551 or less than 0. The value 0 for
|
||
|
|
+1000-17592186044415 or less than 0. The value 0 for
|
||
|
|
either parameter is the same as not specifying that parameter.
|
||
|
|
|
||
|
|
|
||
|
|
diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
|
||
|
|
index 4a42cb9b40..6671ef3dfa 100644
|
||
|
|
--- a/docs/schemas/domaincommon.rng
|
||
|
|
+++ b/docs/schemas/domaincommon.rng
|
||
|
|
@@ -6649,7 +6649,7 @@
|
||
|
|
<define name="cpuquota">
|
||
|
|
<data type="long">
|
||
|
|
<param name="pattern">-?[0-9]+</param>
|
||
|
|
- <param name="maxInclusive">18446744073709551</param>
|
||
|
|
+ <param name="maxInclusive">17592186044415</param>
|
||
|
|
<param name='minInclusive'>-1</param>
|
||
|
|
</data>
|
||
|
|
</define>
|
||
|
|
--
|
||
|
|
2.30.0
|
||
|
|
|