From nobody Thu Nov 6 00:35:58 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 1538433079070810.6560176238075; Mon, 1 Oct 2018 15:31:19 -0700 (PDT) Received: from localhost ([::1]:40975 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g76ik-00062g-0I for importer@patchew.org; Mon, 01 Oct 2018 18:31:18 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35160) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g76XU-00041Z-GD for qemu-devel@nongnu.org; Mon, 01 Oct 2018 18:19:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g76OH-0007Kg-8V for qemu-devel@nongnu.org; Mon, 01 Oct 2018 18:10:11 -0400 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:33292) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1g76OH-0007I1-03 for qemu-devel@nongnu.org; Mon, 01 Oct 2018 18:10:09 -0400 Received: by mail-wm1-x342.google.com with SMTP id y140-v6so3547842wmd.0 for ; Mon, 01 Oct 2018 15:10:08 -0700 (PDT) Received: from x1.local (11.red-88-24-160.staticip.rima-tde.net. [88.24.160.11]) by smtp.gmail.com with ESMTPSA id 185-v6sm13554914wmy.38.2018.10.01.15.10.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 01 Oct 2018 15:10:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=TLfE/NctGfJNgscKmEDsGlNw0O7peG1r8g8M4McGz6I=; b=EFCrBmf3DmG5NV1YEtpqA4U0Uc48+NqTt8lehVpVW3oHUppAox5gbs1kIkpcA9mAm8 GJSQ/kpcmmAD1Wk+8CXbhCRyqwhwDetxgX2skX4as3LsQLb9hfDSkqxbaxhaGWrdrfAQ 0dZuaVbfUNT6nsP3CJ2gkMP/hhBeTrRunu18JRvTlMxGtBdxlcH1Py/DRulmGpJfiT7b 5xIyXDA2AU/M6tRizggPa/aqJkaJQKFzM7seNQbw+sJXRI35/apcuud9vfR7TTTNngOT QgGDaKiuwIEEDifNiCU9PRHBa4P8CoUHk31DwNarjvbIywW72aOtQJHFvkrRipSDh+jU AXSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=TLfE/NctGfJNgscKmEDsGlNw0O7peG1r8g8M4McGz6I=; b=A0eQ5wuDlRoIrjXdKRRKG983dOWv+PoDwgQOizAldtupy5R0GwEstpHKD7y+ynQTxe tPLfY2MIQcUs5twQs32mprAaGn5LRhOWI8TheqXwKKcMXSkszYV8t+UTc+jwkRrT5n9b is6btdw3Z5CxMogToyxZiEOhVqAoy3LPuVTUj55vdrVZfIlAyDvryLRlWtHJrnMAti33 4vRdDady5FOrFBefjuKd6L9iWDBm1ZGug9p18sfQ2+XbLqcQYUvgUoDPG+3mHhj1WCTh FS2s5Qv2pyKiFegkthaG6cqI2KyUWUEuQfusd1SGoeIzF0qWZJc1LmgK+uoRk0Wg838k XMGg== X-Gm-Message-State: ABuFfognSnkUdJZNHQe5lYRIKu6d4m2qj1zBlLAKEemUiRfDFfYXtUSg QkLAcIiM1xD8UueSTfUBJDM+2hv6 X-Google-Smtp-Source: ACcGV60qysIg5LfSc3Q5VadQNqy0eil8+WCn1RC45NzLWxN0Mu5m2GuVsGLrm3lGMRkL3VygljGHhA== X-Received: by 2002:a1c:a9ce:: with SMTP id s197-v6mr7591wme.82.1538431807703; Mon, 01 Oct 2018 15:10:07 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Peter Maydell , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= Date: Tue, 2 Oct 2018 00:09:32 +0200 Message-Id: <20181001220942.2382-6-f4bug@amsat.org> X-Mailer: git-send-email 2.19.0 In-Reply-To: <20181001220942.2382-1-f4bug@amsat.org> References: <20181001220942.2382-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::342 Subject: [Qemu-devel] [PATCH 05/15] hw/sh4/sh_pci: Use DeviceState::realize rather than SysBusDevice::init 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: Aurelien Jarno , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Eduardo Habkost , qemu-devel@nongnu.org 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 Move from the legacy SysBusDevice::init method to using DeviceState::realiz= e. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: C=C3=A9dric Le Goater --- hw/sh4/sh_pci.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/hw/sh4/sh_pci.c b/hw/sh4/sh_pci.c index 4ec2e35500..84c52df067 100644 --- a/hw/sh4/sh_pci.c +++ b/hw/sh4/sh_pci.c @@ -120,16 +120,15 @@ static void sh_pci_set_irq(void *opaque, int irq_num,= int level) qemu_set_irq(pic[irq_num], level); } =20 -static int sh_pci_device_init(SysBusDevice *dev) +static void sh_pci_device_realize(PCIDevice *dev, Error **errp) { - PCIHostState *phb; - SHPCIState *s; + SysBusDevice *sbd =3D SYS_BUS_DEVICE(dev); + SHPCIState *s =3D SH_PCI_HOST_BRIDGE(dev); + PCIHostState *phb =3D PCI_HOST_BRIDGE(s); int i; =20 - s =3D SH_PCI_HOST_BRIDGE(dev); - phb =3D PCI_HOST_BRIDGE(s); for (i =3D 0; i < 4; i++) { - sysbus_init_irq(dev, &s->irq[i]); + sysbus_init_irq(sbd, &s->irq[i]); } phb->bus =3D pci_register_root_bus(DEVICE(dev), "pci", sh_pci_set_irq, sh_pci_map_irq, @@ -143,13 +142,12 @@ static int sh_pci_device_init(SysBusDevice *dev) &s->memconfig_p4, 0, 0x224); memory_region_init_alias(&s->isa, OBJECT(s), "sh_pci.isa", get_system_io(), 0, 0x40000); - sysbus_init_mmio(dev, &s->memconfig_p4); - sysbus_init_mmio(dev, &s->memconfig_a7); + sysbus_init_mmio(sbd, &s->memconfig_p4); + sysbus_init_mmio(sbd, &s->memconfig_a7); s->iobr =3D 0xfe240000; memory_region_add_subregion(get_system_memory(), s->iobr, &s->isa); =20 s->dev =3D pci_create_simple(phb->bus, PCI_DEVFN(0, 0), "sh_pci_host"); - return 0; } =20 static void sh_pci_host_realize(PCIDevice *d, Error **errp) @@ -187,9 +185,9 @@ static const TypeInfo sh_pci_host_info =3D { =20 static void sh_pci_device_class_init(ObjectClass *klass, void *data) { - SysBusDeviceClass *sdc =3D SYS_BUS_DEVICE_CLASS(klass); + PCIDeviceClass *k =3D PCI_DEVICE_CLASS(klass); =20 - sdc->init =3D sh_pci_device_init; + k->realize =3D sh_pci_device_realize; } =20 static const TypeInfo sh_pci_device_info =3D { --=20 2.19.0