From 6ce52a680d7799f1a861f98c50581a74b15d51a1 Mon Sep 17 00:00:00 2001 Message-Id: <6ce52a680d7799f1a861f98c50581a74b15d51a1@dist-git> From: =?UTF-8?q?J=C3=A1n=20Tomko?= 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 --- src/util/virhostcpu.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/util/virhostcpu.c b/src/util/virhostcpu.c index 02b9fc8eb..20d3a004b 100644 --- a/src/util/virhostcpu.c +++ b/src/util/virhostcpu.c @@ -1166,6 +1166,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.12.2