From patchwork Fri Jul 2 10:07:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "wangyanan (Y)" X-Patchwork-Id: 1499946 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4GGW7S4lKGz9sSs for ; Fri, 2 Jul 2021 20:11:00 +1000 (AEST) Received: from localhost ([::1]:32950 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lzG8Q-0002CZ-Bm for incoming@patchwork.ozlabs.org; Fri, 02 Jul 2021 06:10:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50458) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lzG5Y-00058i-P7 for qemu-devel@nongnu.org; Fri, 02 Jul 2021 06:08:00 -0400 Received: from szxga02-in.huawei.com ([45.249.212.188]:2060) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lzG5Q-0003ML-SZ for qemu-devel@nongnu.org; Fri, 02 Jul 2021 06:08:00 -0400 Received: from dggemv703-chm.china.huawei.com (unknown [172.30.72.57]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4GGW054GpYzZnlq; Fri, 2 Jul 2021 18:04:37 +0800 (CST) Received: from dggpemm500023.china.huawei.com (7.185.36.83) by dggemv703-chm.china.huawei.com (10.3.19.46) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Fri, 2 Jul 2021 18:07:45 +0800 Received: from DESKTOP-TMVL5KK.china.huawei.com (10.174.187.128) by dggpemm500023.china.huawei.com (7.185.36.83) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Fri, 2 Jul 2021 18:07:45 +0800 From: Yanan Wang To: Subject: [RFC PATCH 2/6] machine: Perform zero-check for the computed value of sockets Date: Fri, 2 Jul 2021 18:07:35 +0800 Message-ID: <20210702100739.13672-3-wangyanan55@huawei.com> X-Mailer: git-send-email 2.8.4.windows.1 In-Reply-To: <20210702100739.13672-1-wangyanan55@huawei.com> References: <20210702100739.13672-1-wangyanan55@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.174.187.128] X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To dggpemm500023.china.huawei.com (7.185.36.83) X-CFilter-Loop: Reflected Received-SPF: pass client-ip=45.249.212.188; envelope-from=wangyanan55@huawei.com; helo=szxga02-in.huawei.com X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andrew Jones , =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= , Eduardo Habkost , "Michael S . Tsirkin" , wanghaibin.wang@huawei.com, Yanan Wang , Igor Mammedov , yuzenghui@huawei.com, Paolo Bonzini Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" We currently perform zero-check (default the value to 1 if zeroed) for the computed values of cores/threads, to make sure they are at least 1. For consistency, we probably should also default sockets to 1 if the computed value is zero. Note that this won't affect any existing working cmdlines but will improve the error reporting of the invalid ones such as "-smp 8,maxcpus=9,cores=10,threads=1". Signed-off-by: Yanan Wang --- hw/core/machine.c | 1 + hw/i386/pc.c | 1 + 2 files changed, 2 insertions(+) diff --git a/hw/core/machine.c b/hw/core/machine.c index f17bbe3275..1e194677cd 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -761,6 +761,7 @@ static void smp_parse(MachineState *ms, SMPConfiguration *config, Error **errp) } else { maxcpus = maxcpus > 0 ? maxcpus : cpus; sockets = maxcpus / (cores * threads); + sockets = sockets > 0 ? sockets : 1; } } else if (cores == 0) { threads = threads > 0 ? threads : 1; diff --git a/hw/i386/pc.c b/hw/i386/pc.c index a9b22fdc01..a44511c937 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -729,6 +729,7 @@ static void pc_smp_parse(MachineState *ms, SMPConfiguration *config, Error **err } else { maxcpus = maxcpus > 0 ? maxcpus : cpus; sockets = maxcpus / (dies * cores * threads); + sockets = sockets > 0 ? sockets : 1; } } else if (cores == 0) { threads = threads > 0 ? threads : 1;