From patchwork Fri Jul 2 10:07:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "wangyanan (Y)" X-Patchwork-Id: 1499944 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 4GGW4r1d31z9shx for ; Fri, 2 Jul 2021 20:08:43 +1000 (AEST) Received: from localhost ([::1]:53604 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lzG6D-00057Q-4i for incoming@patchwork.ozlabs.org; Fri, 02 Jul 2021 06:08:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50446) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lzG5U-00055P-P1 for qemu-devel@nongnu.org; Fri, 02 Jul 2021 06:07:56 -0400 Received: from szxga02-in.huawei.com ([45.249.212.188]:2059) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lzG5Q-0003Kx-SW for qemu-devel@nongnu.org; Fri, 02 Jul 2021 06:07:56 -0400 Received: from dggemv711-chm.china.huawei.com (unknown [172.30.72.56]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4GGW025rGLzZmKH; Fri, 2 Jul 2021 18:04:34 +0800 (CST) Received: from dggpemm500023.china.huawei.com (7.185.36.83) by dggemv711-chm.china.huawei.com (10.1.198.66) 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:42 +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:42 +0800 From: Yanan Wang To: Subject: [RFC PATCH 0/6] machine: smp parsing fixes and improvement Date: Fri, 2 Jul 2021 18:07:33 +0800 Message-ID: <20210702100739.13672-1-wangyanan55@huawei.com> X-Mailer: git-send-email 2.8.4.windows.1 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" Hello, Here are some smp parsing fix and improvement, most of which is about the smp parsing helpers. This series was arranged based on the latest QEMU code since commit d940d468e29b. Description: Patch #1 improves the calculation of maxcpus. Patch #2 and #3 adds the missing zero-check for values of sockets and dies. Patch #4 allows us to uniformly use maxcpus for all calculations. Patch #5 reject the configuration of dies more strictly for non-PC machines. Patch #6 makes no functional change but tweaks the order of topology parameters. Regards, Yanan Yanan Wang (6): machine: Set the value of maxcpus to match cpus if specified as zero machine: Perform zero-check for the computed value of sockets pc/machine: Perform zero-check for the value of -smp dies machine: Uniformly use maxcpus to calculate the missing values pc/machine: Disallow any configuration of dies for non-PC machines machine: Tweak the order of topology members in struct CpuTopology hw/core/machine.c | 49 +++++++++++++++++++++++++-------------------- hw/i386/pc.c | 48 +++++++++++++++++++++++++------------------- include/hw/boards.h | 7 ++++--- qapi/machine.json | 2 +- 4 files changed, 59 insertions(+), 47 deletions(-)