From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59453) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XoGXC-00064O-I1 for qemu-devel@nongnu.org; Tue, 11 Nov 2014 13:51:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XoGX2-00050O-L2 for qemu-devel@nongnu.org; Tue, 11 Nov 2014 13:51:22 -0500 Received: from mx1.redhat.com ([209.132.183.28]:38266) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XoGX2-00050E-E1 for qemu-devel@nongnu.org; Tue, 11 Nov 2014 13:51:12 -0500 From: Eduardo Habkost Date: Tue, 11 Nov 2014 16:50:54 -0200 Message-Id: <1415731856-14121-2-git-send-email-ehabkost@redhat.com> In-Reply-To: <1415731856-14121-1-git-send-email-ehabkost@redhat.com> References: <1415731856-14121-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [PATCH v2 1/3] vl: Avoid unnecessary 'if' nesting List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Andrew Jones , Peter Lieven Just a coding style change, to make other changes easier to review. Signed-off-by: Eduardo Habkost --- vl.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/vl.c b/vl.c index f4a6e5e..c1bfc9b 100644 --- a/vl.c +++ b/vl.c @@ -1284,13 +1284,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