qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Andrew Jones <drjones@redhat.com>
To: qemu-devel@nongnu.org
Cc: pbonzini@redhat.com, ehabkost@redhat.com
Subject: [Qemu-devel] [PATCH 1/3] vl: fix max_cpus check
Date: Fri,  7 Nov 2014 17:04:38 +0100	[thread overview]
Message-ID: <1415376280-14130-2-git-send-email-drjones@redhat.com> (raw)
In-Reply-To: <1415376280-14130-1-git-send-email-drjones@redhat.com>

We should confirm max_cpus, which is >= smp_cpus, is
<= the machine's true max_cpus, not just smp_cpus.

Signed-off-by: Andrew Jones <drjones@redhat.com>
---
 vl.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vl.c b/vl.c
index f4a6e5e05bce2..9d9855092ab4a 100644
--- a/vl.c
+++ b/vl.c
@@ -3903,9 +3903,9 @@ int main(int argc, char **argv, char **envp)
     smp_parse(qemu_opts_find(qemu_find_opts("smp-opts"), NULL));
 
     machine_class->max_cpus = machine_class->max_cpus ?: 1; /* Default to UP */
-    if (smp_cpus > machine_class->max_cpus) {
+    if (max_cpus > machine_class->max_cpus) {
         fprintf(stderr, "Number of SMP cpus requested (%d), exceeds max cpus "
-                "supported by machine `%s' (%d)\n", smp_cpus,
+                "supported by machine `%s' (%d)\n", max_cpus,
                 machine_class->name, machine_class->max_cpus);
         exit(1);
     }
-- 
1.9.3

  reply	other threads:[~2014-11-07 16:05 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-11-07 16:04 [Qemu-devel] [PATCH 0/3] vl: smp_parse sanity checks Andrew Jones
2014-11-07 16:04 ` Andrew Jones [this message]
2014-11-07 16:58   ` [Qemu-devel] [PATCH 1/3] vl: fix max_cpus check Eduardo Habkost
2014-11-07 16:04 ` [Qemu-devel] [PATCH 2/3] vl: sanity check cpu topology Andrew Jones
2014-11-11 12:41   ` Eduardo Habkost
2014-11-11 14:37     ` Andrew Jones
2014-11-11 15:48       ` Eduardo Habkost
2014-11-11 17:04         ` Andrew Jones
2014-11-11 17:27           ` Eduardo Habkost
2014-11-11 18:31       ` Eduardo Habkost
2014-11-12  9:14         ` Andrew Jones
2014-11-07 16:04 ` [Qemu-devel] [PATCH 3/3] vl: warn on topology <-> maxcpus mismatch Andrew Jones
2014-11-11 11:15 ` [Qemu-devel] [PATCH 0/3] vl: smp_parse sanity checks Paolo Bonzini
2014-11-11 12:42   ` Eduardo Habkost

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=1415376280-14130-2-git-send-email-drjones@redhat.com \
    --to=drjones@redhat.com \
    --cc=ehabkost@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).