[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1379160656-28050-2-git-send-email-drjones@redhat.com>
Date: Sat, 14 Sep 2013 14:10:54 +0200
From: Andrew Jones <drjones@...hat.com>
To: kvmarm@...ts.cs.columbia.edu, kvm@...r.kernel.org
Cc: catalin.marinas@....com, christoffer.dall@...aro.org,
gleb@...hat.com, linux-arm-kernel@...ts.infradead.org,
linux-kernel@...r.kernel.org, marc.zyngier@....com,
pbonzini@...hat.com, linux@....linux.org.uk, will.deacon@....com
Subject: [PATCH 1/3] arm: kvm: clamp NR_VCPUS to MAX_VCPUS
Signed-off-by: Andrew Jones <drjones@...hat.com>
---
arch/arm/kvm/arm.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c
index 741f66a2edbd7..9ebf8ac3a12ff 100644
--- a/arch/arm/kvm/arm.c
+++ b/arch/arm/kvm/arm.c
@@ -201,7 +201,7 @@ int kvm_dev_ioctl_check_extension(long ext)
r = 1;
break;
case KVM_CAP_NR_VCPUS:
- r = num_online_cpus();
+ r = min(num_online_cpus(), KVM_MAX_VCPUS);
break;
case KVM_CAP_MAX_VCPUS:
r = KVM_MAX_VCPUS;
--
1.8.1.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists