Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/856668/?format=api
{ "id": 856668, "url": "http://patchwork.ozlabs.org/api/patches/856668/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20180108024558.17983-5-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": "<20180108024558.17983-5-f4bug@amsat.org>", "list_archive_url": null, "date": "2018-01-08T02:45:33", "name": "[04/29] hw/dma/i8257: rename DMA_init() to i8257_dma_init()", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "3ded85473073793ca134685761a9cee0f26b0307", "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/20180108024558.17983-5-f4bug@amsat.org/mbox/", "series": [ { "id": 21847, "url": "http://patchwork.ozlabs.org/api/series/21847/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/list/?series=21847", "date": "2018-01-08T02:45:30", "name": "remove i386/pc dependency: generic SuperIO, PIIX cleanup", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/21847/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/856668/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/856668/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=\"ROboD9ly\"; 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 3zFKZJ6lBDz9ryr\n\tfor <incoming@patchwork.ozlabs.org>;\n\tMon, 8 Jan 2018 13:52:40 +1100 (AEDT)", "from localhost ([::1]:59370 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 1eYNYF-0002t7-0V\n\tfor incoming@patchwork.ozlabs.org; Sun, 07 Jan 2018 21:52:39 -0500", "from eggs.gnu.org ([2001:4830:134:3::10]:51237)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from <philippe.mathieu.daude@gmail.com>)\n\tid 1eYNSB-0006aR-G1\n\tfor qemu-devel@nongnu.org; Sun, 07 Jan 2018 21:46:24 -0500", "from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from <philippe.mathieu.daude@gmail.com>)\n\tid 1eYNSA-0002Ix-8l\n\tfor qemu-devel@nongnu.org; Sun, 07 Jan 2018 21:46:23 -0500", "from mail-qk0-x243.google.com ([2607:f8b0:400d:c09::243]:37633)\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 1eYNSA-0002IN-2w; Sun, 07 Jan 2018 21:46:22 -0500", "by mail-qk0-x243.google.com with SMTP id p13so12550588qke.4;\n\tSun, 07 Jan 2018 18:46:21 -0800 (PST)", "from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id\n\td10sm7156245qkg.16.2018.01.07.18.46.17\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tSun, 07 Jan 2018 18:46:20 -0800 (PST)" ], "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=q7/3VcbWeM3aDqKgGbf3pUwSCsecpGWMWj/B9Bdd/uA=;\n\tb=ROboD9lyCrTUt5AHDxjtg9UXMoPTASXBdmxvGRWMuPv3NtOU3FJextoOa31i4IvoMj\n\tdn9Qr4hzdcJupgLx6XdOVk+nm/rl24NSXUClh0+kptgaDIlLjj6JSxigdRfLM3xIWjJO\n\tZKM0YAOpnwQgXvJuDzKseXutoapYLcpsnJ+kG4Qt7ygWIVdTnSAWxFy7TZ2dAOI31kWn\n\thOciDVpUA109iI792GG9KOg5HPUK7MfU7sosTfcqdNU3k4z0sihSC5YN8FoRoDbGS9la\n\tz1GXs76PSaF55BUhwwG30Vj0xo1PXHxub19EyytABeV4IRRKAMi1cJi1IUnMZ/UKz5cV\n\tW3QA==", "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=q7/3VcbWeM3aDqKgGbf3pUwSCsecpGWMWj/B9Bdd/uA=;\n\tb=iKk2+GR14fKMeoKTZFZ7mKSpEau9Jp2Gge9vQEliq7yMBRdc60I3jys212f1FrypLI\n\tsr/VljKivWXp34JgJeNmiB18NeVMGemcVofok192J+4+8fOCW2gglct4lMYE0tvGWsIf\n\t4q6sJfg9NbvEzy5WmkBqnaMGG2UidzuEXdB5H2G4uYGFNwut4R2wzHtz0deSbrXktoy/\n\tR0IEzLHjtl7Llwh6iCwHWIWoQnsBxOhvWxBeJaIwL51UGCJFqF1nV99LfSCLbdtn0pBR\n\tx9mCEO0AdiaY57ZjqxzBlN7gT9qneQxgIFWaJnSIUKCXSrW948WHfqq/DAD6P6eVHijq\n\tiTwA==", "X-Gm-Message-State": "AKwxyteJjc2Pfjf67qjZVu9wnUFzCEcmSWrYp4u/MKNkiutmrEyUjsiR\n\tQbQz95u10G1oDANwP8HncVk=", "X-Google-Smtp-Source": "ACJfBovVlUET7r76EwkKwm6UUS7nwITqxEIr/5WWKLlEvQvr65jFj/Z/ijqfAlIheG/ButELOjF0rA==", "X-Received": "by 10.55.222.14 with SMTP id h14mr14099293qkj.197.1515379581450; \n\tSun, 07 Jan 2018 18:46:21 -0800 (PST)", "From": "=?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= <f4bug@amsat.org>", "To": "Paolo Bonzini <pbonzini@redhat.com>,\n\t\"Michael S. Tsirkin\" <mst@redhat.com>, =?utf-8?q?Herv=C3=A9_Poussinea?=\n\t=?utf-8?q?u?= <hpoussin@reactos.org>,\n\tAurelien Jarno <aurelien@aurel32.net>, Eduardo Habkost\n\t<ehabkost@redhat.com>, Marcel Apfelbaum <marcel@redhat.com>", "Date": "Sun, 7 Jan 2018 23:45:33 -0300", "Message-Id": "<20180108024558.17983-5-f4bug@amsat.org>", "X-Mailer": "git-send-email 2.15.1", "In-Reply-To": "<20180108024558.17983-1-f4bug@amsat.org>", "References": "<20180108024558.17983-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::243", "Subject": "[Qemu-devel] [PATCH 04/29] 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": "Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>, =?utf-8?q?Philippe_M?=\n\t=?utf-8?q?athieu-Daud=C3=A9?= <f4bug@amsat.org>, qemu-devel@nongnu.org,\n\t\"open list:PReP\" <qemu-ppc@nongnu.org>, Igor Mammedov\n\t<imammedo@redhat.com>, Yongbok Kim <yongbok.kim@mips.com>, Artyom\n\tTarasenko <atar4qemu@gmail.com>, Richard Henderson <rth@twiddle.net>", "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- remove the old i386/pc dependency\n\nSigned-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>\n---\n include/hw/{isa => dma}/i8257.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, 19 insertions(+), 18 deletions(-)\n rename include/hw/{isa => dma}/i8257.h (86%)", "diff": "diff --git a/include/hw/isa/i8257.h b/include/hw/dma/i8257.h\nsimilarity index 86%\nrename from include/hw/isa/i8257.h\nrename to include/hw/dma/i8257.h\nindex 88a2766a3f..0041565177 100644\n--- a/include/hw/isa/i8257.h\n+++ b/include/hw/dma/i8257.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..0b8a6f4a80 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.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..07bfbdb618 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.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 6d3b2a8d1c..e39af3d48c 100644\n--- a/hw/i386/pc.c\n+++ b/hw/i386/pc.c\n@@ -40,6 +40,7 @@\n #include \"elf.h\"\n #include \"multiboot.h\"\n #include \"hw/timer/mc146818rtc.h\"\n+#include \"hw/dma/i8257.h\"\n #include \"hw/timer/i8254.h\"\n #include \"hw/audio/pcspk.h\"\n #include \"hw/pci/msi.h\"\n@@ -1605,7 +1606,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 d3c3a6ab61..cbe159034d 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.h\"\n #include \"hw/char/serial.h\"\n #include \"hw/char/parallel.h\"\n #include \"hw/block/fdc.h\"\n@@ -361,7 +362,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, \"i8042\");\ndiff --git a/hw/mips/mips_jazz.c b/hw/mips/mips_jazz.c\nindex afb33beffd..6ed4b83f40 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.h\"\n #include \"hw/char/serial.h\"\n #include \"hw/char/parallel.h\"\n #include \"hw/isa/isa.h\"\n@@ -219,7 +220,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 95d22288f4..0a9e3dedf4 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.h\"\n #include \"hw/char/serial.h\"\n #include \"hw/char/parallel.h\"\n #include \"hw/block/fdc.h\"\n@@ -1210,7 +1211,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, \"i8042\");\ndiff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c\nindex e71648404c..2ed28c4d25 100644\n--- a/hw/sparc/sun4m.c\n+++ b/hw/sparc/sun4m.c\n@@ -99,10 +99,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 8bbc210fc8..135f8088ca 100644\n--- a/hw/sparc64/sun4u.c\n+++ b/hw/sparc64/sun4u.c\n@@ -87,10 +87,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 f11c0386e9..89810df375 100644\n--- a/MAINTAINERS\n+++ b/MAINTAINERS\n@@ -883,8 +883,8 @@ F: hw/timer/mc146818rtc*\n F: hw/watchdog/wdt_ib700.c\n F: include/hw/display/vga.h\n F: include/hw/char/parallel.h\n+F: include/hw/dma/i8257.h\n F: include/hw/i2c/pm_smbus.h\n-F: include/hw/isa/i8257.h\n F: include/hw/timer/hpet.h\n F: include/hw/timer/i8254*\n F: include/hw/timer/mc146818rtc*\n", "prefixes": [ "04/29" ] }