From nobody Sun Feb 8 01:04:01 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1619442668; cv=none; d=zohomail.com; s=zohoarc; b=HSDDeZ4vI9v84MKCW6RK/yf6x00GBO6Ly8mTtkKHRmeS1y2bbzVqFCzgHDeC/6N3tmN8sX6I9Jttvgp24p8EmEreN++si8g7UVd0bs9yMVa6x332qTmm/IeJAlFGlMxOmuV03iBGQInq5d70qp0dcX9WtZLXg+mVD4wx6KYNGHY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619442668; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=vXW6VGwQaX3HnBN7TWTDXJlagUxsj3F7KvFrVYooVLY=; b=VjpgtYsUS1eH9Qx75XXnUPYbbo+x8o8XzVin3C2RTzSytDStPUosBc3zjs+e0WVZaO5CvY3u80mmoLNCfNT+srCXvB9iKvNKpGOZUaQkYlBgr92SbBFM+kxPcnrJ6C+VvoOZib6j8BrHI8FzPrM+mXp+eML1adHx9LRHyZ+WPZM= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1619442667477832.7894027942368; Mon, 26 Apr 2021 06:11:07 -0700 (PDT) Received: from localhost ([::1]:36376 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lb110-00011D-Q0 for importer@patchew.org; Mon, 26 Apr 2021 09:11:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55788) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1laqv3-0003q8-20 for qemu-devel@nongnu.org; Sun, 25 Apr 2021 22:24:17 -0400 Received: from mail.kingsoft.com ([114.255.44.145]:22820) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1laquz-0003rY-Mg for qemu-devel@nongnu.org; Sun, 25 Apr 2021 22:24:16 -0400 Received: from mail.kingsoft.com (localhost [10.88.1.79]) (using TLS with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) by mail.kingsoft.com (SMG-1-NODE-87) with SMTP id 55.12.44065.4B026806; Mon, 26 Apr 2021 10:08:52 +0800 (HKT) Received: from DESKTOP-9MDAR6M (10.88.1.103) by KSBJMAIL4.kingsoft.cn (10.88.1.79) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Mon, 26 Apr 2021 10:08:52 +0800 X-AuditID: 0a580157-e31ff7000005ac21-1c-608620b4eccf Date: Mon, 26 Apr 2021 10:08:52 +0800 From: "caodongli@kingsoft.com" To: mst , marcel.apfelbaum , pbonzini , richard.henderson , ehabkost Subject: [PATCH v2] hw/i386: Expand the range of CPU topologies between smp and maxcpus X-Priority: 3 X-Has-Attach: no X-Mailer: Foxmail 7.2.20.273[cn] MIME-Version: 1.0 Message-ID: <2021042610084739495617@kingsoft.com> Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.88.1.103] X-ClientProxiedBy: KSBJMAIL1.kingsoft.cn (10.88.1.31) To KSBJMAIL4.kingsoft.cn (10.88.1.79) X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrKLMWRmVeSWpSXmKPExsXCFcHor7tFoS3B4PRtTYuGe6EWh/uvMFu8 bD/BbPH/1ytWi/3b/rFaHO/dwWKx5MBOdgd2j52z7rJ73Lm2h81j3slAjyfXNjN5vN93lS2A NYrLJiU1J7MstUjfLoEr48f/DuaCMxwVN7fMY2tgXMPRxcjJISFgIrFz4wPWLkYuDiGB6UwS 935sYoJwHjFKTL59grGLkYODRUBV4sdcT5AGNgFziStvZrGB1IgI7GWU+P10BStIglnAU+Lh yQ42EFtYIFxiS2sDK8QGXokZ7U9ZIGwBiZtbJrBB2AoSmyZ/AqvhFRCUODnzCQuEbSix7v5d doiZOhILdn9ig7AVJaZ0PwSLCwkoSxzdvx5qjrzE3d/TGSHsWImmA7fYJjAKzUIydhaSUbOQ jFrAyLyKkaU4N91wEyMk5MN3MM5r+qh3iJGJg/EQowQHs5IIL9uu1gQh3pTEyqrUovz4otKc 1OJDjNIcLErivLPdGhOEBNITS1KzU1MLUotgskwcnFINTLUHryqfV9Wt4HvktyZafq6MTQHv Wvn173oyZpSdurCm0VUh4LOr+RlN36hvCgk3tLXXSiSn/F+2NSeJY1dA7k3fDVpcM64eCWTy LX/19v++d7u0F7xvauQPiDPJ82JyNFNOmb73q6B3Xuft0EfcL32lxWet2aOhpXIlir9Xv959 Ebt12OdTIrtLJpso9d2vLpffZWT+P90o7ISueeBd2YWJlSw/GDtmsgmf2/uVUcJJKjZD+4jI LYefMacOLpa5LfFNIFrG5eut28l9bHvE7dgmc06qYj1qFSIR9MR8qc+Lrb/Piojmee+sP7L0 2MzfcRuZv96w4dSbGK1/men05bt9dSJZTvJHnA9+rhVUYinOSDTUYi4qTgQAcKprl+gCAAA= Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=114.255.44.145; envelope-from=caodongli@kingsoft.com; helo=mail.kingsoft.com X-Spam_score_int: -1 X-Spam_score: -0.2 X-Spam_bar: / X-Spam_report: (-0.2 / 5.0 requ) BAYES_00=-1.9, MIME_BASE64_TEXT=1.741, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Mon, 26 Apr 2021 09:08:52 -0400 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: qemu-devel , "like.xu" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Change the criteria for the initial CPU topology and maxcpus, user can have more settings Signed-off-by: Dongli Cao --- hw/i386/pc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 8a84b25..ef2e819 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -751,7 +751,7 @@ void pc_smp_parse(MachineState *ms, QemuOpts *opts) exit(1); } - if (sockets * dies * cores * threads !=3D ms->smp.max_cpus) { + if (sockets * dies * cores * threads > ms->smp.max_cpus) { error_report("Invalid CPU topology deprecated: " "sockets (%u) * dies (%u) * cores (%u) * threads = (%u) " "!=3D maxcpus (%u)", -- 1.8.3.1 caodongli@kingsoft.com