Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/817618/?format=api
{ "id": 817618, "url": "http://patchwork.ozlabs.org/api/patches/817618/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20170922160111.31885-1-f4bug@amsat.org/", "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": "<20170922160111.31885-1-f4bug@amsat.org>", "list_archive_url": null, "date": "2017-09-22T16:01:00", "name": "[23/34] hw/dma/i8257: rename DMA_init() to i8257_dma_init()", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "189cf7f01e71789641a5c55e8acec3f9ec3fd2b9", "submitter": { "id": 70924, "url": "http://patchwork.ozlabs.org/api/people/70924/?format=api", "name": "Philippe Mathieu-Daudé", "email": "f4bug@amsat.org" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20170922160111.31885-1-f4bug@amsat.org/mbox/", "series": [ { "id": 4657, "url": "http://patchwork.ozlabs.org/api/series/4657/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/list/?series=4657", "date": "2017-09-22T15:39:40", "name": "remove i386/pc dependency from non-PC world (part 1)", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/4657/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/817618/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/817618/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>)", "ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=gmail.com header.i=@gmail.com\n\theader.b=\"fiR1RnSH\"; dkim-atps=neutral" ], "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 3xzJMX39lJz9s83\n\tfor <incoming@patchwork.ozlabs.org>;\n\tSat, 23 Sep 2017 02:09:28 +1000 (AEST)", "from localhost ([::1]:59801 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 1dvQW6-0004Aq-Bf\n\tfor incoming@patchwork.ozlabs.org; Fri, 22 Sep 2017 12:09:26 -0400", "from eggs.gnu.org ([2001:4830:134:3::10]:51532)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from <philippe.mathieu.daude@gmail.com>)\n\tid 1dvQOc-000648-Uw\n\tfor qemu-devel@nongnu.org; Fri, 22 Sep 2017 12:01:47 -0400", "from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from <philippe.mathieu.daude@gmail.com>)\n\tid 1dvQOY-0008LW-F4\n\tfor qemu-devel@nongnu.org; Fri, 22 Sep 2017 12:01:43 -0400", "from mail-qk0-x242.google.com ([2607:f8b0:400d:c09::242]:34818)\n\tby eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)\n\t(Exim 4.71) (envelope-from <philippe.mathieu.daude@gmail.com>)\n\tid 1dvQOY-0008L7-As; Fri, 22 Sep 2017 12:01:38 -0400", "by mail-qk0-x242.google.com with SMTP id o77so906268qke.2;\n\tFri, 22 Sep 2017 09:01:38 -0700 (PDT)", "from yoga.lan ([181.93.89.178]) by smtp.gmail.com with ESMTPSA id\n\ty31sm108325qta.83.2017.09.22.09.01.32\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tFri, 22 Sep 2017 09:01:36 -0700 (PDT)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;\n\th=sender:from:to:cc:subject:date:message-id:in-reply-to:references\n\t:mime-version:content-transfer-encoding;\n\tbh=ZJX+ywZj/5dqqMdAhmNdoW3qOEJ4qwXKxL1Vnk6qhCo=;\n\tb=fiR1RnSHghAZ/luUnaAGKt2Q+bdz2G883K33bD0sIw8EPBtbqH4ZwMhMxJ+gJ6Bmt4\n\tL/MucrpG8Gf4ThkwFL3IGKBwuRd7fn2LhU7k+RuZOJmwlCvLt0RqOwvX8r2NC/p9JEO3\n\t30Zgr3B+LGS29tMjVLTfsIXJQZi+Aqz5Goyr8BGzZW/GkPzaWqRPbBtU4CjuwMqMlTOi\n\tFpS93hX78x3AhqowYerJ5XyOZIq9LvAc8Dn13V+D/bBmmfO2sVpOjp/Yaqymu6qmSNEt\n\t+sXuOJxHczvJ0+2FNBld60Fo5jGVB+4t8ImLPOggfoHTk3Pt2ZSOefSaZ9hRBh48LSCx\n\tB+FA==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:sender:from:to:cc:subject:date:message-id\n\t:in-reply-to:references:mime-version:content-transfer-encoding;\n\tbh=ZJX+ywZj/5dqqMdAhmNdoW3qOEJ4qwXKxL1Vnk6qhCo=;\n\tb=JdKZFiWoogYSnLDvLQxNKy47in9VEfDOnddQbISLmBfhO/BREg01hTSJx2mf4j9xtD\n\tHFQk49eGaj4k3xEV78Lf0So4lemjBRBDUwt4aKdGUayL9BczLfPIgBPxMhOlGYNC27uB\n\twPmnNeODlpvT9zMaK6XRtPSX3mNBVfOR0/b4Wsc+tpEVzr6/M3OqdkA5ZZw/3PG2XTzk\n\twmOvrFeC+Tdn00IAGu+UOn+/Pt36pBJJnynb1YEDUrLXmYcUVRzjglMB2eiu0OSqoW05\n\t0Becug9YJeKdgr+aBY6uynwOBo10kwGcG7dIgaAPLbMGpcN//OePonYw87prpdEx/BTN\n\tlB+g==", "X-Gm-Message-State": "AHPjjUios7PBoIkrqxBj6TS+BuRdQTVPBpRNN7F2nz8iyduTJb8v/jPK\n\tK69eJpeLPcDkZnwcSEmn214=", "X-Google-Smtp-Source": "AOwi7QCtqbhvyCAFP5hYxUegOaAaWJjyykOvJO2PirzNhMM5YDkNRIn8mz2PIbjWuj4m/Qj9nmpppg==", "X-Received": "by 10.55.165.202 with SMTP id o193mr8355162qke.291.1506096097441;\n\tFri, 22 Sep 2017 09:01:37 -0700 (PDT)", "From": "=?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= <f4bug@amsat.org>", "To": "Peter Maydell <peter.maydell@linaro.org>, Thomas Huth <thuth@redhat.com>,\n\tPaolo Bonzini <pbonzini@redhat.com>,\n\t\"Michael S. Tsirkin\" <mst@redhat.com>, Aurelien Jarno\n\t<aurelien@aurel32.net>, Yongbok Kim <yongbok.kim@imgtec.com>,\n\tRichard Henderson <rth@twiddle.net>, =?utf-8?q?Herv=C3=A9_Poussineau?=\n\t<hpoussin@reactos.org>, David Gibson <david@gibson.dropbear.id.au>,\n\tAlexander Graf <agraf@suse.de>, Mark Cave-Ayland\n\t<mark.cave-ayland@ilande.co.uk>, Artyom Tarasenko <atar4qemu@gmail.com>", "Date": "Fri, 22 Sep 2017 13:01:00 -0300", "Message-Id": "<20170922160111.31885-1-f4bug@amsat.org>", "X-Mailer": "git-send-email 2.14.1", "In-Reply-To": "<20170922154014.29350-1-f4bug@amsat.org>", "References": "<20170922154014.29350-1-f4bug@amsat.org>", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=UTF-8", "Content-Transfer-Encoding": "8bit", "X-detected-operating-system": "by eggs.gnu.org: Genre and OS details not\n\trecognized.", "X-Received-From": "2607:f8b0:400d:c09::242", "Subject": "[Qemu-devel] [PATCH 23/34] hw/dma/i8257: rename DMA_init() to\n\ti8257_dma_init()", "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>", "Cc": "qemu-trivial@nongnu.org, qemu-ppc@nongnu.org, =?utf-8?q?Philippe_Mathi?=\n\t=?utf-8?b?ZXUtRGF1ZMOp?= <f4bug@amsat.org>, \tqemu-devel@nongnu.org", "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": "- move the header from hw/isa/ to hw/dma/\n- add entry for i82374 in MAINTAINERS\n- remove the old i386/pc dependency\n\nSigned-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>\n---\n include/hw/{isa/i8257.h => dma/i8257_dma.h} | 6 ++++++\n include/hw/isa/isa.h | 2 --\n hw/dma/i82374.c | 3 ++-\n hw/dma/i8257.c | 4 ++--\n hw/i386/pc.c | 3 ++-\n hw/mips/mips_fulong2e.c | 3 ++-\n hw/mips/mips_jazz.c | 3 ++-\n hw/mips/mips_malta.c | 3 ++-\n hw/sparc/sun4m.c | 4 ----\n hw/sparc64/sun4u.c | 4 ----\n MAINTAINERS | 2 ++\n 11 files changed, 20 insertions(+), 17 deletions(-)\n rename include/hw/{isa/i8257.h => dma/i8257_dma.h} (86%)", "diff": "diff --git a/include/hw/isa/i8257.h b/include/hw/dma/i8257_dma.h\nsimilarity index 86%\nrename from include/hw/isa/i8257.h\nrename to include/hw/dma/i8257_dma.h\nindex 88a2766a3f..0041565177 100644\n--- a/include/hw/isa/i8257.h\n+++ b/include/hw/dma/i8257_dma.h\n@@ -1,6 +1,10 @@\n #ifndef HW_I8257_H\n #define HW_I8257_H\n \n+#include \"hw/hw.h\"\n+#include \"hw/isa/isa.h\"\n+#include \"exec/ioport.h\"\n+\n #define TYPE_I8257 \"i8257\"\n \n typedef struct I8257Regs {\n@@ -40,4 +44,6 @@ typedef struct I8257State {\n PortioList portio_pageh;\n } I8257State;\n \n+void i8257_dma_init(ISABus *bus, int high_page_enable);\n+\n #endif\ndiff --git a/include/hw/isa/isa.h b/include/hw/isa/isa.h\nindex 95593408ef..b9dbab24b4 100644\n--- a/include/hw/isa/isa.h\n+++ b/include/hw/isa/isa.h\n@@ -151,6 +151,4 @@ static inline ISABus *isa_bus_from_device(ISADevice *d)\n return ISA_BUS(qdev_get_parent_bus(DEVICE(d)));\n }\n \n-/* i8257.c */\n-void DMA_init(ISABus *bus, int high_page_enable);\n #endif\ndiff --git a/hw/dma/i82374.c b/hw/dma/i82374.c\nindex 6c0f975df0..4048bedcf2 100644\n--- a/hw/dma/i82374.c\n+++ b/hw/dma/i82374.c\n@@ -24,6 +24,7 @@\n \n #include \"qemu/osdep.h\"\n #include \"hw/isa/isa.h\"\n+#include \"hw/dma/i8257_dma.h\"\n \n #define TYPE_I82374 \"i82374\"\n #define I82374(obj) OBJECT_CHECK(I82374State, (obj), TYPE_I82374)\n@@ -123,7 +124,7 @@ static void i82374_realize(DeviceState *dev, Error **errp)\n portio_list_add(&s->port_list, isa_address_space_io(&s->parent_obj),\n s->iobase);\n \n- DMA_init(isa_bus_from_device(ISA_DEVICE(dev)), 1);\n+ i8257_dma_init(isa_bus_from_device(ISA_DEVICE(dev)), 1);\n memset(s->commands, 0, sizeof(s->commands));\n }\n \ndiff --git a/hw/dma/i8257.c b/hw/dma/i8257.c\nindex bd23e893bf..a8f26b003b 100644\n--- a/hw/dma/i8257.c\n+++ b/hw/dma/i8257.c\n@@ -24,7 +24,7 @@\n #include \"qemu/osdep.h\"\n #include \"hw/hw.h\"\n #include \"hw/isa/isa.h\"\n-#include \"hw/isa/i8257.h\"\n+#include \"hw/dma/i8257_dma.h\"\n #include \"qemu/main-loop.h\"\n #include \"trace.h\"\n \n@@ -622,7 +622,7 @@ static void i8257_register_types(void)\n \n type_init(i8257_register_types)\n \n-void DMA_init(ISABus *bus, int high_page_enable)\n+void i8257_dma_init(ISABus *bus, int high_page_enable)\n {\n ISADevice *isa1, *isa2;\n DeviceState *d;\ndiff --git a/hw/i386/pc.c b/hw/i386/pc.c\nindex 3aa10c780b..76d4be5991 100644\n--- a/hw/i386/pc.c\n+++ b/hw/i386/pc.c\n@@ -39,6 +39,7 @@\n #include \"elf.h\"\n #include \"multiboot.h\"\n #include \"hw/timer/mc146818rtc.h\"\n+#include \"hw/dma/i8257_dma.h\"\n #include \"hw/timer/i8254.h\"\n #include \"hw/input/i8042.h\"\n #include \"hw/audio/pcspk.h\"\n@@ -1582,7 +1583,7 @@ void pc_basic_device_init(ISABus *isa_bus, qemu_irq *gsi,\n port92_init(port92, a20_line[1]);\n g_free(a20_line);\n \n- DMA_init(isa_bus, 0);\n+ i8257_dma_init(isa_bus, 0);\n \n for(i = 0; i < MAX_FD; i++) {\n fd[i] = drive_get(IF_FLOPPY, 0, i);\ndiff --git a/hw/mips/mips_fulong2e.c b/hw/mips/mips_fulong2e.c\nindex a35745a407..6dc6a0ac18 100644\n--- a/hw/mips/mips_fulong2e.c\n+++ b/hw/mips/mips_fulong2e.c\n@@ -22,6 +22,7 @@\n #include \"qapi/error.h\"\n #include \"hw/hw.h\"\n #include \"hw/i386/pc.h\"\n+#include \"hw/dma/i8257_dma.h\"\n #include \"hw/char/serial.h\"\n #include \"hw/block/fdc.h\"\n #include \"net/net.h\"\n@@ -365,7 +366,7 @@ static void mips_fulong2e_init(MachineState *machine)\n \n /* init other devices */\n pit = i8254_pit_init(isa_bus, 0x40, 0, NULL);\n- DMA_init(isa_bus, 0);\n+ i8257_dma_init(isa_bus, 0);\n \n /* Super I/O */\n isa_create_simple(isa_bus, TYPE_I8042);\ndiff --git a/hw/mips/mips_jazz.c b/hw/mips/mips_jazz.c\nindex 1bbef7eeb5..1b54602c1d 100644\n--- a/hw/mips/mips_jazz.c\n+++ b/hw/mips/mips_jazz.c\n@@ -27,6 +27,7 @@\n #include \"hw/mips/mips.h\"\n #include \"hw/mips/cpudevs.h\"\n #include \"hw/i386/pc.h\"\n+#include \"hw/dma/i8257_dma.h\"\n #include \"hw/char/serial.h\"\n #include \"hw/isa/isa.h\"\n #include \"hw/block/fdc.h\"\n@@ -223,7 +224,7 @@ static void mips_jazz_init(MachineState *machine,\n /* ISA devices */\n i8259 = i8259_init(isa_bus, env->irq[4]);\n isa_bus_irqs(isa_bus, i8259);\n- DMA_init(isa_bus, 0);\n+ i8257_dma_init(isa_bus, 0);\n pit = i8254_pit_init(isa_bus, 0x40, 0, NULL);\n pcspk_init(isa_bus, pit);\n \ndiff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c\nindex 45c7f589aa..050da36f1d 100644\n--- a/hw/mips/mips_malta.c\n+++ b/hw/mips/mips_malta.c\n@@ -27,6 +27,7 @@\n #include \"cpu.h\"\n #include \"hw/hw.h\"\n #include \"hw/i386/pc.h\"\n+#include \"hw/dma/i8257_dma.h\"\n #include \"hw/char/serial.h\"\n #include \"hw/block/fdc.h\"\n #include \"net/net.h\"\n@@ -1219,7 +1220,7 @@ void mips_malta_init(MachineState *machine)\n smbus_eeprom_init(smbus, 8, smbus_eeprom_buf, smbus_eeprom_size);\n g_free(smbus_eeprom_buf);\n pit = i8254_pit_init(isa_bus, 0x40, 0, NULL);\n- DMA_init(isa_bus, 0);\n+ i8257_dma_init(isa_bus, 0);\n \n /* Super I/O */\n isa_create_simple(isa_bus, TYPE_I8042);\ndiff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c\nindex e1bdd4828d..a4ba3d2917 100644\n--- a/hw/sparc/sun4m.c\n+++ b/hw/sparc/sun4m.c\n@@ -101,10 +101,6 @@ struct sun4m_hwdef {\n uint8_t nvram_machine_id;\n };\n \n-void DMA_init(ISABus *bus, int high_page_enable)\n-{\n-}\n-\n static void fw_cfg_boot_set(void *opaque, const char *boot_device,\n Error **errp)\n {\ndiff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c\nindex 973daed977..fd10741607 100644\n--- a/hw/sparc64/sun4u.c\n+++ b/hw/sparc64/sun4u.c\n@@ -86,10 +86,6 @@ typedef struct EbusState {\n MemoryRegion bar1;\n } EbusState;\n \n-void DMA_init(ISABus *bus, int high_page_enable)\n-{\n-}\n-\n static void fw_cfg_boot_set(void *opaque, const char *boot_device,\n Error **errp)\n {\ndiff --git a/MAINTAINERS b/MAINTAINERS\nindex cc1f8bb66b..a79723601c 100644\n--- a/MAINTAINERS\n+++ b/MAINTAINERS\n@@ -707,6 +707,7 @@ F: hw/ppc/rs6000_mc.c\n F: hw/pci-host/prep.[hc]\n F: hw/isa/i82378.c\n F: hw/isa/pc87312.[hc]\n+F: hw/dma/i82374.c\n F: pc-bios/ppc_rom.bin\n \n sPAPR\n@@ -849,6 +850,7 @@ F: hw/misc/pc-testdev.c\n F: hw/timer/hpet*\n F: hw/timer/i8254*\n F: hw/timer/mc146818rtc*\n+F: include/hw/dma/i8257_dma.h\n F: include/hw/i2c/pm_smbus.h\n F: include/hw/input/i8042.h\n F: include/hw/timer/hpet.h\n", "prefixes": [ "23/34" ] }