From nobody Sun Nov 16 14:20:09 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 ARC-Seal: i=1; a=rsa-sha256; t=1600590143; cv=none; d=zohomail.com; s=zohoarc; b=mvGshs72tSOVVf+Es9JckiEock1TeK6APPy3P408T4WOD5FUr/qPPsBkcrnmurb7XOxF1iJm9fGbJ7O+IpodAtSHDK4cPpQ/DGS4CPa4s0u2lfiB9cgXsak2mRqEeNMuyZbDJup96UN/43M0i2ao+1exJTfCHbIF8U4xHtcm/u0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600590143; h=Content-Transfer-Encoding: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=SRVSdTArYZLaTwB29EfJfOlcM8dC0zmcslGOPR/0gTQ=; b=T7Uv4yIkFYXu55c5PO2Av4ab8YpQDkozWY/UAPbClKYyw4SWbO2QwWHyxOPdim0PXwlpDIVh2xOItiZ3gcCj6JLDctzqWBFWWZ/TW6Lb2MqQJDOSxO+xhmtPfleqWxuSNqTBM0bCnqOxNaxBR1fen0TppmXcVAmithh+1mZU7oo= ARC-Authentication-Results: i=1; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1600590143261294.92574765475695; Sun, 20 Sep 2020 01:22:23 -0700 (PDT) Received: from localhost ([::1]:59520 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kJuc1-00059p-M1 for importer@patchew.org; Sun, 20 Sep 2020 04:22:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46046) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kJuaY-0003UZ-3r; Sun, 20 Sep 2020 04:20:50 -0400 Received: from mail.ilande.co.uk ([2001:41c9:1:41f::167]:56542 helo=mail.default.ilande.uk0.bigv.io) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kJuaW-0003ud-GQ; Sun, 20 Sep 2020 04:20:49 -0400 Received: from host81-154-161-117.range81-154.btcentralplus.com ([81.154.161.117] helo=kentang.home) by mail.default.ilande.uk0.bigv.io with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kJub0-0006Dn-U6; Sun, 20 Sep 2020 09:21:25 +0100 From: Mark Cave-Ayland To: armbru@redhat.com, david@gibson.dropbear.id.au, atar4qemu@gmail.com, qemu-devel@nongnu.org, qemu-ppc@nongnu.org Date: Sun, 20 Sep 2020 09:20:15 +0100 Message-Id: <20200920082018.16135-4-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200920082018.16135-1-mark.cave-ayland@ilande.co.uk> References: <20200920082018.16135-1-mark.cave-ayland@ilande.co.uk> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-SA-Exim-Connect-IP: 81.154.161.117 X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk Subject: [PATCH 3/6] sparc32-espdma: use object_initialize_child() for esp child object X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on mail.default.ilande.uk0.bigv.io) 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=2001:41c9:1:41f::167; envelope-from=mark.cave-ayland@ilande.co.uk; helo=mail.default.ilande.uk0.bigv.io X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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, 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.23 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" Content-Type: text/plain; charset="utf-8" Store the child object directly within the sparc32-espdma object rather than using link properties. Signed-off-by: Mark Cave-Ayland Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/dma/sparc32_dma.c | 17 ++++++++--------- include/hw/sparc/sparc32_dma.h | 2 +- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/hw/dma/sparc32_dma.c b/hw/dma/sparc32_dma.c index 84196afb95..2cbe331959 100644 --- a/hw/dma/sparc32_dma.c +++ b/hw/dma/sparc32_dma.c @@ -290,27 +290,26 @@ static const TypeInfo sparc32_dma_device_info =3D { static void sparc32_espdma_device_init(Object *obj) { DMADeviceState *s =3D SPARC32_DMA_DEVICE(obj); + ESPDMADeviceState *es =3D SPARC32_ESPDMA_DEVICE(obj); =20 memory_region_init_io(&s->iomem, OBJECT(s), &dma_mem_ops, s, "espdma-mmio", DMA_SIZE); + + object_initialize_child(obj, "esp", &es->esp, TYPE_ESP); } =20 static void sparc32_espdma_device_realize(DeviceState *dev, Error **errp) { - DeviceState *d; - SysBusESPState *sysbus; - ESPState *esp; - - d =3D qdev_new(TYPE_ESP); - object_property_add_child(OBJECT(dev), "esp", OBJECT(d)); - sysbus =3D ESP(d); - esp =3D &sysbus->esp; + ESPDMADeviceState *es =3D SPARC32_ESPDMA_DEVICE(dev); + SysBusESPState *sysbus =3D ESP(&es->esp); + ESPState *esp =3D &sysbus->esp; + esp->dma_memory_read =3D espdma_memory_read; esp->dma_memory_write =3D espdma_memory_write; esp->dma_opaque =3D SPARC32_DMA_DEVICE(dev); sysbus->it_shift =3D 2; esp->dma_enabled =3D 1; - sysbus_realize_and_unref(SYS_BUS_DEVICE(d), &error_fatal); + sysbus_realize(SYS_BUS_DEVICE(sysbus), &error_fatal); } =20 static void sparc32_espdma_device_class_init(ObjectClass *klass, void *dat= a) diff --git a/include/hw/sparc/sparc32_dma.h b/include/hw/sparc/sparc32_dma.h index f2bfe272ba..d40eca0cc8 100644 --- a/include/hw/sparc/sparc32_dma.h +++ b/include/hw/sparc/sparc32_dma.h @@ -32,7 +32,7 @@ DECLARE_INSTANCE_CHECKER(ESPDMADeviceState, SPARC32_ESPDM= A_DEVICE, struct ESPDMADeviceState { DMADeviceState parent_obj; =20 - SysBusESPState *esp; + SysBusESPState esp; }; =20 #define TYPE_SPARC32_LEDMA_DEVICE "sparc32-ledma" --=20 2.20.1