From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36998) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fv1Vv-0004nN-Cp for qemu-devel@nongnu.org; Wed, 29 Aug 2018 10:32:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fv1Vq-00071U-DV for qemu-devel@nongnu.org; Wed, 29 Aug 2018 10:32:07 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:34378 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fv1Vq-000714-8r for qemu-devel@nongnu.org; Wed, 29 Aug 2018 10:32:02 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8F6397A7E6 for ; Wed, 29 Aug 2018 14:32:01 +0000 (UTC) From: Igor Mammedov Date: Wed, 29 Aug 2018 16:32:01 +0200 Message-Id: <1535553121-80352-1-git-send-email-imammedo@redhat.com> In-Reply-To: <1535464093-3648-1-git-send-email-imammedo@redhat.com> References: <1535464093-3648-1-git-send-email-imammedo@redhat.com> Subject: [Qemu-devel] [PATCH] vl:c: make sure that sockets are calculated correctly in '-smp X' case List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: drjones@redhat.com, ehabkost@redhat.com commit (5cdc9b76e3 vl.c: Remove dead assignment) removed sockets calculation when 'sockets' weren't provided on CLI since there wasn't any users for it back then. Exiting checks are neither reachable } else if (sockets * cores * threads < cpus) { or nor triggable if (sockets * cores * threads > max_cpus) so we weren't noticing wrong topology since then, since users recalculate sockets adhoc on their own. However with deprecation check it becomes noticable, for example -smp 2 will start printing warning: "warning: Invalid CPU topology deprecated: sockets (1) * cores (1) * threads (1) != maxcpus (2)" calculating sockets if they weren't specified. Fix it by returning back sockets calculation if it's omited on CLI. Signed-off-by: Igor Mammedov --- vl.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vl.c b/vl.c index 7fd700e..333d638 100644 --- a/vl.c +++ b/vl.c @@ -1210,11 +1210,14 @@ static void smp_parse(QemuOpts *opts) /* compute missing values, prefer sockets over cores over threads */ if (cpus == 0 || sockets == 0) { - sockets = sockets > 0 ? sockets : 1; cores = cores > 0 ? cores : 1; threads = threads > 0 ? threads : 1; if (cpus == 0) { + sockets = sockets > 0 ? sockets : 1; cpus = cores * threads * sockets; + } else { + max_cpus = qemu_opt_get_number(opts, "maxcpus", cpus); + sockets = !sockets ? max_cpus / (cores * threads) : sockets; } } else if (cores == 0) { threads = threads > 0 ? threads : 1; -- 2.7.4