{"id":817915,"url":"http://patchwork.ozlabs.org/api/patches/817915/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/1506264466-28252-6-git-send-email-mark.cave-ayland@ilande.co.uk/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<1506264466-28252-6-git-send-email-mark.cave-ayland@ilande.co.uk>","list_archive_url":null,"date":"2017-09-24T14:47:44","name":"[5/7] macio: use object link between MACIO_IDE and MAC_DBDMA object","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"3dc6a76aca4812e7bbc1bc81b5a99ebe08faa07f","submitter":{"id":12451,"url":"http://patchwork.ozlabs.org/api/people/12451/?format=json","name":"Mark Cave-Ayland","email":"mark.cave-ayland@ilande.co.uk"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/1506264466-28252-6-git-send-email-mark.cave-ayland@ilande.co.uk/mbox/","series":[{"id":4817,"url":"http://patchwork.ozlabs.org/api/series/4817/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=4817","date":"2017-09-24T14:47:39","name":"mac_dbdma: tidy-up and QOMify","version":1,"mbox":"http://patchwork.ozlabs.org/series/4817/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/817915/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/817915/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":"ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3y0VcJ33djz9s7B\n\tfor ;\n\tMon, 25 Sep 2017 00:54:40 +1000 (AEST)","from localhost ([::1]:38444 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dw8Io-0007pp-Hu\n\tfor incoming@patchwork.ozlabs.org; Sun, 24 Sep 2017 10:54:38 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:57196)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dw8Cc-0002hu-LR\n\tfor qemu-devel@nongnu.org; Sun, 24 Sep 2017 10:48:15 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dw8Cb-0002Iz-Sl\n\tfor qemu-devel@nongnu.org; Sun, 24 Sep 2017 10:48:14 -0400","from chuckie.co.uk ([82.165.15.123]:49775\n\thelo=s16892447.onlinehome-server.info)\n\tby eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from )\n\tid 1dw8CZ-0002AZ-4h; Sun, 24 Sep 2017 10:48:11 -0400","from host86-191-82-173.range86-191.btcentralplus.com\n\t([86.191.82.173] helo=kentang.home)\n\tby s16892447.onlinehome-server.info with esmtpsa\n\t(TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.76)\n\t(envelope-from )\n\tid 1dw8CW-0006gI-Io; Sun, 24 Sep 2017 15:48:09 +0100"],"From":"Mark Cave-Ayland ","To":"qemu-ppc@nongnu.org, qemu-devel@nongnu.org, david@gibson.dropbear.id.au","Date":"Sun, 24 Sep 2017 15:47:44 +0100","Message-Id":"<1506264466-28252-6-git-send-email-mark.cave-ayland@ilande.co.uk>","X-Mailer":"git-send-email 1.7.10.4","In-Reply-To":"<1506264466-28252-1-git-send-email-mark.cave-ayland@ilande.co.uk>","References":"<1506264466-28252-1-git-send-email-mark.cave-ayland@ilande.co.uk>","X-SA-Exim-Connect-IP":"86.191.82.173","X-SA-Exim-Mail-From":"mark.cave-ayland@ilande.co.uk","X-SA-Exim-Version":"4.2.1 (built Sun, 08 Jan 2012 02:45:44 +0000)","X-SA-Exim-Scanned":"Yes (on s16892447.onlinehome-server.info)","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 3.x [fuzzy]","X-Received-From":"82.165.15.123","Subject":"[Qemu-devel] [PATCH 5/7] macio: use object link between MACIO_IDE\n\tand MAC_DBDMA object","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"Using a standard QOM object link we can pass a reference to the MAC_DBDMA\ncontroller to the MACIO_IDE object which removes the last external parameter\nto macio_ide_register_dma().\n\nSigned-off-by: Mark Cave-Ayland \n---\n hw/ide/macio.c | 9 ++++++---\n hw/misc/macio/macio.c | 3 ++-\n hw/ppc/mac.h | 2 +-\n 3 files changed, 9 insertions(+), 5 deletions(-)","diff":"diff --git a/hw/ide/macio.c b/hw/ide/macio.c\nindex 19d5f5a..ce194c6 100644\n--- a/hw/ide/macio.c\n+++ b/hw/ide/macio.c\n@@ -450,6 +450,10 @@ static void macio_ide_initfn(Object *obj)\n sysbus_init_irq(d, &s->real_dma_irq);\n s->dma_irq = qemu_allocate_irq(pmac_ide_irq, s, 0);\n s->ide_irq = qemu_allocate_irq(pmac_ide_irq, s, 1);\n+\n+ object_property_add_link(obj, \"dbdma\", TYPE_MAC_DBDMA,\n+ (Object **) &s->dbdma,\n+ qdev_prop_allow_set_link_before_realize, 0, NULL);\n }\n \n static Property macio_ide_properties[] = {\n@@ -493,10 +497,9 @@ void macio_ide_init_drives(MACIOIDEState *s, DriveInfo **hd_table)\n }\n }\n \n-void macio_ide_register_dma(MACIOIDEState *s, void *dbdma)\n+void macio_ide_register_dma(MACIOIDEState *s)\n {\n- s->dbdma = dbdma;\n- DBDMA_register_channel(dbdma, s->channel, s->dma_irq,\n+ DBDMA_register_channel(s->dbdma, s->channel, s->dma_irq,\n pmac_ide_transfer, pmac_ide_flush, s);\n }\n \ndiff --git a/hw/misc/macio/macio.c b/hw/misc/macio/macio.c\nindex 41b377e..9aa7e75 100644\n--- a/hw/misc/macio/macio.c\n+++ b/hw/misc/macio/macio.c\n@@ -160,7 +160,8 @@ static void macio_realize_ide(MacIOState *s, MACIOIDEState *ide,\n sysbus_connect_irq(sysbus_dev, 0, irq0);\n sysbus_connect_irq(sysbus_dev, 1, irq1);\n qdev_prop_set_uint32(DEVICE(ide), \"channel\", dmaid);\n- macio_ide_register_dma(ide, s->dbdma);\n+ object_property_set_link(OBJECT(ide), OBJECT(s->dbdma), \"dbdma\", errp);\n+ macio_ide_register_dma(ide);\n \n object_property_set_bool(OBJECT(ide), true, \"realized\", errp);\n }\ndiff --git a/hw/ppc/mac.h b/hw/ppc/mac.h\nindex b3a26c4..b501af1 100644\n--- a/hw/ppc/mac.h\n+++ b/hw/ppc/mac.h\n@@ -147,7 +147,7 @@ typedef struct MACIOIDEState {\n } MACIOIDEState;\n \n void macio_ide_init_drives(MACIOIDEState *ide, DriveInfo **hd_table);\n-void macio_ide_register_dma(MACIOIDEState *ide, void *dbdma);\n+void macio_ide_register_dma(MACIOIDEState *ide);\n \n void macio_init(PCIDevice *dev,\n MemoryRegion *pic_mem,\n","prefixes":["5/7"]}