{"id":817912,"url":"http://patchwork.ozlabs.org/api/patches/817912/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/1506264466-28252-7-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-7-git-send-email-mark.cave-ayland@ilande.co.uk>","list_archive_url":null,"date":"2017-09-24T14:47:45","name":"[6/7] mac_dbdma: change DBDMA_register_channel to a MAC_DBDMA type method","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"d964c6af574034432ccb0bc39083a6fb49ed713c","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-7-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/817912/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/817912/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 3y0VYY30Cvz9s8J\n\tfor ;\n\tMon, 25 Sep 2017 00:52:17 +1000 (AEST)","from localhost ([::1]:38435 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dw8GV-0005qf-IP\n\tfor incoming@patchwork.ozlabs.org; Sun, 24 Sep 2017 10:52:15 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:57215)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dw8Ce-0002jU-88\n\tfor qemu-devel@nongnu.org; Sun, 24 Sep 2017 10:48:17 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dw8Cd-0002K8-9a\n\tfor qemu-devel@nongnu.org; Sun, 24 Sep 2017 10:48:16 -0400","from chuckie.co.uk ([82.165.15.123]:49778\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 1dw8Ca-0002Bi-IR; Sun, 24 Sep 2017 10:48:12 -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 1dw8CX-0006gI-RP; Sun, 24 Sep 2017 15:48:11 +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:45 +0100","Message-Id":"<1506264466-28252-7-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 6/7] mac_dbdma: change DBDMA_register_channel\n\tto a MAC_DBDMA type method","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 this we can change the MACIO_IDE instance to register the channel\nitself via a type method instead of requiring a separate\nDBDMA_register_channel() function.\n\nAs a consequence of this it is now possible to remove the old external\nmacio_ide_register_dma() function.\n\nSigned-off-by: Mark Cave-Ayland \n---\n hw/ide/macio.c | 12 ++++++------\n hw/misc/macio/mac_dbdma.c | 9 +++++----\n hw/misc/macio/macio.c | 1 -\n include/hw/ppc/mac_dbdma.h | 9 ++++-----\n 4 files changed, 15 insertions(+), 16 deletions(-)","diff":"diff --git a/hw/ide/macio.c b/hw/ide/macio.c\nindex ce194c6..b296017 100644\n--- a/hw/ide/macio.c\n+++ b/hw/ide/macio.c\n@@ -411,12 +411,18 @@ static const IDEDMAOps dbdma_ops = {\n static void macio_ide_realizefn(DeviceState *dev, Error **errp)\n {\n MACIOIDEState *s = MACIO_IDE(dev);\n+ DBDMAState *dbdma;\n \n ide_init2(&s->bus, s->ide_irq);\n \n /* Register DMA callbacks */\n s->dma.ops = &dbdma_ops;\n s->bus.dma = &s->dma;\n+\n+ /* Register DBDMA channel */\n+ dbdma = MAC_DBDMA(object_property_get_link(OBJECT(dev), \"dbdma\", errp));\n+ dbdma->register_channel(dbdma, s->channel, s->dma_irq,\n+ pmac_ide_transfer, pmac_ide_flush, s);\n }\n \n static void pmac_ide_irq(void *opaque, int n, int level)\n@@ -497,10 +503,4 @@ void macio_ide_init_drives(MACIOIDEState *s, DriveInfo **hd_table)\n }\n }\n \n-void macio_ide_register_dma(MACIOIDEState *s)\n-{\n- DBDMA_register_channel(s->dbdma, s->channel, s->dma_irq,\n- pmac_ide_transfer, pmac_ide_flush, s);\n-}\n-\n type_init(macio_ide_register_types)\ndiff --git a/hw/misc/macio/mac_dbdma.c b/hw/misc/macio/mac_dbdma.c\nindex 0eddf2e..addb97d 100644\n--- a/hw/misc/macio/mac_dbdma.c\n+++ b/hw/misc/macio/mac_dbdma.c\n@@ -557,11 +557,10 @@ void DBDMA_kick(DBDMAState *dbdma)\n qemu_bh_schedule(dbdma->bh);\n }\n \n-void DBDMA_register_channel(void *dbdma, int nchan, qemu_irq irq,\n- DBDMA_rw rw, DBDMA_flush flush,\n- void *opaque)\n+static void\n+dbdma_register_channel(DBDMAState *s, int nchan, qemu_irq irq,\n+ DBDMA_rw rw, DBDMA_flush flush, void *opaque)\n {\n- DBDMAState *s = dbdma;\n DBDMA_channel *ch = &s->channels[nchan];\n \n DBDMA_DPRINTFCH(ch, \"DBDMA_register_channel 0x%x\\n\", nchan);\n@@ -903,6 +902,8 @@ static void mac_dbdma_init(Object *obj)\n \n memory_region_init_io(&s->mem, obj, &dbdma_ops, s, \"dbdma\", 0x1000);\n sysbus_init_mmio(sbd, &s->mem);\n+\n+ s->register_channel = dbdma_register_channel;\n }\n \n static void mac_dbdma_realize(DeviceState *dev, Error **errp)\ndiff --git a/hw/misc/macio/macio.c b/hw/misc/macio/macio.c\nindex 9aa7e75..533331a 100644\n--- a/hw/misc/macio/macio.c\n+++ b/hw/misc/macio/macio.c\n@@ -161,7 +161,6 @@ static void macio_realize_ide(MacIOState *s, MACIOIDEState *ide,\n sysbus_connect_irq(sysbus_dev, 1, irq1);\n qdev_prop_set_uint32(DEVICE(ide), \"channel\", dmaid);\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/include/hw/ppc/mac_dbdma.h b/include/hw/ppc/mac_dbdma.h\nindex 26cc469..d6a38c5 100644\n--- a/include/hw/ppc/mac_dbdma.h\n+++ b/include/hw/ppc/mac_dbdma.h\n@@ -160,19 +160,18 @@ typedef struct DBDMA_channel {\n dbdma_cmd current;\n } DBDMA_channel;\n \n-typedef struct {\n+typedef struct DBDMAState {\n SysBusDevice parent_obj;\n \n MemoryRegion mem;\n DBDMA_channel channels[DBDMA_CHANNELS];\n QEMUBH *bh;\n+\n+ void (*register_channel)(struct DBDMAState *s, int nchan, qemu_irq irq,\n+ DBDMA_rw rw, DBDMA_flush flush, void *opaque);\n } DBDMAState;\n \n /* Externally callable functions */\n-\n-void DBDMA_register_channel(void *dbdma, int nchan, qemu_irq irq,\n- DBDMA_rw rw, DBDMA_flush flush,\n- void *opaque);\n void DBDMA_kick(DBDMAState *dbdma);\n \n #define TYPE_MAC_DBDMA \"mac-dbdma\"\n","prefixes":["6/7"]}