From nobody Mon Feb 9 04:46:22 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1560440404; cv=none; d=zoho.com; s=zohoarc; b=X7qyNqGcyVhIQxmXzvFSK7xEIkTpRYE/tRRacsH79bYFnmGENppZDqYJLm/ZSgiNIrtM7SKRyZXGzX4ki2NlbP7IeYEKCSv0ss9eaa+a6yFqwZZESdV2JpHRxFy5wF7ZjJMM/DXbiWC5vf4fG0Wn1kCWQ9V2BUeCxc9dnAMLerw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1560440404; 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:ARC-Authentication-Results; bh=26RzvpiKk0Tw2ahsEUVqgmsrB23gI1uw541UxMTXrqA=; b=m/sFzZrKLrEP541QddObDIKcFfG5i4IjAIFlmgGTcaxZDQ584lpaFMeC5GM8U1MDs8QI7tiavaaxHNhLB+PP1F5zEZgoZwlhk+BAn8gljPqIWtm6eL4DsRepoY3AsjQ5Wb2AJhlpBEF6D1Lu7hWIyX0E5nflK0gKgHlXHYVHbfw= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1560440404607333.17115323876135; Thu, 13 Jun 2019 08:40:04 -0700 (PDT) Received: from localhost ([::1]:41018 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hbRpW-0003y6-ET for importer@patchew.org; Thu, 13 Jun 2019 11:39:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42952) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hbQq8-0001mh-IW for qemu-devel@nongnu.org; Thu, 13 Jun 2019 10:36:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hbQq6-0001ue-Gk for qemu-devel@nongnu.org; Thu, 13 Jun 2019 10:36:32 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37664) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hbQq4-0001jD-Fz for qemu-devel@nongnu.org; Thu, 13 Jun 2019 10:36:30 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 42782300740A; Thu, 13 Jun 2019 14:36:13 +0000 (UTC) Received: from x1w.redhat.com (unknown [10.40.205.141]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4BF471001DC0; Thu, 13 Jun 2019 14:36:10 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Thu, 13 Jun 2019 16:34:36 +0200 Message-Id: <20190613143446.23937-11-philmd@redhat.com> In-Reply-To: <20190613143446.23937-1-philmd@redhat.com> References: <20190613143446.23937-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Thu, 13 Jun 2019 14:36:13 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 10/20] hw/i386/pc: Pass the boot_cpus value by argument 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: Yang Zhong , Eduardo Habkost , kvm@vger.kernel.org, "Michael S. Tsirkin" , Marcelo Tosatti , Rob Bradford , Paolo Bonzini , Samuel Ortiz , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" The boot_cpus is used once. Pass it by argument, this will allow us to remove the PCMachineState argument later. Suggested-by: Samuel Ortiz Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/i386/pc.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 75fb1a154a..4c5a968143 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -932,7 +932,8 @@ static void pc_build_smbios(PCMachineState *pcms) } } =20 -static FWCfgState *fw_cfg_arch_create(PCMachineState *pcms) +static FWCfgState *fw_cfg_arch_create(PCMachineState *pcms, + uint16_t boot_cpus) { FWCfgState *fw_cfg; uint64_t *numa_fw_cfg; @@ -942,7 +943,7 @@ static FWCfgState *fw_cfg_arch_create(PCMachineState *p= cms) =20 fw_cfg =3D fw_cfg_init_io_dma(FW_CFG_IO_BASE, FW_CFG_IO_BASE + 4, &address_space_memory); - fw_cfg_add_i16(fw_cfg, FW_CFG_NB_CPUS, pcms->boot_cpus); + fw_cfg_add_i16(fw_cfg, FW_CFG_NB_CPUS, boot_cpus); =20 /* FW_CFG_MAX_CPUS is a bit confusing/problematic on x86: * @@ -1766,7 +1767,7 @@ void pc_memory_init(PCMachineState *pcms, option_rom_mr, 1); =20 - fw_cfg =3D fw_cfg_arch_create(pcms); + fw_cfg =3D fw_cfg_arch_create(pcms, pcms->boot_cpus); =20 rom_set_fw(fw_cfg); =20 --=20 2.20.1