All of lore.kernel.org
 help / color / mirror / Atom feed
From: Andrew Jones <drjones@redhat.com>
To: kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org
Cc: catalin.marinas@arm.com, christoffer.dall@linaro.org,
	gleb@redhat.com, linux-arm-kernel@lists.infradead.org,
	linux-kernel@vger.kernel.org, marc.zyngier@arm.com,
	pbonzini@redhat.com, linux@arm.linux.org.uk, will.deacon@arm.com
Subject: [PATCH 1/3] arm: kvm: clamp NR_VCPUS to MAX_VCPUS
Date: Sat, 14 Sep 2013 14:10:54 +0200	[thread overview]
Message-ID: <1379160656-28050-2-git-send-email-drjones@redhat.com> (raw)
In-Reply-To: <1379160656-28050-1-git-send-email-drjones@redhat.com>

Signed-off-by: Andrew Jones <drjones@redhat.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


WARNING: multiple messages have this Message-ID (diff)
From: Andrew Jones <drjones@redhat.com>
To: kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org
Cc: linux@arm.linux.org.uk, gleb@redhat.com, marc.zyngier@arm.com,
	catalin.marinas@arm.com, will.deacon@arm.com,
	linux-kernel@vger.kernel.org, christoffer.dall@linaro.org,
	pbonzini@redhat.com, linux-arm-kernel@lists.infradead.org
Subject: [PATCH 1/3] arm: kvm: clamp NR_VCPUS to MAX_VCPUS
Date: Sat, 14 Sep 2013 14:10:54 +0200	[thread overview]
Message-ID: <1379160656-28050-2-git-send-email-drjones@redhat.com> (raw)
In-Reply-To: <1379160656-28050-1-git-send-email-drjones@redhat.com>

Signed-off-by: Andrew Jones <drjones@redhat.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

WARNING: multiple messages have this Message-ID (diff)
From: drjones@redhat.com (Andrew Jones)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 1/3] arm: kvm: clamp NR_VCPUS to MAX_VCPUS
Date: Sat, 14 Sep 2013 14:10:54 +0200	[thread overview]
Message-ID: <1379160656-28050-2-git-send-email-drjones@redhat.com> (raw)
In-Reply-To: <1379160656-28050-1-git-send-email-drjones@redhat.com>

Signed-off-by: Andrew Jones <drjones@redhat.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

  reply	other threads:[~2013-09-14 12:11 UTC|newest]

Thread overview: 45+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-09-14 12:10 [PATCH 0/3] KVM_MAX_VCPUS related changes Andrew Jones
2013-09-14 12:10 ` Andrew Jones
2013-09-14 12:10 ` Andrew Jones
2013-09-14 12:10 ` Andrew Jones [this message]
2013-09-14 12:10   ` [PATCH 1/3] arm: kvm: clamp NR_VCPUS to MAX_VCPUS Andrew Jones
2013-09-14 12:10   ` Andrew Jones
2013-09-14 12:14   ` Alexander Graf
2013-09-14 12:14     ` Alexander Graf
2013-09-14 12:14     ` Alexander Graf
2013-09-14 12:22     ` Marc Zyngier
2013-09-14 12:22       ` Marc Zyngier
2013-09-14 12:23     ` Andrew Jones
2013-09-14 12:23       ` Andrew Jones
2013-09-14 12:23       ` Andrew Jones
2013-09-14 12:10 ` [PATCH 2/3] arm32: kvm: rename CONFIG_KVM_ARM_MAX_VCPUS Andrew Jones
2013-09-14 12:10   ` Andrew Jones
2013-09-14 12:10   ` Andrew Jones
2013-09-15  9:30   ` Gleb Natapov
2013-09-15  9:30     ` Gleb Natapov
2013-09-15  9:30     ` Gleb Natapov
2013-09-16  8:09     ` Marc Zyngier
2013-09-16  8:09       ` Marc Zyngier
2013-09-16  8:09       ` Marc Zyngier
2013-09-16  8:32       ` Gleb Natapov
2013-09-16  8:32         ` Gleb Natapov
2013-09-16  8:32         ` Gleb Natapov
2013-09-16  8:49         ` Marc Zyngier
2013-09-16  8:49           ` Marc Zyngier
2013-09-16  8:49           ` Marc Zyngier
2013-09-17 21:42   ` Christoffer Dall
2013-09-17 21:42     ` Christoffer Dall
2013-09-24 14:09   ` [PATCH v2] " Andrew Jones
2013-09-24 14:09     ` Andrew Jones
2013-09-24 14:09     ` Andrew Jones
2013-09-25 19:31     ` Christoffer Dall
2013-09-25 19:31       ` Christoffer Dall
2013-09-26  7:54       ` Andrew Jones
2013-09-26  7:54         ` Andrew Jones
2013-09-26  7:54         ` Andrew Jones
2013-09-14 12:10 ` [PATCH 3/3] aarch64: kvm: introduce CONFIG_KVM_MAX_VCPUS Andrew Jones
2013-09-14 12:10   ` Andrew Jones
2013-09-17 21:34   ` Christoffer Dall
2013-09-17 21:34     ` Christoffer Dall
2013-09-18  6:21     ` Gleb Natapov
2013-09-18  6:21       ` Gleb Natapov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1379160656-28050-2-git-send-email-drjones@redhat.com \
    --to=drjones@redhat.com \
    --cc=catalin.marinas@arm.com \
    --cc=christoffer.dall@linaro.org \
    --cc=gleb@redhat.com \
    --cc=kvm@vger.kernel.org \
    --cc=kvmarm@lists.cs.columbia.edu \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux@arm.linux.org.uk \
    --cc=marc.zyngier@arm.com \
    --cc=pbonzini@redhat.com \
    --cc=will.deacon@arm.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.