|
 |
119c2d |
From 16b9ab85b004308e1d99db4ed4769a5fa56e2dfa Mon Sep 17 00:00:00 2001
|
|
|
119c2d |
Message-Id: <16b9ab85b004308e1d99db4ed4769a5fa56e2dfa@dist-git>
|
|
|
119c2d |
From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
|
|
|
119c2d |
Date: Mon, 27 Aug 2018 13:09:38 +0200
|
|
|
119c2d |
Subject: [PATCH] RHEL: Fix virConnectGetMaxVcpus output
|
|
|
119c2d |
MIME-Version: 1.0
|
|
|
119c2d |
Content-Type: text/plain; charset=UTF-8
|
|
|
119c2d |
Content-Transfer-Encoding: 8bit
|
|
|
119c2d |
|
|
|
119c2d |
https://bugzilla.redhat.com/show_bug.cgi?id=1092363
|
|
|
119c2d |
|
|
|
119c2d |
RHEL-only.
|
|
|
119c2d |
|
|
|
119c2d |
Ignore the maximum vcpu limit (KVM_CAP_MAX_VCPUS) on RHEL,
|
|
|
119c2d |
since RHEL QEMU treats the recommended limit (KVM_CAP_NR_VCPUS)
|
|
|
119c2d |
as the maximum, see:
|
|
|
119c2d |
https://bugzilla.redhat.com/show_bug.cgi?id=998708
|
|
|
119c2d |
|
|
|
119c2d |
(cherry picked from commit 7dff909fa34bdd93ad200dbffe70c0c1ee931925)
|
|
|
119c2d |
Signed-off-by: Ján Tomko <jtomko@redhat.com>
|
|
|
119c2d |
|
|
|
119c2d |
https: //bugzilla.redhat.com/show_bug.cgi?id=1582222
|
|
|
119c2d |
Reviewed-by: Andrea Bolognani <abologna@redhat.com>
|
|
|
119c2d |
---
|
|
|
119c2d |
src/util/virhostcpu.c | 5 +++++
|
|
|
119c2d |
1 file changed, 5 insertions(+)
|
|
|
119c2d |
|
|
|
119c2d |
diff --git a/src/util/virhostcpu.c b/src/util/virhostcpu.c
|
|
|
119c2d |
index a07c00a0e9..35f41daef2 100644
|
|
|
119c2d |
--- a/src/util/virhostcpu.c
|
|
|
119c2d |
+++ b/src/util/virhostcpu.c
|
|
|
119c2d |
@@ -1166,6 +1166,11 @@ virHostCPUGetKVMMaxVCPUs(void)
|
|
|
119c2d |
return -1;
|
|
|
119c2d |
}
|
|
|
119c2d |
|
|
|
119c2d |
+/* Ignore KVM_CAP_MAX_VCPUS on RHEL - the recommended maximum
|
|
|
119c2d |
+ * is treated as a hard limit.
|
|
|
119c2d |
+ */
|
|
|
119c2d |
+# undef KVM_CAP_MAX_VCPUS
|
|
|
119c2d |
+
|
|
|
119c2d |
# ifdef KVM_CAP_MAX_VCPUS
|
|
|
119c2d |
/* at first try KVM_CAP_MAX_VCPUS to determine the maximum count */
|
|
|
119c2d |
if ((ret = ioctl(fd, KVM_CHECK_EXTENSION, KVM_CAP_MAX_VCPUS)) > 0)
|
|
|
119c2d |
--
|
|
|
119c2d |
2.34.1
|
|
|
119c2d |
|