From nobody Sat May 18 10:29:59 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass(p=quarantine dis=none) header.from=amd.com ARC-Seal: i=2; a=rsa-sha256; t=1686106294; cv=pass; d=zohomail.com; s=zohoarc; b=ZtcoJdc0J3ok/7c9AHf2XNSZdaM2bn6PSITYjNUIL1u9qFA7Yn7C95pmiK5oppkp1EykcuBSOwZopL90wY6dKNTM1dUlZIX0E4JwAmXyAb/2GUS9Rh8Zqo2EHyxB/tek9If9NHcyBgA/fznafHBNjjtkXwedZkWv8YCYpwXdLN8= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1686106294; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=DnnkjAIUfAsrQaRCV0CPp+2TM9Ws5yjKKcFt6C1ghxk=; b=OZQGw4AarH+kYCx6sdEbrkf6cSM29zZoujCkYiwhxvIO02VtIO8SPREGbBElsDhg6m/991+hH+DMmojzpghKN9oHymlUdlv8JO4kHcmlR37VvVPTgfKXhonu6L0UMOam61/JsNJKN9C7Jt3QMH53iZX8BvsRSp+AbLnp4M9UuAU= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; 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=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1686106294129232.91933383460378; Tue, 6 Jun 2023 19:51:34 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q6jFX-0000zw-Q9; Tue, 06 Jun 2023 22:50:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q6jFW-0000zm-Cv for qemu-devel@nongnu.org; Tue, 06 Jun 2023 22:50:14 -0400 Received: from mail-bn8nam04on2062b.outbound.protection.outlook.com ([2a01:111:f400:7e8d::62b] helo=NAM04-BN8-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q6jFU-00029l-B4 for qemu-devel@nongnu.org; Tue, 06 Jun 2023 22:50:14 -0400 Received: from BN0PR02CA0050.namprd02.prod.outlook.com (2603:10b6:408:e5::25) by PH8PR12MB7255.namprd12.prod.outlook.com (2603:10b6:510:224::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6455.33; Wed, 7 Jun 2023 02:50:06 +0000 Received: from BN8NAM11FT106.eop-nam11.prod.protection.outlook.com (2603:10b6:408:e5:cafe::d7) by BN0PR02CA0050.outlook.office365.com (2603:10b6:408:e5::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6477.19 via Frontend Transport; Wed, 7 Jun 2023 02:50:06 +0000 Received: from SATLEXMB04.amd.com (165.204.84.17) by BN8NAM11FT106.mail.protection.outlook.com (10.13.177.7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6455.33 via Frontend Transport; Wed, 7 Jun 2023 02:50:06 +0000 Received: from ruby-95f9host.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Tue, 6 Jun 2023 21:50:03 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fAEkGcunfvhSsV0AKrLAy1mY+4ydofgO5RI4JSRlWKtWPzSp4YawV3oTAUq3/EQcygglSGrIHzMCjRs6Xi7LJSqdkkc1UaTA3yg+fq5C/GQPEveKDsgM3r//bJ4yUWbdbLn9jl7helRK9UdBWxGm4mYws/dRHzMQmMtB0vX0bvbDefoclCRevCWFY8SeBOQC0W0Mg19kGiz2rDKSEImOtvD6nT1/p2CshXoj1syrWS/XMl4XDdKV8yITwXvNDoqlP1DT5dN6mF1Xe5KeyU7+81ZxFFhRMofDEHeQfXKGTWlvvK10RMAW/4+a9+1yIlKt0ce/lqSIgWjG6aryjdLnRw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=DnnkjAIUfAsrQaRCV0CPp+2TM9Ws5yjKKcFt6C1ghxk=; b=bFU87hLcIJcTsw0zRtOjUKBohlh9LtqqUqo2bAeDrPUyLAtpn3miYKTIye6tluhw4YYGhS4B6gt6ZkKgjJhCyOY8Ya2rGzoGAd/ad5cCW7JaUxSLHEwTOMEBi8yYgAVM1T9bTlvP9h5TUvfhgOFzqNB1LD0ViHtd3CT1yk0MVQJt3WxqPAa2naHbI+P8rtSOyOc++0o/VYmFRTsk6OyYfITNfodfBgmp5Ne89K2zfmzlPU5xNun+QAUUDsnFBODHM6CtIC53d75ZInQKZV1cVwL18hhRnSbvL/xElj3NL5x8aYLwALpwyCF8hLxStoAuV0HDNlQUqNbUG+xoo0bn9A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=nongnu.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=DnnkjAIUfAsrQaRCV0CPp+2TM9Ws5yjKKcFt6C1ghxk=; b=ySFdugH64Xnj1g5fdbHrNhXFnN1tDcsq4+orbm7IQmgq/IqZK4z+iaeOgGHkKEt+f0arzGpGNAXzEkx8ZLKCfIoAjZFd2rK1aI6TlZCWxB8BQ0kqrFVch3+t1ArSGP9GPPHxwxtyZiPVfuaw40zv5GCJTJlwCc9cd+eX0kU4ts0= X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; 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 (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C From: Suravee Suthikulpanit To: CC: , , , , , , , , , , , , Suravee Suthikulpanit Subject: [PATCH v5 1/3] hw/i386/pc: Refactor logic to set SMBIOS defaults Date: Tue, 6 Jun 2023 21:49:37 -0500 Message-ID: <20230607024939.703991-2-suravee.suthikulpanit@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230607024939.703991-1-suravee.suthikulpanit@amd.com> References: <20230607024939.703991-1-suravee.suthikulpanit@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN8NAM11FT106:EE_|PH8PR12MB7255:EE_ X-MS-Office365-Filtering-Correlation-Id: b825fe7c-6037-4baf-3b92-08db6701e689 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: xLh14kLVfFojqXmgRZ6NZka9KDeQiOqpt4aX/5ltydWs3fk0gAzbYHZlu7NFLUEKWOlgS1lWMElilnMCsig9b36QATiVNXla3K/ix4TVEZnHSLMctj6lGPhkozw5sgyssSnMdwQAwb+cZQsdPuWOPOvacKK6zBcMIpnzBz3nHRWjrA5UlZjIotnQ6dTgEpn6oZgZT/lr20bN3Z9SSI/C3mybFlW+iOS8/LUIfz0/M84cOpPNTKN5UoPodhYpDDSnewkjrRWhuf27dRAq1zN7Q5YHRp5x5xQ1lYOgCpVmRFqNp7Mm4kKVRPQ/RbtWBRXtSp4pJIrxYzakex4EwxyiqFgOiyoic3bv5AzXJ5HMxmb44zMuSz0GGGfK3aS4HCPBvulCV79LRRnCLxnaKfrjRQRu7sSvo8/mDy7FF83jUlmVXVpJK44yUTz4ZpsOT9Fb7vkM0tS4jOdGa48rk9/MaHVGD5thWhJWnVdS8pfPfX/w0eYF5RdeGaRfIrIxj63r55swICkWGmo9uwDtKBi1A6IUNtwW0N+ZUJXwKBVEmh6rvGpVSVK6n25qDzIH5dfJBtoLV2xIdTGXyhcVIYE4xb4J2jow/CX9Caxc6/O+BPSA2qvOGwzuzmzki+oNLPeoEUSEzrPtwRZ3+hBMuGCf15Tp5JAEkMkfvAph/44Dp//GJ4Ydd9VTX71AFXSbtlrSb8cXuXxnyj1LULZ9HvWn1PPWNSc6kA6QEGE3uRhZpoy5TDsXVDbMKKHlcjxFloLB3pgaMnKnl4pPixmtIw13HA== X-Forefront-Antispam-Report: CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:SATLEXMB04.amd.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230028)(4636009)(396003)(346002)(376002)(39860400002)(136003)(451199021)(46966006)(36840700001)(40470700004)(36756003)(40460700003)(2906002)(54906003)(478600001)(82310400005)(86362001)(7416002)(41300700001)(8936002)(8676002)(5660300002)(82740400003)(316002)(81166007)(356005)(44832011)(6916009)(40480700001)(4326008)(70586007)(70206006)(83380400001)(47076005)(1076003)(2616005)(26005)(16526019)(186003)(336012)(426003)(36860700001)(6666004)(7696005)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Jun 2023 02:50:06.2188 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b825fe7c-6037-4baf-3b92-08db6701e689 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT106.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR12MB7255 Received-SPF: softfail client-ip=2a01:111:f400:7e8d::62b; envelope-from=Suravee.Suthikulpanit@amd.com; helo=NAM04-BN8-obe.outbound.protection.outlook.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @amd.com) X-ZM-MESSAGEID: 1686106295063100002 Content-Type: text/plain; charset="utf-8" Into a helper function pc_machine_init_smbios() in preparation for subsequent code to upgrade default SMBIOS entry point type. Then, call the helper function from the pc_machine_initfn() to eliminate duplicate code in pc_q35.c and pc_pixx.c. However, this changes the ordering of when the smbios_set_defaults() is called to before pc_machine_set_smbios_ep() (i.e. before handling the user specified QEMU option "-M ...,smbios-entry-point-type=3D[32|64]" to override the default type.) Therefore, also call the helper function in pc_machine_set_smbios_ep() to update the defaults. There is no functional change. Signed-off-by: Suravee Suthikulpanit Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/i386/pc.c | 24 +++++++++++++++++++++++- hw/i386/pc_piix.c | 9 --------- hw/i386/pc_q35.c | 8 -------- 3 files changed, 23 insertions(+), 18 deletions(-) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index bb62c994fa..b720dc67b6 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1756,6 +1756,22 @@ static void pc_machine_set_default_bus_bypass_iommu(= Object *obj, bool value, pcms->default_bus_bypass_iommu =3D value; } =20 +static void pc_machine_init_smbios(PCMachineState *pcms) +{ + PCMachineClass *pcmc =3D PC_MACHINE_GET_CLASS(pcms); + MachineClass *mc =3D MACHINE_GET_CLASS(pcms); + + if (!pcmc->smbios_defaults) { + return; + } + + /* These values are guest ABI, do not change */ + smbios_set_defaults("QEMU", mc->desc, + mc->name, pcmc->smbios_legacy_mode, + pcmc->smbios_uuid_encoded, + pcms->smbios_entry_point_type); +} + static void pc_machine_get_smbios_ep(Object *obj, Visitor *v, const char *= name, void *opaque, Error **errp) { @@ -1768,9 +1784,14 @@ static void pc_machine_get_smbios_ep(Object *obj, Vi= sitor *v, const char *name, static void pc_machine_set_smbios_ep(Object *obj, Visitor *v, const char *= name, void *opaque, Error **errp) { + SmbiosEntryPointType ep_type; PCMachineState *pcms =3D PC_MACHINE(obj); =20 - visit_type_SmbiosEntryPointType(v, name, &pcms->smbios_entry_point_typ= e, errp); + if (!visit_type_SmbiosEntryPointType(v, name, &ep_type, errp)) { + return; + } + pcms->smbios_entry_point_type =3D ep_type; + pc_machine_init_smbios(pcms); } =20 static void pc_machine_get_max_ram_below_4g(Object *obj, Visitor *v, @@ -1878,6 +1899,7 @@ static void pc_machine_initfn(Object *obj) object_property_add_alias(OBJECT(pcms), "pcspk-audiodev", OBJECT(pcms->pcspk), "audiodev"); cxl_machine_init(obj, &pcms->cxl_devices_state); + pc_machine_init_smbios(pcms); } =20 int pc_machine_kvm_type(MachineState *machine, const char *kvm_type) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index d5b0dcd1fe..da6ba4eeb4 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -198,15 +198,6 @@ static void pc_init1(MachineState *machine, =20 pc_guest_info_init(pcms); =20 - if (pcmc->smbios_defaults) { - MachineClass *mc =3D MACHINE_GET_CLASS(machine); - /* These values are guest ABI, do not change */ - smbios_set_defaults("QEMU", mc->desc, - mc->name, pcmc->smbios_legacy_mode, - pcmc->smbios_uuid_encoded, - pcms->smbios_entry_point_type); - } - /* allocate ram and load rom/bios */ if (!xen_enabled()) { pc_memory_init(pcms, system_memory, rom_memory, hole64_size); diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 6155427e48..a58cd1d3ea 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -198,14 +198,6 @@ static void pc_q35_init(MachineState *machine) =20 pc_guest_info_init(pcms); =20 - if (pcmc->smbios_defaults) { - /* These values are guest ABI, do not change */ - smbios_set_defaults("QEMU", mc->desc, - mc->name, pcmc->smbios_legacy_mode, - pcmc->smbios_uuid_encoded, - pcms->smbios_entry_point_type); - } - /* create pci host bus */ q35_host =3D Q35_HOST_DEVICE(qdev_new(TYPE_Q35_HOST_DEVICE)); =20 --=20 2.34.1 From nobody Sat May 18 10:29:59 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass(p=quarantine dis=none) header.from=amd.com ARC-Seal: i=2; a=rsa-sha256; t=1686106294; cv=pass; d=zohomail.com; s=zohoarc; b=FzKUcdDsB6mJmWSqmq337OOTlgyvXRq2KyIRRHpI8W/5do0VoMNPzfWueXazdBSMfFgssx680wnhEqj43InsLHKetC0ChxhRpGmpouEXF3M1qvE+d6Z5Fiat9R4pHGsKROGFXsorNWCnqDlGJUMUKwz7KThdJSwK/QXf1QEQaLo= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1686106294; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=BYyvetY9dEO3GOSo4MPE7xao1BakK2r6LElIsmcQK78=; b=YeXDKF3uPB234Zje6L8m6y8mqDmv0aCw+Q3tI3OVPk/18oWf4Al7v1/1Um1ADFaYMWn4G8uZeEf3zrTdEdvH1UszWmAXsPQbpoisq7i1mB318EfB+CuPqVw3dErll0FfHxcykCqZZdQ6RX/jvB1WyS+/hEc7TWkNpRBDNnjHxH4= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; 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=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 16861062944301020.4128596236328; Tue, 6 Jun 2023 19:51:34 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q6jFc-00011B-CJ; Tue, 06 Jun 2023 22:50:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q6jFY-00010M-I8 for qemu-devel@nongnu.org; Tue, 06 Jun 2023 22:50:16 -0400 Received: from mail-bn8nam11on20600.outbound.protection.outlook.com ([2a01:111:f400:7eae::600] helo=NAM11-BN8-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q6jFV-00029q-2L for qemu-devel@nongnu.org; Tue, 06 Jun 2023 22:50:16 -0400 Received: from BN0PR02CA0045.namprd02.prod.outlook.com (2603:10b6:408:e5::20) by PH8PR12MB6819.namprd12.prod.outlook.com (2603:10b6:510:1ca::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6455.32; Wed, 7 Jun 2023 02:50:06 +0000 Received: from BN8NAM11FT106.eop-nam11.prod.protection.outlook.com (2603:10b6:408:e5:cafe::d5) by BN0PR02CA0045.outlook.office365.com (2603:10b6:408:e5::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6477.19 via Frontend Transport; Wed, 7 Jun 2023 02:50:06 +0000 Received: from SATLEXMB04.amd.com (165.204.84.17) by BN8NAM11FT106.mail.protection.outlook.com (10.13.177.7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6455.33 via Frontend Transport; Wed, 7 Jun 2023 02:50:06 +0000 Received: from ruby-95f9host.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Tue, 6 Jun 2023 21:50:04 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Is4QOH/h3vD0XAo4faDYjnPMgLVmch+xVzpm0N4zpSo1gmbVjxn0Z4YnsnbW2lXLblW+q85TcCeNpfBncqRjZqw28BNBTYVMVvKlSLFgblYpdvEKIgrSeZFVG5rmdfC28P8ap/KkALZB0egwmfji6lou+NSw33uB1IGBnlsNkmB1i9TLeS1b5bHh8BL30ajzlwea4rThIn53c/zQ1HRro94xJrAmltjY6oXrSjR4iJ08HPBo3yaTXy3G2p0R+7C4xVSxNDJx37mSGwZMoE2/HkfrP6ZQPS0KxRLmZMFjjTknc/RgNIhc6UNjf6kTWVer0UP7A28+Bje+X/ylTT9x+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=BYyvetY9dEO3GOSo4MPE7xao1BakK2r6LElIsmcQK78=; b=bd6t9qmvPpU4dqgWR9vmODR3dtl4Gzdpxu+fNs/RQJowZW3H+JKOkJnKB/N/+TPC8PvjRlGtWfhtcJZcxOD0NkeLchrUdkpVoDbWB66aZfg93YnTmRJ8ei2puNLFj/vMworMJbHBN9bvKHHxDrJZw6jF6fOSX6GDMlXNXlYjKyt2B5Yr0xCAGok0kDVka+rZ9sm0HcHaBhkTqVw39LceBHhAS/VupyOU4x3dKNveryh4xzIczr0knzZSq2jvu63SBNpuq1lz/p2SdctWLBbSBWPleFLKVOn+r6cBNV8Vid6RX89fPJb7kfjNIBuiOQxSuS/+3ThcT3uV/D13llMm5A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=nongnu.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=BYyvetY9dEO3GOSo4MPE7xao1BakK2r6LElIsmcQK78=; b=Pb8g/UF7/wRmrtkSFAEd662S316M6/MQ/hjuVdjbqcheRHnm5wslnaHt7SbsIv7zWCoe/2q3+XxATqVXSkB7eFhAfKk9rdA7vpfzDb7z9uJIUQ1MA7sltuYdIm+/jy1HeOn/9uHghoNqOfs7G73lG7vs3Ikt8wxQ9GG4oB7MNBE= X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; 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 (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C From: Suravee Suthikulpanit To: CC: , , , , , , , , , , , , Suravee Suthikulpanit Subject: [PATCH v5 2/3] hw/i386/pc: Default to use SMBIOS 3.0 for newer machine models Date: Tue, 6 Jun 2023 21:49:38 -0500 Message-ID: <20230607024939.703991-3-suravee.suthikulpanit@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230607024939.703991-1-suravee.suthikulpanit@amd.com> References: <20230607024939.703991-1-suravee.suthikulpanit@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN8NAM11FT106:EE_|PH8PR12MB6819:EE_ X-MS-Office365-Filtering-Correlation-Id: d2c55fb9-2afd-42d6-8540-08db6701e6d5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Vl8bGWQgdY/qZYbZKUK7hHUF4OAQSqj20kWVMcj+tjyS9BnyHBxeJQrxZjZD0Lu4MoivydzshnKBJYaOUiO04JafYUkSRFvuMJ4YBRLujk9/qwr/27nGQ3zVtj8hmRpDjoFqFQ1yaSGoLNuZ8gcV7pcoJaDnzRAQcXgn4YtIw8naPTIrJ0kvvulHdu57A06ocTS/B6N0CFGNbjf+IkXlcpKRajnsb0dO3CDxXhXEgvj69vGzUsGEZ3/h5vcVKzbmtvVNTGn5WdlyweEyuNdc7pR/yAvKsiBjDcMWifa7cpydXyLElO8g7JRf9KUl2HwJHJunYqtRAkzUEVV6uQDqR7KXBjW92RdOvyFVnynwqwUWLMTlnEVVVS76UgpGlHgqdzRbeAmuxMqBL2LEhr9r2lSt+VMPES0hQkdpww0JyPrCE1Pnbl/L0/XkW1I0euDMcHfV3uFKpS2jXeVwdc3x3B5qJX71qu+GyQF0lIpX/IOY3tImn5ygkv87ffoVyZ+/X34ynh1EvCXHwbqwoCTHy9jwSCI8AmGBc4udy5NOTx+5Ov1Zpe8EKHitHJh/hZxuQlnXRvcBkXs6ljj0cQlhjLKyciRz5oYX9sq5pAmGBqjMUbun91URvDKHoBHM2xFII332RLaWBRH3KNn0zKYPdxUeoDTUSZFBVqfjmDoaHm/J7PzZ1lIpRz6GVFm+WRtn0p4DhYUlJndSIMEzvHsO6vhs3D1pbNmhQo/cmnX2tZrrRF1n6yghyySzNeWKqXZlIDwSlZo+SR5AQ64Pljy/IncYGyhizx+PQzUGJWp4RO4= X-Forefront-Antispam-Report: CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:SATLEXMB04.amd.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230028)(4636009)(346002)(396003)(136003)(376002)(39860400002)(451199021)(40470700004)(46966006)(36840700001)(26005)(1076003)(40460700003)(40480700001)(36756003)(36860700001)(47076005)(426003)(336012)(83380400001)(86362001)(82310400005)(16526019)(81166007)(356005)(2616005)(186003)(82740400003)(8936002)(41300700001)(44832011)(54906003)(2906002)(6916009)(478600001)(70206006)(70586007)(8676002)(4326008)(316002)(7416002)(5660300002)(7696005)(6666004)(170073001)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Jun 2023 02:50:06.7500 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d2c55fb9-2afd-42d6-8540-08db6701e6d5 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT106.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR12MB6819 Received-SPF: softfail client-ip=2a01:111:f400:7eae::600; envelope-from=Suravee.Suthikulpanit@amd.com; helo=NAM11-BN8-obe.outbound.protection.outlook.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @amd.com) X-ZM-MESSAGEID: 1686106295234100005 Content-Type: text/plain; charset="utf-8" Currently, pc-q35 and pc-i44fx machine models are default to use SMBIOS 2.8 (32-bit entry point). Since SMBIOS 3.0 (64-bit entry point) is now fully supported since QEMU 7.0, default to use SMBIOS 3.0 for newer machine models. This is necessary to avoid the following message when launching a VM with large number of vcpus. "SMBIOS 2.1 table length 66822 exceeds 65535" Signed-off-by: Suravee Suthikulpanit --- hw/i386/pc.c | 6 +++++- hw/i386/pc_piix.c | 5 +++++ hw/i386/pc_q35.c | 5 +++++ include/hw/i386/pc.h | 1 + 4 files changed, 16 insertions(+), 1 deletion(-) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index b720dc67b6..b5c585579a 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1765,6 +1765,8 @@ static void pc_machine_init_smbios(PCMachineState *pc= ms) return; } =20 + pcms->smbios_entry_point_type =3D pcmc->default_smbios_ep_type; + /* These values are guest ABI, do not change */ smbios_set_defaults("QEMU", mc->desc, mc->name, pcmc->smbios_legacy_mode, @@ -1786,11 +1788,12 @@ static void pc_machine_set_smbios_ep(Object *obj, V= isitor *v, const char *name, { SmbiosEntryPointType ep_type; PCMachineState *pcms =3D PC_MACHINE(obj); + PCMachineClass *pcmc =3D PC_MACHINE_GET_CLASS(pcms); =20 if (!visit_type_SmbiosEntryPointType(v, name, &ep_type, errp)) { return; } - pcms->smbios_entry_point_type =3D ep_type; + pcmc->default_smbios_ep_type =3D ep_type; pc_machine_init_smbios(pcms); } =20 @@ -2002,6 +2005,7 @@ static void pc_machine_class_init(ObjectClass *oc, vo= id *data) mc->nvdimm_supported =3D true; mc->smp_props.dies_supported =3D true; mc->default_ram_id =3D "pc.ram"; + pcmc->default_smbios_ep_type =3D SMBIOS_ENTRY_POINT_TYPE_64; =20 object_class_property_add(oc, PC_MACHINE_MAX_RAM_BELOW_4G, "size", pc_machine_get_max_ram_below_4g, pc_machine_set_max_ram_below_4g, diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index da6ba4eeb4..1a2bb25c75 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -467,11 +467,16 @@ DEFINE_I440FX_MACHINE(v8_1, "pc-i440fx-8.1", NULL, =20 static void pc_i440fx_8_0_machine_options(MachineClass *m) { + PCMachineClass *pcmc =3D PC_MACHINE_CLASS(m); + pc_i440fx_8_1_machine_options(m); m->alias =3D NULL; m->is_default =3D false; compat_props_add(m->compat_props, hw_compat_8_0, hw_compat_8_0_len); compat_props_add(m->compat_props, pc_compat_8_0, pc_compat_8_0_len); + + /* For pc-i44fx-8.0 and older, use SMBIOS 2.8 by default */ + pcmc->default_smbios_ep_type =3D SMBIOS_ENTRY_POINT_TYPE_32; } =20 DEFINE_I440FX_MACHINE(v8_0, "pc-i440fx-8.0", NULL, diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index a58cd1d3ea..371cca7484 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -379,10 +379,15 @@ DEFINE_Q35_MACHINE(v8_1, "pc-q35-8.1", NULL, =20 static void pc_q35_8_0_machine_options(MachineClass *m) { + PCMachineClass *pcmc =3D PC_MACHINE_CLASS(m); + pc_q35_8_1_machine_options(m); m->alias =3D NULL; compat_props_add(m->compat_props, hw_compat_8_0, hw_compat_8_0_len); compat_props_add(m->compat_props, pc_compat_8_0, pc_compat_8_0_len); + + /* For pc-q35-8.0 and older, use SMBIOS 2.8 by default */ + pcmc->default_smbios_ep_type =3D SMBIOS_ENTRY_POINT_TYPE_32; } =20 DEFINE_Q35_MACHINE(v8_0, "pc-q35-8.0", NULL, diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index c661e9cc80..6eec0fc51d 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -110,6 +110,7 @@ struct PCMachineClass { bool smbios_defaults; bool smbios_legacy_mode; bool smbios_uuid_encoded; + SmbiosEntryPointType default_smbios_ep_type; =20 /* RAM / address space compat: */ bool gigabyte_align; --=20 2.34.1 From nobody Sat May 18 10:29:59 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass(p=quarantine dis=none) header.from=amd.com ARC-Seal: i=2; a=rsa-sha256; t=1686106294; cv=pass; d=zohomail.com; s=zohoarc; b=O/iquTXT3e6FaXJ47x+QrNdHCSgBrgWfLvNZ0KfiUUn8ZlK72vSE/CJC/cKuXGKYRlTRlS5zuiB97XIP0HJCr/FdvyTUoby2D653SUrKLFM/c68apdgDhx19JkY2YMfCVfZPFcEWPFmPqrXQ2CUoMIdGbFlue+maDRvTyfrTn9s= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1686106294; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=W3lWz8INAjGJKDKpj9tdUng8pcT38myJDNXnG7l8GpA=; b=AQuG4OgPs26HvfziAny5XJFdOWbsNT2MmNVfyrdRVsNJuBUWpHtV5Hc6uuH+UB9nku358oStATGtEvbibKMkayr9Fzu0T97LkXgB/6Dzxgu9pquhREKtdMtOrYntpG+VXJ22hvNFKWAbcLi9iZEuD1b0K9CiphaiDo0lDorub3U= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; 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=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1686106294181255.92241113915463; Tue, 6 Jun 2023 19:51:34 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q6jFa-00010n-Bo; Tue, 06 Jun 2023 22:50:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q6jFX-000101-VD for qemu-devel@nongnu.org; Tue, 06 Jun 2023 22:50:15 -0400 Received: from mail-dm3nam02on20619.outbound.protection.outlook.com ([2a01:111:f400:7e83::619] helo=NAM02-DM3-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q6jFU-00029g-RG for qemu-devel@nongnu.org; Tue, 06 Jun 2023 22:50:15 -0400 Received: from BN0PR02CA0045.namprd02.prod.outlook.com (2603:10b6:408:e5::20) by PH0PR12MB7862.namprd12.prod.outlook.com (2603:10b6:510:26d::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6433.26; Wed, 7 Jun 2023 02:50:08 +0000 Received: from BN8NAM11FT106.eop-nam11.prod.protection.outlook.com (2603:10b6:408:e5:cafe::87) by BN0PR02CA0045.outlook.office365.com (2603:10b6:408:e5::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6477.19 via Frontend Transport; Wed, 7 Jun 2023 02:50:07 +0000 Received: from SATLEXMB04.amd.com (165.204.84.17) by BN8NAM11FT106.mail.protection.outlook.com (10.13.177.7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6455.33 via Frontend Transport; Wed, 7 Jun 2023 02:50:07 +0000 Received: from ruby-95f9host.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Tue, 6 Jun 2023 21:50:05 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BBAK5WwNu7F6XIeVWzyIcIe9MckbWGJo29oKnF2nMGuptfVH0/Z6g0YvMZ1awpbduXuukW1NRt8Zch3ykqMk/sbCxFQwajMgtGYj+W7rsWhPUIk6j58Re/DI1fF9Ay8958uxWjHe6qC3faQJH40b7h8D1CbLwRk/fhKcc+LLFg9fOfSr6Ud/R3aXscXd1FIIXIMhfx8xEh6ZfS9mVjUrvlAsnQVyH35xPQgUhWeb6i4xKgoWIbcl4RPFUUXMlg9F6SnXmg/G67eRWeed+jOp/Ll0w5oN3NRXvz7sMqIMTGqA4ekHETOynIGeIY5pEj3nQcHYG5qHgi6F4NtT9UEiWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=W3lWz8INAjGJKDKpj9tdUng8pcT38myJDNXnG7l8GpA=; b=Csavjx6M+6Hey4+hkfib84+yiqpUmAecConiIO1oWTkbXUequegvJ8jwMDdl9Q45ugYYppU+RugNUqnSJINT7828g5ns5CSCkEb1G0mZ9P0WQSLt9FNuMWc846COH8nuTddtkSIOUVrZbTXL2Byf/pBww+U5T0DyGcbRIiOAp0lvFMvqI1bNGjAZV3mo4anBKJDXq4iimkNU2Y4EWgtY39w6QU3eBIGL6YJtpBkktwPkTsvFJH4x3y9pV+c88gUmLJbCG2xPB/fCsswQW6iLW3ETrfH5IB5iC/amDuLKtCMs2bLqBTXNZT7bvCMRYgXskjWCbVtb6RL9fQUjBbbpBQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=nongnu.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=W3lWz8INAjGJKDKpj9tdUng8pcT38myJDNXnG7l8GpA=; b=Mu+LZoEStDADp4FYni9GEctFPDAx2wNGI35XWS6wmWM5Jj6riqGTUJ/Asvtm6gwQ8/AZ1ayuMwO3QC8ELNmLAVmD8VEESRusn8CWI+70XAoSbCo/G3hw1Zin9rrLfEZ37NDpA+P8RRV4IaM2+jsp7XpAJ+27UwIGCmpM2WjFYSk= X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; 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 (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C From: Suravee Suthikulpanit To: CC: , , , , , , , , , , , , Suravee Suthikulpanit Subject: [PATCH v5 3/3] pc: q35: Bump max_cpus to 1024 Date: Tue, 6 Jun 2023 21:49:39 -0500 Message-ID: <20230607024939.703991-4-suravee.suthikulpanit@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230607024939.703991-1-suravee.suthikulpanit@amd.com> References: <20230607024939.703991-1-suravee.suthikulpanit@amd.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN8NAM11FT106:EE_|PH0PR12MB7862:EE_ X-MS-Office365-Filtering-Correlation-Id: 14c9ec38-5f5c-4671-cee3-08db6701e721 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6adu+05ciZIjfAmkdIIzQYqqibRy3jee2DXRa3fIrJwu4h+0JrZ4H1chzNtRcd0yE82sn0YnadXwUU3SsFzRp1ndO1M80lhSEqe4pjXxwUsQ4hElNjg94Z69I+b10vS7KmN5K4qwvBenDF1LaHXnOeVFoFkLjczXcJYlcupGfXtaz35an7Al+n1QbDG2fYHlMOLR+zjPNM3bxnDfid0jEgj7AK7PwrMCtKA5/tf4K+dCtfh2DjtJgs/LeXOv+ff/GQkPUV+UyHKJPpJ4pp9ttqCAYhGMhugVHaS13uY9XgGwdpixj9CquGZ9yYVOs+ScVAMxba8K2gsVP0e8ZmY1y1luvVil76kuQN6Mc5iU+fNryf9rlutxpImu79Fmc3Enh8OjFpgPDtTnuyYu9aspHJQWevcE3sE0+++cTrV4zREemgwi037v3WdhV2XSUmnED0LcKJAV6ukgzZp7iOSAEXu7xuFfgp//KzUFmE7mtLrOSEw0FLGbQq0Q36Y0HW/ScRN+dEktU83nOUP/eEi39m660RerHAjkflhGquf5JY9l2F96TuM+QqBq7qjeFPTCXf+vc5HbHrdgnl1dYnF4T03K5Qa8JQI1mMCGahZ2HvArGT83+BmxTkBKkFCJoOMJN6qVTETnaVfdvj78DhefA8Y6BsnQDxGJOtsdrJ7DWfF7GB3AWAsIZxZMq327PY7GEEX0UVekgGQJpW8PLyPYhvxvW2S3MNDcenwks+YJh0HnaxDnXAKgYrVznThdGk9DxmzsP0Z5Djp9CR/O3lPQEeZ2aBNAR4Popg/L5YPZd2c= X-Forefront-Antispam-Report: CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:SATLEXMB04.amd.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230028)(4636009)(396003)(346002)(39860400002)(136003)(376002)(451199021)(40470700004)(36840700001)(46966006)(36756003)(7696005)(478600001)(316002)(70586007)(6666004)(70206006)(82310400005)(6916009)(4326008)(41300700001)(54906003)(86362001)(40460700003)(16526019)(47076005)(44832011)(36860700001)(186003)(40480700001)(7416002)(5660300002)(2906002)(81166007)(8936002)(1076003)(83380400001)(2616005)(82740400003)(8676002)(336012)(356005)(426003)(26005)(21314003)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Jun 2023 02:50:07.2500 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 14c9ec38-5f5c-4671-cee3-08db6701e721 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT106.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR12MB7862 Received-SPF: softfail client-ip=2a01:111:f400:7e83::619; envelope-from=Suravee.Suthikulpanit@amd.com; helo=NAM02-DM3-obe.outbound.protection.outlook.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @amd.com) X-ZM-MESSAGEID: 1686106295978100011 Since KVM_MAX_VCPUS is currently defined to 1024 for x86 as shown in arch/x86/include/asm/kvm_host.h, update QEMU limits to the same number. In case KVM could not support the specified number of vcpus, QEMU would return the following error message: qemu-system-x86_64: kvm_init_vcpu: kvm_get_vcpu failed (xxx): Invalid arg= ument Also, keep max_cpus at 288 for machine version 8.0 and older. Cc: Igor Mammedov Cc: Daniel P. Berrang=C3=A9 Cc: Michael S. Tsirkin Cc: Julia Suvorova Signed-off-by: Suravee Suthikulpanit Reviewed-by: Igor Mammedov --- hw/i386/pc_q35.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 371cca7484..63866a16e0 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -360,12 +360,12 @@ static void pc_q35_machine_options(MachineClass *m) m->default_nic =3D "e1000e"; m->default_kernel_irqchip_split =3D false; m->no_floppy =3D 1; + m->max_cpus =3D 1024; m->no_parallel =3D !module_object_class_by_name(TYPE_ISA_PARALLEL); machine_class_allow_dynamic_sysbus_dev(m, TYPE_AMD_IOMMU_DEVICE); machine_class_allow_dynamic_sysbus_dev(m, TYPE_INTEL_IOMMU_DEVICE); machine_class_allow_dynamic_sysbus_dev(m, TYPE_RAMFB_DEVICE); machine_class_allow_dynamic_sysbus_dev(m, TYPE_VMBUS_BRIDGE); - m->max_cpus =3D 288; } =20 static void pc_q35_8_1_machine_options(MachineClass *m) @@ -388,6 +388,7 @@ static void pc_q35_8_0_machine_options(MachineClass *m) =20 /* For pc-q35-8.0 and older, use SMBIOS 2.8 by default */ pcmc->default_smbios_ep_type =3D SMBIOS_ENTRY_POINT_TYPE_32; + m->max_cpus =3D 288; } =20 DEFINE_Q35_MACHINE(v8_0, "pc-q35-8.0", NULL, --=20 2.34.1