libvirt/libvirt-RHEL-Fix-virConnectGetMaxVcpus-output.patch
Jiri Denemark 3aee1afdde libvirt-8.1.0-1.el9
- Rebased to libvirt-8.1.0 (rhbz#2060313)
- The rebase also fixes the following bugs:
    rhbz#1643868, rhbz#2045953, rhbz#1910856, rhbz#2051451, rhbz#1745868
    rhbz#2040548, rhbz#2041665, rhbz#1999372, rhbz#2038045, rhbz#2045959
    rhbz#2046024, rhbz#2040555, rhbz#2057067, rhbz#2037146, rhbz#2036300

Resolves: rhbz#1643868, rhbz#1745868, rhbz#1910856, rhbz#1999372, rhbz#2036300
Resolves: rhbz#2037146, rhbz#2038045, rhbz#2040548, rhbz#2040555, rhbz#2041665
Resolves: rhbz#2045953, rhbz#2045959, rhbz#2046024, rhbz#2051451, rhbz#2057067
Resolves: rhbz#2060313
2022-03-04 13:57:51 +01:00

47 lines
1.4 KiB
Diff

From b9d80773f6f6c4720669624c0a8978ee6c072185 Mon Sep 17 00:00:00 2001
Message-Id: <b9d80773f6f6c4720669624c0a8978ee6c072185@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 011ef8a153..2ba9a4a3ee 100644
--- a/src/util/virhostcpu.c
+++ b/src/util/virhostcpu.c
@@ -1172,6 +1172,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.35.1