From nobody Fri Sep 5 22:30:46 2025 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; dmarc=fail(p=none dis=none) header.from=eik.bme.hu Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1746141687421927.8571627542101; Thu, 1 May 2025 16:21:27 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uAdDH-00050O-LE; Thu, 01 May 2025 19:21:07 -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 1uAdCu-0004hi-7r; Thu, 01 May 2025 19:20:44 -0400 Received: from zero.eik.bme.hu ([152.66.115.2]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uAdCs-0007Ez-Cr; Thu, 01 May 2025 19:20:43 -0400 Received: from zero.eik.bme.hu (localhost [127.0.0.1]) by zero.eik.bme.hu (Postfix) with ESMTP id 74D1555D264; Fri, 02 May 2025 01:20:40 +0200 (CEST) Received: from zero.eik.bme.hu ([127.0.0.1]) by zero.eik.bme.hu (zero.eik.bme.hu [127.0.0.1]) (amavisd-new, port 10028) with ESMTP id IGxjj3DIh9hO; Fri, 2 May 2025 01:20:38 +0200 (CEST) Received: by zero.eik.bme.hu (Postfix, from userid 432) id 8128155D265; Fri, 02 May 2025 01:20:38 +0200 (CEST) X-Virus-Scanned: amavisd-new at eik.bme.hu Message-ID: In-Reply-To: References: From: BALATON Zoltan Subject: [PATCH 06/13] hw/ppc/pegasos2: Rename mv field in machine state To: qemu-devel@nongnu.org, qemu-ppc@nongnu.org Cc: Nicholas Piggin Date: Fri, 02 May 2025 01:20:38 +0200 (CEST) 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=152.66.115.2; envelope-from=balaton@eik.bme.hu; helo=zero.eik.bme.hu X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=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.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-ZM-MESSAGEID: 1746141692404019100 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Use more generic name for the field used to store the north bridge in the machine state. Signed-off-by: BALATON Zoltan Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/ppc/pegasos2.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/hw/ppc/pegasos2.c b/hw/ppc/pegasos2.c index 7dc7803c64..9b50cd3dab 100644 --- a/hw/ppc/pegasos2.c +++ b/hw/ppc/pegasos2.c @@ -68,7 +68,7 @@ struct Pegasos2MachineState { MachineState parent_obj; =20 PowerPCCPU *cpu; - DeviceState *mv; + DeviceState *nb; /* north bridge */ IRQState pci_irqs[PCI_NUM_PINS]; OrIRQState orirq[PCI_NUM_PINS]; qemu_irq mv_pirq[PCI_NUM_PINS]; @@ -166,12 +166,12 @@ static void pegasos2_init(MachineState *machine) } =20 /* Marvell Discovery II system controller */ - pm->mv =3D DEVICE(sysbus_create_simple(TYPE_MV64361, -1, + pm->nb =3D DEVICE(sysbus_create_simple(TYPE_MV64361, -1, qdev_get_gpio_in(DEVICE(pm->cpu), PPC6xx_INPUT_I= NT))); for (i =3D 0; i < PCI_NUM_PINS; i++) { - pm->mv_pirq[i] =3D qdev_get_gpio_in_named(pm->mv, "gpp", 12 + i); + pm->mv_pirq[i] =3D qdev_get_gpio_in_named(pm->nb, "gpp", 12 + i); } - pci_bus =3D mv64361_get_pci_bus(pm->mv, 1); + pci_bus =3D mv64361_get_pci_bus(pm->nb, 1); =20 /* VIA VT8231 South Bridge (multifunction PCI device) */ via =3D OBJECT(pci_new_multifunction(PCI_DEVFN(12, 0), TYPE_VT8231_ISA= )); @@ -190,7 +190,7 @@ static void pegasos2_init(MachineState *machine) object_resolve_path_component(via, "rtc"), "date"); qdev_connect_gpio_out_named(DEVICE(via), "intr", 0, - qdev_get_gpio_in_named(pm->mv, "gpp", 31)); + qdev_get_gpio_in_named(pm->nb, "gpp", 31)); =20 dev =3D PCI_DEVICE(object_resolve_path_component(via, "ide")); pci_ide_create_devs(dev); @@ -208,7 +208,7 @@ static void pegasos2_init(MachineState *machine) DeviceState *pd; g_autofree const char *pn =3D g_strdup_printf("pcihost%d", h); =20 - pd =3D DEVICE(object_resolve_path_component(OBJECT(pm->mv), pn)); + pd =3D DEVICE(object_resolve_path_component(OBJECT(pm->nb), pn)); assert(pd); for (i =3D 0; i < PCI_NUM_PINS; i++) { OrIRQState *ori =3D &pm->orirq[i]; @@ -267,7 +267,7 @@ static void pegasos2_init(MachineState *machine) static uint32_t pegasos2_mv_reg_read(Pegasos2MachineState *pm, uint32_t addr, uint32_t len) { - MemoryRegion *r =3D sysbus_mmio_get_region(SYS_BUS_DEVICE(pm->mv), 0); + MemoryRegion *r =3D sysbus_mmio_get_region(SYS_BUS_DEVICE(pm->nb), 0); uint64_t val =3D 0xffffffffULL; memory_region_dispatch_read(r, addr, &val, size_memop(len) | MO_LE, MEMTXATTRS_UNSPECIFIED); @@ -277,7 +277,7 @@ static uint32_t pegasos2_mv_reg_read(Pegasos2MachineSta= te *pm, static void pegasos2_mv_reg_write(Pegasos2MachineState *pm, uint32_t addr, uint32_t len, uint32_t val) { - MemoryRegion *r =3D sysbus_mmio_get_region(SYS_BUS_DEVICE(pm->mv), 0); + MemoryRegion *r =3D sysbus_mmio_get_region(SYS_BUS_DEVICE(pm->nb), 0); memory_region_dispatch_write(r, addr, val, size_memop(len) | MO_LE, MEMTXATTRS_UNSPECIFIED); } @@ -858,10 +858,10 @@ static void *build_fdt(MachineState *machine, int *fd= t_size) =20 fi.fdt =3D fdt; fi.path =3D "/pci@c0000000"; - pci_bus =3D mv64361_get_pci_bus(pm->mv, 0); + pci_bus =3D mv64361_get_pci_bus(pm->nb, 0); pci_for_each_device_reverse(pci_bus, 0, add_pci_device, &fi); fi.path =3D "/pci@80000000"; - pci_bus =3D mv64361_get_pci_bus(pm->mv, 1); + pci_bus =3D mv64361_get_pci_bus(pm->nb, 1); pci_for_each_device_reverse(pci_bus, 0, add_pci_device, &fi); =20 return fdt; --=20 2.41.3