From nobody Wed Nov 5 14:26:05 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1534827139098748.4895207512145; Mon, 20 Aug 2018 21:52:19 -0700 (PDT) Received: from localhost ([::1]:50745 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fryeP-0005it-VT for importer@patchew.org; Tue, 21 Aug 2018 00:52:18 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56612) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fryMw-0004F3-ES for qemu-devel@nongnu.org; Tue, 21 Aug 2018 00:34:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fryMt-0000RW-Tt for qemu-devel@nongnu.org; Tue, 21 Aug 2018 00:34:14 -0400 Received: from ozlabs.org ([203.11.71.1]:49975) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fryMs-0000NV-0S; Tue, 21 Aug 2018 00:34:11 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 41vd9G4V6cz9sCt; Tue, 21 Aug 2018 14:33:52 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1534826034; bh=piomX5EAFEwE2xNGlYagosu7FasxP05zkhex69Tcvu0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AN5F2WZ79BxdsGY3/H1ZWZw3ouORO6lyMK4ep51cFSsvStWqz3mn6LEsI0DifOtyR ItoNU3yIPDsoYr/PvIgCSAwNuSBu4CpIyzaUkgUVQVTrOb7/9RRlmYWhrTXEXMsz93 MLwVqzEqHcjQetygIcX2qxp/hpAcUANKNL7u4MVU= From: David Gibson To: peter.maydell@linaro.org Date: Tue, 21 Aug 2018 14:33:39 +1000 Message-Id: <20180821043343.7514-23-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180821043343.7514-1-david@gibson.dropbear.id.au> References: <20180821043343.7514-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 203.11.71.1 Subject: [Qemu-devel] [PULL 22/26] 40p: don't use legacy fw_cfg_init_mem() function X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: lvivier@redhat.com, aik@ozlabs.ru, Mark Cave-Ayland , groug@kaod.org, qemu-devel@nongnu.org, qemu-ppc@nongnu.org, clg@kaod.org, David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" From: Mark Cave-Ayland Instead initialise the device via qdev to allow us to set device properties directly as required. Signed-off-by: Mark Cave-Ayland Acked-by: Herv=C3=A9 Poussineau Signed-off-by: David Gibson --- hw/ppc/prep.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c index 83083e4f1b..47146ba12a 100644 --- a/hw/ppc/prep.c +++ b/hw/ppc/prep.c @@ -618,7 +618,7 @@ static void ibm_40p_init(MachineState *machine) uint16_t cmos_checksum; PowerPCCPU *cpu; DeviceState *dev; - SysBusDevice *pcihost; + SysBusDevice *pcihost, *s; Nvram *m48t59 =3D NULL; PCIBus *pci_bus; ISABus *isa_bus; @@ -711,7 +711,16 @@ static void ibm_40p_init(MachineState *machine) } =20 /* Prepare firmware configuration for OpenBIOS */ - fw_cfg =3D fw_cfg_init_mem(CFG_ADDR, CFG_ADDR + 2); + dev =3D qdev_create(NULL, TYPE_FW_CFG_MEM); + fw_cfg =3D FW_CFG(dev); + qdev_prop_set_uint32(dev, "data_width", 1); + qdev_prop_set_bit(dev, "dma_enabled", false); + object_property_add_child(OBJECT(qdev_get_machine()), TYPE_FW_CFG, + OBJECT(fw_cfg), NULL); + qdev_init_nofail(dev); + s =3D SYS_BUS_DEVICE(dev); + sysbus_mmio_map(s, 0, CFG_ADDR); + sysbus_mmio_map(s, 1, CFG_ADDR + 2); =20 if (machine->kernel_filename) { /* load kernel */ --=20 2.17.1