From patchwork Wed Jan 14 09:41:21 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 428889 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id A3BDA140285 for ; Wed, 14 Jan 2015 20:45:05 +1100 (AEDT) Received: from localhost ([::1]:45246 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YBKVb-0008Ud-TX for incoming@patchwork.ozlabs.org; Wed, 14 Jan 2015 04:45:03 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39930) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YBKSW-0002hO-U0 for qemu-devel@nongnu.org; Wed, 14 Jan 2015 04:41:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YBKSQ-00008H-IL for qemu-devel@nongnu.org; Wed, 14 Jan 2015 04:41:52 -0500 Received: from mail-we0-x22d.google.com ([2a00:1450:400c:c03::22d]:58969) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YBKSQ-000086-BB for qemu-devel@nongnu.org; Wed, 14 Jan 2015 04:41:46 -0500 Received: by mail-we0-f173.google.com with SMTP id q58so7684230wes.4 for ; Wed, 14 Jan 2015 01:41:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=D29e6pVaRf56lexpVvEgVoaY+AkPbjKssN++RLmU3Zg=; b=gD6/3C+sjuJYPQDiPQqvFDlHz7eq4rAkV/PNmxUE2wTVQBJ3hNgeSzM1JkOkhidknw jDgVQJEw2+XFxQDeHoz3oISNd8VriIbhAITD/3/G6G9Oq8aWs8iixkWdb06JLQx5QmbB RSm7r8ZaefcDRrTWDKMiQwOjqfVGp6NmL+cN0rl5ho5EQhfM4rmCaYVWVrqM2FbtTOOi KiYmXrZCfOFbJl9JYo2qek96pboIzwghRvGDcsz5/4apeDEnvVAEaZS/kQVbgWMa4TDN YUS21W2PgR226LR7oFIX/leK7lRDWxg93EUlRs/krpRM+H5v22JP3sjF+BErMF/1Yoem Tpsg== X-Received: by 10.180.96.67 with SMTP id dq3mr6738804wib.51.1421228505578; Wed, 14 Jan 2015 01:41:45 -0800 (PST) Received: from playground.station (net-37-117-129-192.cust.vodafonedsl.it. [37.117.129.192]) by mx.google.com with ESMTPSA id hn2sm29298235wjc.5.2015.01.14.01.41.43 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Jan 2015 01:41:44 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 14 Jan 2015 10:41:21 +0100 Message-Id: <1421228492-19856-5-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1421228492-19856-1-git-send-email-pbonzini@redhat.com> References: <1421228492-19856-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:400c:c03::22d Cc: Eduardo Habkost Subject: [Qemu-devel] [PULL 04/15] vl: Avoid unnecessary 'if' nesting X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Eduardo Habkost Just a coding style change, to make other changes easier to review. Signed-off-by: Eduardo Habkost Reviewed-by: Andrew Jones Signed-off-by: Paolo Bonzini --- vl.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/vl.c b/vl.c index 1a2da2b..56a17dd 100644 --- a/vl.c +++ b/vl.c @@ -1170,13 +1170,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);