From nobody Mon Feb 9 22:23:09 2026 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 1506498850327468.6197305290739; Wed, 27 Sep 2017 00:54:10 -0700 (PDT) Received: from localhost ([::1]:53043 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dx7AF-0001qO-EZ for importer@patchew.org; Wed, 27 Sep 2017 03:53:51 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57084) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dx70a-0001iN-TD for qemu-devel@nongnu.org; Wed, 27 Sep 2017 03:43:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dx70W-0004GT-SJ for qemu-devel@nongnu.org; Wed, 27 Sep 2017 03:43:52 -0400 Received: from ozlabs.org ([103.22.144.67]:38985) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dx70W-0004Cy-FZ; Wed, 27 Sep 2017 03:43:48 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 3y28vT3GYlz9tY4; Wed, 27 Sep 2017 17:43:31 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1506498213; bh=vvdL94TXb0P2ga1ihMMkT6CTGna3vHsaXnAp+zLao4Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GV5cO/w3WQpr27wfOzSCAqCKVko9r8BaeTJdSUBs80FSqqHP7YkncJNtST86tBh2B JUc5SOxp8hQjzDocge6m+B6Qq3dQn0BZTHRmOs/nR1WyvZukOKZsHEvLwy6emqL8yC Jd0gig5GVAHKMtqERr2o3oCQvjq6F5VHEtMtF89M= From: David Gibson To: peter.maydell@linaro.org Date: Wed, 27 Sep 2017 17:43:16 +1000 Message-Id: <20170927074316.4454-27-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.13.5 In-Reply-To: <20170927074316.4454-1-david@gibson.dropbear.id.au> References: <20170927074316.4454-1-david@gibson.dropbear.id.au> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 103.22.144.67 Subject: [Qemu-devel] [PULL 26/26] macio: use object link between MACIO_IDE and MAC_DBDMA object 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: agraf@suse.de, mark.cave-ayland@ilande.co.uk, qemu-devel@nongnu.org, groug@kaod.org, qemu-ppc@nongnu.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-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Mark Cave-Ayland Using a standard QOM object link we can pass a reference to the MAC_DBDMA controller to the MACIO_IDE object which removes the last external parameter to macio_ide_register_dma(). Signed-off-by: Mark Cave-Ayland Signed-off-by: David Gibson --- hw/ide/macio.c | 9 ++++++--- hw/misc/macio/macio.c | 3 ++- hw/ppc/mac.h | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/hw/ide/macio.c b/hw/ide/macio.c index 19d5f5a8b3..ce194c6cec 100644 --- a/hw/ide/macio.c +++ b/hw/ide/macio.c @@ -450,6 +450,10 @@ static void macio_ide_initfn(Object *obj) sysbus_init_irq(d, &s->real_dma_irq); s->dma_irq =3D qemu_allocate_irq(pmac_ide_irq, s, 0); s->ide_irq =3D qemu_allocate_irq(pmac_ide_irq, s, 1); + + object_property_add_link(obj, "dbdma", TYPE_MAC_DBDMA, + (Object **) &s->dbdma, + qdev_prop_allow_set_link_before_realize, 0, N= ULL); } =20 static Property macio_ide_properties[] =3D { @@ -493,10 +497,9 @@ void macio_ide_init_drives(MACIOIDEState *s, DriveInfo= **hd_table) } } =20 -void macio_ide_register_dma(MACIOIDEState *s, void *dbdma) +void macio_ide_register_dma(MACIOIDEState *s) { - s->dbdma =3D dbdma; - DBDMA_register_channel(dbdma, s->channel, s->dma_irq, + DBDMA_register_channel(s->dbdma, s->channel, s->dma_irq, pmac_ide_transfer, pmac_ide_flush, s); } =20 diff --git a/hw/misc/macio/macio.c b/hw/misc/macio/macio.c index 41b377e7a0..9aa7e7559b 100644 --- a/hw/misc/macio/macio.c +++ b/hw/misc/macio/macio.c @@ -160,7 +160,8 @@ static void macio_realize_ide(MacIOState *s, MACIOIDESt= ate *ide, sysbus_connect_irq(sysbus_dev, 0, irq0); sysbus_connect_irq(sysbus_dev, 1, irq1); qdev_prop_set_uint32(DEVICE(ide), "channel", dmaid); - macio_ide_register_dma(ide, s->dbdma); + object_property_set_link(OBJECT(ide), OBJECT(s->dbdma), "dbdma", errp); + macio_ide_register_dma(ide); =20 object_property_set_bool(OBJECT(ide), true, "realized", errp); } diff --git a/hw/ppc/mac.h b/hw/ppc/mac.h index b3a26c49c1..b501af1653 100644 --- a/hw/ppc/mac.h +++ b/hw/ppc/mac.h @@ -147,7 +147,7 @@ typedef struct MACIOIDEState { } MACIOIDEState; =20 void macio_ide_init_drives(MACIOIDEState *ide, DriveInfo **hd_table); -void macio_ide_register_dma(MACIOIDEState *ide, void *dbdma); +void macio_ide_register_dma(MACIOIDEState *ide); =20 void macio_init(PCIDevice *dev, MemoryRegion *pic_mem, --=20 2.13.5