You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
39 lines
1.2 KiB
39 lines
1.2 KiB
From bf608a8e8c53f91b44470e549f73de7dbee33193 Mon Sep 17 00:00:00 2001 |
|
Message-Id: <bf608a8e8c53f91b44470e549f73de7dbee33193@dist-git> |
|
From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com> |
|
Date: Wed, 17 Sep 2014 19:00:58 +0200 |
|
Subject: [PATCH] RHEL: Fix maxvcpus output |
|
|
|
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 |
|
|
|
Signed-off-by: Jiri Denemark <jdenemar@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 013c95bb56..3f7d70b87b 100644 |
|
--- a/src/util/virhostcpu.c |
|
+++ b/src/util/virhostcpu.c |
|
@@ -1214,6 +1214,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.17.0 |
|
|
|
|