From: Eduardo Habkost <ehabkost@redhat.com>
To: qemu-devel@nongnu.org
Cc: Paolo Bonzini <pbonzini@redhat.com>,
Andrew Jones <drjones@redhat.com>, Peter Lieven <pl@kamp.de>
Subject: [Qemu-devel] [PATCH RESEND v2 1/3] vl: Avoid unnecessary 'if' nesting
Date: Fri, 19 Dec 2014 00:59:45 -0200 [thread overview]
Message-ID: <1418957987-28511-2-git-send-email-ehabkost@redhat.com> (raw)
In-Reply-To: <1418957987-28511-1-git-send-email-ehabkost@redhat.com>
Just a coding style change, to make other changes easier to review.
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: Andrew Jones <drjones@redhat.com>
---
vl.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/vl.c b/vl.c
index 113e98e..3b7157d 100644
--- a/vl.c
+++ b/vl.c
@@ -1300,13 +1300,11 @@ static void smp_parse(QemuOpts *opts)
if (cpus == 0) {
cpus = cores * threads * sockets;
}
+ } else if (cores == 0) {
+ threads = threads > 0 ? threads : 1;
+ cores = cpus / (sockets * threads);
} else {
- if (cores == 0) {
- threads = threads > 0 ? threads : 1;
- cores = cpus / (sockets * threads);
- } else {
- threads = cpus / (cores * sockets);
- }
+ threads = cpus / (cores * sockets);
}
max_cpus = qemu_opt_get_number(opts, "maxcpus", 0);
--
1.9.3
next prev parent reply other threads:[~2014-12-19 3:00 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-19 2:59 [Qemu-devel] [PATCH RESEND v2 0/3] vl: smp_parse sanity checks Eduardo Habkost
2014-12-19 2:59 ` Eduardo Habkost [this message]
2014-12-19 2:59 ` [Qemu-devel] [PATCH RESEND v2 2/3] vl: fix max_cpus check Eduardo Habkost
2014-12-19 2:59 ` [Qemu-devel] [PATCH RESEND v2 3/3] vl: Don't silently change topology when all -smp options were set Eduardo Habkost
2015-01-08 10:48 ` [Qemu-devel] [PATCH RESEND v2 0/3] vl: smp_parse sanity checks Paolo Bonzini
2015-01-08 13:22 ` Eduardo Habkost
2015-01-08 16:36 ` Paolo Bonzini
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=1418957987-28511-2-git-send-email-ehabkost@redhat.com \
--to=ehabkost@redhat.com \
--cc=drjones@redhat.com \
--cc=pbonzini@redhat.com \
--cc=pl@kamp.de \
--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).