From: riegamaths@gmail.com
To: qemu-devel <qemu-devel@nongnu.org>
Cc: Anthony Liguori <aliguori@us.ibm.com>,
Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>,
Dunrong Huang <riegamaths@gmail.com>
Subject: [Qemu-devel] [PATCH] pc: Fix max_cpus
Date: Mon, 23 Jul 2012 18:47:35 +0800 [thread overview]
Message-ID: <1343040455-30206-1-git-send-email-riegamaths@gmail.com> (raw)
From: Dunrong Huang <riegamaths@gmail.com>
The VCPU count limit in kernel now is 254, defined by KVM_MAX_VCPUS
in kernel's header files. But the count limit in QEMU is 255,
so QEMU will failed to start if user passes "-enable-kvm" and "-smp 255"
to it.
This patch intruduces a Macro MAX_VCPUS whose value is KVM_MAX_VCPUS
if CONFIG_KVM is defined. If user do not use kvm, set it's value to 255.
Signed-off-by: Dunrong Huang <riegamaths@gmail.com>
---
hw/pc_piix.c | 28 +++++++++++++++++++---------
1 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/hw/pc_piix.c b/hw/pc_piix.c
index 0c0096f..49cda51 100644
--- a/hw/pc_piix.c
+++ b/hw/pc_piix.c
@@ -49,6 +49,16 @@
#define MAX_IDE_BUS 2
+#ifndef KVM_MAX_VCPUS
+#define KVM_MAX_VCPUS 254
+#endif
+
+#ifdef CONFIG_KVM
+#define MAX_VCPUS KVM_MAX_VCPUS
+#else
+#define MAX_VCPUS 255
+#endif
+
static const int ide_iobase[MAX_IDE_BUS] = { 0x1f0, 0x170 };
static const int ide_iobase2[MAX_IDE_BUS] = { 0x3f6, 0x376 };
static const int ide_irq[MAX_IDE_BUS] = { 14, 15 };
@@ -354,7 +364,7 @@ static QEMUMachine pc_machine_v1_2 = {
.alias = "pc",
.desc = "Standard PC",
.init = pc_init_pci,
- .max_cpus = 255,
+ .max_cpus = MAX_VCPUS,
.is_default = 1,
};
@@ -381,7 +391,7 @@ static QEMUMachine pc_machine_v1_1 = {
.name = "pc-1.1",
.desc = "Standard PC",
.init = pc_init_pci,
- .max_cpus = 255,
+ .max_cpus = MAX_VCPUS,
.compat_props = (GlobalProperty[]) {
PC_COMPAT_1_1,
{ /* end of list */ }
@@ -416,7 +426,7 @@ static QEMUMachine pc_machine_v1_0 = {
.name = "pc-1.0",
.desc = "Standard PC",
.init = pc_init_pci,
- .max_cpus = 255,
+ .max_cpus = MAX_VCPUS,
.compat_props = (GlobalProperty[]) {
PC_COMPAT_1_0,
{ /* end of list */ }
@@ -431,7 +441,7 @@ static QEMUMachine pc_machine_v0_15 = {
.name = "pc-0.15",
.desc = "Standard PC",
.init = pc_init_pci,
- .max_cpus = 255,
+ .max_cpus = MAX_VCPUS,
.compat_props = (GlobalProperty[]) {
PC_COMPAT_0_15,
{ /* end of list */ }
@@ -463,7 +473,7 @@ static QEMUMachine pc_machine_v0_14 = {
.name = "pc-0.14",
.desc = "Standard PC",
.init = pc_init_pci,
- .max_cpus = 255,
+ .max_cpus = MAX_VCPUS,
.compat_props = (GlobalProperty[]) {
PC_COMPAT_0_14,
{
@@ -496,7 +506,7 @@ static QEMUMachine pc_machine_v0_13 = {
.name = "pc-0.13",
.desc = "Standard PC",
.init = pc_init_pci_no_kvmclock,
- .max_cpus = 255,
+ .max_cpus = MAX_VCPUS,
.compat_props = (GlobalProperty[]) {
PC_COMPAT_0_13,
{
@@ -533,7 +543,7 @@ static QEMUMachine pc_machine_v0_12 = {
.name = "pc-0.12",
.desc = "Standard PC",
.init = pc_init_pci_no_kvmclock,
- .max_cpus = 255,
+ .max_cpus = MAX_VCPUS,
.compat_props = (GlobalProperty[]) {
PC_COMPAT_0_12,
{
@@ -566,7 +576,7 @@ static QEMUMachine pc_machine_v0_11 = {
.name = "pc-0.11",
.desc = "Standard PC, qemu 0.11",
.init = pc_init_pci_no_kvmclock,
- .max_cpus = 255,
+ .max_cpus = MAX_VCPUS,
.compat_props = (GlobalProperty[]) {
PC_COMPAT_0_11,
{
@@ -587,7 +597,7 @@ static QEMUMachine pc_machine_v0_10 = {
.name = "pc-0.10",
.desc = "Standard PC, qemu 0.10",
.init = pc_init_pci_no_kvmclock,
- .max_cpus = 255,
+ .max_cpus = MAX_VCPUS,
.compat_props = (GlobalProperty[]) {
PC_COMPAT_0_11,
{
--
1.7.8.6
next reply other threads:[~2012-07-23 10:47 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-23 10:47 riegamaths [this message]
2012-07-23 10:52 ` [Qemu-devel] [PATCH] pc: Fix max_cpus Andreas Färber
2012-07-23 12:33 ` Dunrong Huang
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=1343040455-30206-1-git-send-email-riegamaths@gmail.com \
--to=riegamaths@gmail.com \
--cc=aliguori@us.ibm.com \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@linux.vnet.ibm.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.