7ada4ec62c
- Rebased to libvirt-7.9.0 (rhbz#2001507)
- The rebase also fixes the following bugs:
rhbz#2007659, rhbz#2014487, rhbz#1806856, rhbz#2014139, rhbz#1964223
rhbz#2007168, rhbz#2012386, rhbz#2013573, rhbz#1897708
Resolves: rhbz#1806856, rhbz#1897708, rhbz#1964223, rhbz#2001507, rhbz#2007168
Resolves: rhbz#2007659, rhbz#2012386, rhbz#2013573, rhbz#2014139, rhbz#2014487
47 lines
1.4 KiB
Diff
47 lines
1.4 KiB
Diff
From 48c3540f12f4c14fc8f84de08603f3bf6ccfbd70 Mon Sep 17 00:00:00 2001
|
|
Message-Id: <48c3540f12f4c14fc8f84de08603f3bf6ccfbd70@dist-git>
|
|
From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
|
|
Date: Mon, 27 Aug 2018 13:09:38 +0200
|
|
Subject: [PATCH] RHEL: Fix virConnectGetMaxVcpus output
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
https://bugzilla.redhat.com/show_bug.cgi?id=1092363
|
|
|
|
RHEL-only.
|
|
|
|
Ignore the maximum vcpu limit (KVM_CAP_MAX_VCPUS) on RHEL,
|
|
since RHEL QEMU treats the recommended limit (KVM_CAP_NR_VCPUS)
|
|
as the maximum, see:
|
|
https://bugzilla.redhat.com/show_bug.cgi?id=998708
|
|
|
|
(cherry picked from commit 7dff909fa34bdd93ad200dbffe70c0c1ee931925)
|
|
Signed-off-by: Ján Tomko <jtomko@redhat.com>
|
|
|
|
https: //bugzilla.redhat.com/show_bug.cgi?id=1582222
|
|
Reviewed-by: Andrea Bolognani <abologna@redhat.com>
|
|
---
|
|
src/util/virhostcpu.c | 5 +++++
|
|
1 file changed, 5 insertions(+)
|
|
|
|
diff --git a/src/util/virhostcpu.c b/src/util/virhostcpu.c
|
|
index 5dd2baf2df..6811c498f9 100644
|
|
--- a/src/util/virhostcpu.c
|
|
+++ b/src/util/virhostcpu.c
|
|
@@ -1192,6 +1192,11 @@ virHostCPUGetKVMMaxVCPUs(void)
|
|
return -1;
|
|
}
|
|
|
|
+/* Ignore KVM_CAP_MAX_VCPUS on RHEL - the recommended maximum
|
|
+ * is treated as a hard limit.
|
|
+ */
|
|
+# undef KVM_CAP_MAX_VCPUS
|
|
+
|
|
# ifdef KVM_CAP_MAX_VCPUS
|
|
/* at first try KVM_CAP_MAX_VCPUS to determine the maximum count */
|
|
if ((ret = ioctl(fd, KVM_CHECK_EXTENSION, KVM_CAP_MAX_VCPUS)) > 0)
|
|
--
|
|
2.33.1
|
|
|