Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/817913/?format=api
{ "id": 817913, "url": "http://patchwork.ozlabs.org/api/patches/817913/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/1506264466-28252-4-git-send-email-mark.cave-ayland@ilande.co.uk/", "project": { "id": 14, "url": "http://patchwork.ozlabs.org/api/projects/14/?format=api", "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-4-git-send-email-mark.cave-ayland@ilande.co.uk>", "list_archive_url": null, "date": "2017-09-24T14:47:42", "name": "[3/7] mac_dbdma: remove DBDMA_init() function", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "b37e20027f72396548bb785c429e1994aac8a77b", "submitter": { "id": 12451, "url": "http://patchwork.ozlabs.org/api/people/12451/?format=api", "name": "Mark Cave-Ayland", "email": "mark.cave-ayland@ilande.co.uk" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/qemu-devel/patch/1506264466-28252-4-git-send-email-mark.cave-ayland@ilande.co.uk/mbox/", "series": [ { "id": 4817, "url": "http://patchwork.ozlabs.org/api/series/4817/?format=api", "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/817913/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/817913/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>", "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=<UNKNOWN>)", "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 3y0VYl3BRjz9s8J\n\tfor <incoming@patchwork.ozlabs.org>;\n\tMon, 25 Sep 2017 00:52:27 +1000 (AEST)", "from localhost ([::1]:38438 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>)\n\tid 1dw8Gf-00069D-Jo\n\tfor incoming@patchwork.ozlabs.org; Sun, 24 Sep 2017 10:52:25 -0400", "from eggs.gnu.org ([2001:4830:134:3::10]:57168)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from <mark.cave-ayland@ilande.co.uk>) id 1dw8Cb-0002hK-W6\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 <mark.cave-ayland@ilande.co.uk>) id 1dw8Ca-0002HE-Hz\n\tfor qemu-devel@nongnu.org; Sun, 24 Sep 2017 10:48:13 -0400", "from chuckie.co.uk ([82.165.15.123]:49765\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 <mark.cave-ayland@ilande.co.uk>)\n\tid 1dw8CW-00029A-LS; Sun, 24 Sep 2017 10:48:08 -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 <mark.cave-ayland@ilande.co.uk>)\n\tid 1dw8CU-0006gI-0m; Sun, 24 Sep 2017 15:48:07 +0100" ], "From": "Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>", "To": "qemu-ppc@nongnu.org, qemu-devel@nongnu.org, david@gibson.dropbear.id.au", "Date": "Sun, 24 Sep 2017 15:47:42 +0100", "Message-Id": "<1506264466-28252-4-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 3/7] mac_dbdma: remove DBDMA_init() function", "X-BeenThere": "qemu-devel@nongnu.org", "X-Mailman-Version": "2.1.21", "Precedence": "list", "List-Id": "<qemu-devel.nongnu.org>", "List-Unsubscribe": "<https://lists.nongnu.org/mailman/options/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>", "List-Archive": "<http://lists.nongnu.org/archive/html/qemu-devel/>", "List-Post": "<mailto:qemu-devel@nongnu.org>", "List-Help": "<mailto:qemu-devel-request@nongnu.org?subject=help>", "List-Subscribe": "<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=subscribe>", "Errors-To": "qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org", "Sender": "\"Qemu-devel\"\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>" }, "content": "Instead we can now instantiate the MAC_DBDMA object directly within the\nmacio device. We also add the DBDMA device as a child property so that\nit is possible to retrieve later.\n\nSigned-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>\n---\n hw/misc/macio/mac_dbdma.c | 14 --------------\n hw/misc/macio/macio.c | 16 ++++++++++++----\n include/hw/ppc/mac_dbdma.h | 1 -\n 3 files changed, 12 insertions(+), 19 deletions(-)", "diff": "diff --git a/hw/misc/macio/mac_dbdma.c b/hw/misc/macio/mac_dbdma.c\nindex 302f131..0eddf2e 100644\n--- a/hw/misc/macio/mac_dbdma.c\n+++ b/hw/misc/macio/mac_dbdma.c\n@@ -886,20 +886,6 @@ static void dbdma_unassigned_flush(DBDMA_io *io)\n __func__, ch->channel);\n }\n \n-void* DBDMA_init (MemoryRegion **dbdma_mem)\n-{\n- DBDMAState *s;\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- return s;\n-}\n-\n static void mac_dbdma_init(Object *obj)\n {\n SysBusDevice *sbd = SYS_BUS_DEVICE(obj);\ndiff --git a/hw/misc/macio/macio.c b/hw/misc/macio/macio.c\nindex 5d57f45..f459f17 100644\n--- a/hw/misc/macio/macio.c\n+++ b/hw/misc/macio/macio.c\n@@ -41,7 +41,7 @@ typedef struct MacIOState\n \n MemoryRegion bar;\n CUDAState cuda;\n- void *dbdma;\n+ DBDMAState *dbdma;\n MemoryRegion *pic_mem;\n MemoryRegion *escc_mem;\n uint64_t frequency;\n@@ -127,10 +127,15 @@ static void macio_common_realize(PCIDevice *d, Error **errp)\n MacIOState *s = MACIO(d);\n SysBusDevice *sysbus_dev;\n Error *err = NULL;\n- MemoryRegion *dbdma_mem;\n \n- s->dbdma = DBDMA_init(&dbdma_mem);\n- memory_region_add_subregion(&s->bar, 0x08000, dbdma_mem);\n+ object_property_set_bool(OBJECT(s->dbdma), true, \"realized\", &err);\n+ if (err) {\n+ error_propagate(errp, err);\n+ return;\n+ }\n+ sysbus_dev = SYS_BUS_DEVICE(s->dbdma);\n+ memory_region_add_subregion(&s->bar, 0x08000,\n+ sysbus_mmio_get_region(sysbus_dev, 0));\n \n object_property_set_bool(OBJECT(&s->cuda), true, \"realized\", &err);\n if (err) {\n@@ -334,6 +339,9 @@ static void macio_instance_init(Object *obj)\n object_initialize(&s->cuda, sizeof(s->cuda), TYPE_CUDA);\n qdev_set_parent_bus(DEVICE(&s->cuda), sysbus_get_default());\n object_property_add_child(obj, \"cuda\", OBJECT(&s->cuda), NULL);\n+\n+ s->dbdma = MAC_DBDMA(object_new(TYPE_MAC_DBDMA));\n+ object_property_add_child(obj, \"dbdma\", OBJECT(s->dbdma), NULL);\n }\n \n static const VMStateDescription vmstate_macio_oldworld = {\ndiff --git a/include/hw/ppc/mac_dbdma.h b/include/hw/ppc/mac_dbdma.h\nindex 4bc6274..26cc469 100644\n--- a/include/hw/ppc/mac_dbdma.h\n+++ b/include/hw/ppc/mac_dbdma.h\n@@ -174,7 +174,6 @@ 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-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", "prefixes": [ "3/7" ] }