{"id":817911,"url":"http://patchwork.ozlabs.org/api/patches/817911/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/1506264466-28252-3-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-3-git-send-email-mark.cave-ayland@ilande.co.uk>","list_archive_url":null,"date":"2017-09-24T14:47:41","name":"[2/7] mac_dbdma: QOMify","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"50547ba3dfb0aa9c3d8b0f5f3ec879fa3a62f522","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-3-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/817911/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/817911/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 3y0VY33Mzfz9s8J\n\tfor ;\n\tMon, 25 Sep 2017 00:51:51 +1000 (AEST)","from localhost ([::1]:38431 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dw8G5-0005SV-JV\n\tfor incoming@patchwork.ozlabs.org; Sun, 24 Sep 2017 10:51:49 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:57150)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dw8Cb-0002gb-E8\n\tfor qemu-devel@nongnu.org; Sun, 24 Sep 2017 10:48:14 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dw8Ca-0002H1-DD\n\tfor qemu-devel@nongnu.org; Sun, 24 Sep 2017 10:48:13 -0400","from chuckie.co.uk ([82.165.15.123]:49769\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 1dw8CX-00029N-8T; Sun, 24 Sep 2017 10:48:09 -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 1dw8CS-0006gI-Kh; Sun, 24 Sep 2017 15:48:05 +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:41 +0100","Message-Id":"<1506264466-28252-3-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 2/7] mac_dbdma: QOMify","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":"Signed-off-by: Mark Cave-Ayland \n---\n hw/misc/macio/mac_dbdma.c | 59 ++++++++++++++++++++++++++++++++++++--------\n include/hw/ppc/mac_dbdma.h | 6 +++++\n 2 files changed, 55 insertions(+), 10 deletions(-)","diff":"diff --git a/hw/misc/macio/mac_dbdma.c b/hw/misc/macio/mac_dbdma.c\nindex 9795172..302f131 100644\n--- a/hw/misc/macio/mac_dbdma.c\n+++ b/hw/misc/macio/mac_dbdma.c\n@@ -851,13 +851,14 @@ static const VMStateDescription vmstate_dbdma = {\n }\n };\n \n-static void dbdma_reset(void *opaque)\n+static void mac_dbdma_reset(DeviceState *d)\n {\n- DBDMAState *s = opaque;\n+ DBDMAState *s = MAC_DBDMA(d);\n int i;\n \n- for (i = 0; i < DBDMA_CHANNELS; i++)\n+ for (i = 0; i < DBDMA_CHANNELS; i++) {\n memset(s->channels[i].regs, 0, DBDMA_SIZE);\n+ }\n }\n \n static void dbdma_unassigned_rw(DBDMA_io *io)\n@@ -888,9 +889,22 @@ static void dbdma_unassigned_flush(DBDMA_io *io)\n void* DBDMA_init (MemoryRegion **dbdma_mem)\n {\n DBDMAState *s;\n- int i;\n+ SysBusDevice *sbd;\n+\n+ s = MAC_DBDMA(object_new(TYPE_MAC_DBDMA));\n+ object_property_set_bool(OBJECT(s), true, \"realized\", NULL);\n+\n+ sbd = SYS_BUS_DEVICE(s);\n+ *dbdma_mem = sysbus_mmio_get_region(sbd, 0);\n \n- s = g_malloc0(sizeof(DBDMAState));\n+ return s;\n+}\n+\n+static void mac_dbdma_init(Object *obj)\n+{\n+ SysBusDevice *sbd = SYS_BUS_DEVICE(obj);\n+ DBDMAState *s = MAC_DBDMA(obj);\n+ int i;\n \n for (i = 0; i < DBDMA_CHANNELS; i++) {\n DBDMA_channel *ch = &s->channels[i];\n@@ -901,12 +915,37 @@ void* DBDMA_init (MemoryRegion **dbdma_mem)\n ch->io.channel = ch;\n }\n \n- memory_region_init_io(&s->mem, NULL, &dbdma_ops, s, \"dbdma\", 0x1000);\n- *dbdma_mem = &s->mem;\n- vmstate_register(NULL, -1, &vmstate_dbdma, s);\n- qemu_register_reset(dbdma_reset, s);\n+ memory_region_init_io(&s->mem, obj, &dbdma_ops, s, \"dbdma\", 0x1000);\n+ sysbus_init_mmio(sbd, &s->mem);\n+}\n+\n+static void mac_dbdma_realize(DeviceState *dev, Error **errp)\n+{\n+ DBDMAState *s = MAC_DBDMA(dev);\n \n s->bh = qemu_bh_new(DBDMA_run_bh, s);\n+}\n \n- return s;\n+static void mac_dbdma_class_init(ObjectClass *oc, void *data)\n+{\n+ DeviceClass *dc = DEVICE_CLASS(oc);\n+\n+ dc->realize = mac_dbdma_realize;\n+ dc->reset = mac_dbdma_reset;\n+ dc->vmsd = &vmstate_dbdma;\n }\n+\n+static const TypeInfo mac_dbdma_type_info = {\n+ .name = TYPE_MAC_DBDMA,\n+ .parent = TYPE_SYS_BUS_DEVICE,\n+ .instance_size = sizeof(DBDMAState),\n+ .instance_init = mac_dbdma_init,\n+ .class_init = mac_dbdma_class_init\n+};\n+\n+static void mac_dbdma_register_types(void)\n+{\n+ type_register_static(&mac_dbdma_type_info);\n+}\n+\n+type_init(mac_dbdma_register_types)\ndiff --git a/include/hw/ppc/mac_dbdma.h b/include/hw/ppc/mac_dbdma.h\nindex 21bd66f..4bc6274 100644\n--- a/include/hw/ppc/mac_dbdma.h\n+++ b/include/hw/ppc/mac_dbdma.h\n@@ -26,6 +26,7 @@\n #include \"exec/memory.h\"\n #include \"qemu/iov.h\"\n #include \"sysemu/dma.h\"\n+#include \"hw/sysbus.h\"\n \n typedef struct DBDMA_io DBDMA_io;\n \n@@ -160,6 +161,8 @@ typedef struct DBDMA_channel {\n } DBDMA_channel;\n \n typedef struct {\n+ SysBusDevice parent_obj;\n+\n MemoryRegion mem;\n DBDMA_channel channels[DBDMA_CHANNELS];\n QEMUBH *bh;\n@@ -173,4 +176,7 @@ void DBDMA_register_channel(void *dbdma, int nchan, qemu_irq irq,\n void DBDMA_kick(DBDMAState *dbdma);\n void* DBDMA_init (MemoryRegion **dbdma_mem);\n \n+#define TYPE_MAC_DBDMA \"mac-dbdma\"\n+#define MAC_DBDMA(obj) OBJECT_CHECK(DBDMAState, (obj), TYPE_MAC_DBDMA)\n+\n #endif\n","prefixes":["2/7"]}