Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/856663/?format=api
{ "id": 856663, "url": "http://patchwork.ozlabs.org/api/patches/856663/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20180108024558.17983-4-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-4-f4bug@amsat.org>", "list_archive_url": null, "date": "2018-01-08T02:45:32", "name": "[03/29] hw/isa: extract parallel-isa specific code", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "a65b31c5e7559e518d22b0c61f9a89f50b443e57", "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-4-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/856663/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/856663/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=\"f6npLLEI\"; 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 3zFKW00L9Vz9s7h\n\tfor <incoming@patchwork.ozlabs.org>;\n\tMon, 8 Jan 2018 13:49:48 +1100 (AEDT)", "from localhost ([::1]:59334 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 1eYNVS-0000MK-2u\n\tfor incoming@patchwork.ozlabs.org; Sun, 07 Jan 2018 21:49:46 -0500", "from eggs.gnu.org ([2001:4830:134:3::10]:51215)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from <philippe.mathieu.daude@gmail.com>)\n\tid 1eYNS8-0006YA-JV\n\tfor qemu-devel@nongnu.org; Sun, 07 Jan 2018 21:46:21 -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 1eYNS5-0002GN-GT\n\tfor qemu-devel@nongnu.org; Sun, 07 Jan 2018 21:46:20 -0500", "from mail-qt0-x241.google.com ([2607:f8b0:400d:c0d::241]:34501)\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 1eYNS5-0002FZ-Ay\n\tfor qemu-devel@nongnu.org; Sun, 07 Jan 2018 21:46:17 -0500", "by mail-qt0-x241.google.com with SMTP id 33so12078096qtv.1\n\tfor <qemu-devel@nongnu.org>; Sun, 07 Jan 2018 18:46:17 -0800 (PST)", "from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id\n\td10sm7156245qkg.16.2018.01.07.18.46.12\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tSun, 07 Jan 2018 18:46:16 -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=uEgVdjSGc95ojJ4vYAvP/LbuDkYLJZrulBhcByNi/7g=;\n\tb=f6npLLEIKiLkzMVnFE+aDNXhJPhvPAbDUbFkOvPfrRXPllbWz4kGf/3wEZIykF93HU\n\twjel5734c4H1LMSUHwbh1Sn318d7GN7WPVYojh8vbQorpyjkutXxweszkAshMZrbnTml\n\tym8+XfbrcAu+q7xjLLdgkAPL3OIPVFz4badMMdcn7Dh1ctZ60tesANR+PPRSJ82AEDuR\n\t9w3pfvcX7tdYESsNwdjdFfaixQsk7iZ9o1dQFkNjTtIW6dKxsxFi1l2gauSQ9VCUnTTA\n\ta7vzof/I4cakiEWUaL2JOWoOzXwlSF7pTN6pnXVXbTlFnGarYQNAYxCaOq6t8SZU35gO\n\tp4lQ==", "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=uEgVdjSGc95ojJ4vYAvP/LbuDkYLJZrulBhcByNi/7g=;\n\tb=Y4yYh+Kp5PncKrTJTzXgA196Or7zACj4TKo2gIVi7LFMj8qEbmcXleMB+XpknEOb8j\n\tap/3svQzj8FS0ZCLg6w61m0tyEnUTDV+xbEprd9QWEL6l/KAHZIh4hYrvFDfisRWjbQZ\n\tcwXTTqBoGp1wvyEBGY/2gXD7nmxkr8pepDqcfiBhiusj5RDO8yHx+MWUCaGxai5dGIDu\n\tO0ktiLqo2H+V3obHN0Gf3XrQsZq98pc/qBAWxP8odpJaXSRy87woEExB7t8m2gNA5mt2\n\tamy8A343wii76Yk8BVRFqb9nJtNdZbm0aExfL+sJJfzcurvw0G8k/M7rA25jodZyIU6y\n\tX+dA==", "X-Gm-Message-State": "AKwxytdof0OU8yoE900CTZyhUInCI3VyeQARrgRDHy/OdTd+4JqoX10w\n\tM/EEkYOWx6tB68GxSl8cINM=", "X-Google-Smtp-Source": "ACJfBotaFG1o7xGC7kbxwM+8MtLActx5RAqEFFoB8sYigAmbB94vgJhx7BY27mNz2FNNAPJP51J6ng==", "X-Received": "by 10.200.40.115 with SMTP id 48mr15451896qtr.335.1515379576711; \n\tSun, 07 Jan 2018 18:46:16 -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:32 -0300", "Message-Id": "<20180108024558.17983-4-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:c0d::241", "Subject": "[Qemu-devel] [PATCH 03/29] hw/isa: extract parallel-isa specific\n\tcode", "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\tIgor Mammedov <imammedo@redhat.com>, Yongbok Kim <yongbok.kim@mips.com>,\n\tArtyom Tarasenko <atar4qemu@gmail.com>, \n\tRichard 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": "Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>\n---\n include/hw/char/parallel.h | 14 ++++++++++++++\n include/hw/i386/pc.h | 8 --------\n hw/char/parallel-isa.c | 29 +++++++++++++++++++++++++++++\n hw/char/parallel.c | 2 +-\n hw/i386/pc.c | 1 +\n hw/isa/isa-bus.c | 26 --------------------------\n hw/mips/mips_fulong2e.c | 1 +\n hw/mips/mips_jazz.c | 1 +\n hw/mips/mips_malta.c | 1 +\n hw/sparc64/sun4u.c | 1 +\n MAINTAINERS | 3 ++-\n hw/char/Makefile.objs | 1 +\n 12 files changed, 52 insertions(+), 36 deletions(-)\n create mode 100644 include/hw/char/parallel.h\n create mode 100644 hw/char/parallel-isa.c", "diff": "diff --git a/include/hw/char/parallel.h b/include/hw/char/parallel.h\nnew file mode 100644\nindex 0000000000..d6dd62fb9f\n--- /dev/null\n+++ b/include/hw/char/parallel.h\n@@ -0,0 +1,14 @@\n+#ifndef HW_PARALLEL_H\n+#define HW_PARALLEL_H\n+\n+#include \"exec/memory.h\"\n+#include \"hw/isa/isa.h\"\n+#include \"chardev/char.h\"\n+\n+void parallel_hds_isa_init(ISABus *bus, int n);\n+\n+bool parallel_mm_init(MemoryRegion *address_space,\n+ hwaddr base, int it_shift, qemu_irq irq,\n+ Chardev *chr);\n+\n+#endif\ndiff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h\nindex 780fa049d7..87a377011b 100644\n--- a/include/hw/i386/pc.h\n+++ b/include/hw/i386/pc.h\n@@ -151,14 +151,6 @@ struct PCMachineClass {\n #define PC_MACHINE_CLASS(klass) \\\n OBJECT_CLASS_CHECK(PCMachineClass, (klass), TYPE_PC_MACHINE)\n \n-/* parallel.c */\n-\n-void parallel_hds_isa_init(ISABus *bus, int n);\n-\n-bool parallel_mm_init(MemoryRegion *address_space,\n- hwaddr base, int it_shift, qemu_irq irq,\n- Chardev *chr);\n-\n /* i8259.c */\n \n extern DeviceState *isa_pic;\ndiff --git a/hw/char/parallel-isa.c b/hw/char/parallel-isa.c\nnew file mode 100644\nindex 0000000000..906a55a07d\n--- /dev/null\n+++ b/hw/char/parallel-isa.c\n@@ -0,0 +1,29 @@\n+#include \"qemu/osdep.h\"\n+#include \"sysemu/sysemu.h\"\n+#include \"hw/isa/isa.h\"\n+#include \"hw/char/parallel.h\"\n+\n+static void parallel_init(ISABus *bus, int index, Chardev *chr)\n+{\n+ DeviceState *dev;\n+ ISADevice *isadev;\n+\n+ isadev = isa_create(bus, \"isa-parallel\");\n+ dev = DEVICE(isadev);\n+ qdev_prop_set_uint32(dev, \"index\", index);\n+ qdev_prop_set_chr(dev, \"chardev\", chr);\n+ qdev_init_nofail(dev);\n+}\n+\n+void parallel_hds_isa_init(ISABus *bus, int n)\n+{\n+ int i;\n+\n+ assert(n <= MAX_PARALLEL_PORTS);\n+\n+ for (i = 0; i < n; i++) {\n+ if (parallel_hds[i]) {\n+ parallel_init(bus, i, parallel_hds[i]);\n+ }\n+ }\n+}\ndiff --git a/hw/char/parallel.c b/hw/char/parallel.c\nindex f79dc76543..1542d62201 100644\n--- a/hw/char/parallel.c\n+++ b/hw/char/parallel.c\n@@ -28,7 +28,7 @@\n #include \"chardev/char-parallel.h\"\n #include \"chardev/char-fe.h\"\n #include \"hw/isa/isa.h\"\n-#include \"hw/i386/pc.h\"\n+#include \"hw/char/parallel.h\"\n #include \"sysemu/sysemu.h\"\n \n //#define DEBUG_PARALLEL\ndiff --git a/hw/i386/pc.c b/hw/i386/pc.c\nindex 3fcf318a95..6d3b2a8d1c 100644\n--- a/hw/i386/pc.c\n+++ b/hw/i386/pc.c\n@@ -25,6 +25,7 @@\n #include \"hw/hw.h\"\n #include \"hw/i386/pc.h\"\n #include \"hw/char/serial.h\"\n+#include \"hw/char/parallel.h\"\n #include \"hw/i386/apic.h\"\n #include \"hw/i386/topology.h\"\n #include \"sysemu/cpus.h\"\ndiff --git a/hw/isa/isa-bus.c b/hw/isa/isa-bus.c\nindex 348e0eab9d..0f732b5b58 100644\n--- a/hw/isa/isa-bus.c\n+++ b/hw/isa/isa-bus.c\n@@ -23,7 +23,6 @@\n #include \"hw/sysbus.h\"\n #include \"sysemu/sysemu.h\"\n #include \"hw/isa/isa.h\"\n-#include \"hw/i386/pc.h\"\n \n static ISABus *isabus;\n \n@@ -287,28 +286,3 @@ MemoryRegion *isa_address_space_io(ISADevice *dev)\n }\n \n type_init(isabus_register_types)\n-\n-static void parallel_init(ISABus *bus, int index, Chardev *chr)\n-{\n- DeviceState *dev;\n- ISADevice *isadev;\n-\n- isadev = isa_create(bus, \"isa-parallel\");\n- dev = DEVICE(isadev);\n- qdev_prop_set_uint32(dev, \"index\", index);\n- qdev_prop_set_chr(dev, \"chardev\", chr);\n- qdev_init_nofail(dev);\n-}\n-\n-void parallel_hds_isa_init(ISABus *bus, int n)\n-{\n- int i;\n-\n- assert(n <= MAX_PARALLEL_PORTS);\n-\n- for (i = 0; i < n; i++) {\n- if (parallel_hds[i]) {\n- parallel_init(bus, i, parallel_hds[i]);\n- }\n- }\n-}\ndiff --git a/hw/mips/mips_fulong2e.c b/hw/mips/mips_fulong2e.c\nindex 725e25a134..d3c3a6ab61 100644\n--- a/hw/mips/mips_fulong2e.c\n+++ b/hw/mips/mips_fulong2e.c\n@@ -23,6 +23,7 @@\n #include \"hw/hw.h\"\n #include \"hw/i386/pc.h\"\n #include \"hw/char/serial.h\"\n+#include \"hw/char/parallel.h\"\n #include \"hw/block/fdc.h\"\n #include \"net/net.h\"\n #include \"hw/boards.h\"\ndiff --git a/hw/mips/mips_jazz.c b/hw/mips/mips_jazz.c\nindex 0d2c0683ba..afb33beffd 100644\n--- a/hw/mips/mips_jazz.c\n+++ b/hw/mips/mips_jazz.c\n@@ -28,6 +28,7 @@\n #include \"hw/mips/cpudevs.h\"\n #include \"hw/i386/pc.h\"\n #include \"hw/char/serial.h\"\n+#include \"hw/char/parallel.h\"\n #include \"hw/isa/isa.h\"\n #include \"hw/block/fdc.h\"\n #include \"sysemu/sysemu.h\"\ndiff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c\nindex 37f19428d6..95d22288f4 100644\n--- a/hw/mips/mips_malta.c\n+++ b/hw/mips/mips_malta.c\n@@ -28,6 +28,7 @@\n #include \"hw/hw.h\"\n #include \"hw/i386/pc.h\"\n #include \"hw/char/serial.h\"\n+#include \"hw/char/parallel.h\"\n #include \"hw/block/fdc.h\"\n #include \"net/net.h\"\n #include \"hw/boards.h\"\ndiff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c\nindex 1672f256e7..8bbc210fc8 100644\n--- a/hw/sparc64/sun4u.c\n+++ b/hw/sparc64/sun4u.c\n@@ -31,6 +31,7 @@\n #include \"hw/pci-host/apb.h\"\n #include \"hw/i386/pc.h\"\n #include \"hw/char/serial.h\"\n+#include \"hw/char/parallel.h\"\n #include \"hw/timer/m48t59.h\"\n #include \"hw/block/fdc.h\"\n #include \"net/net.h\"\ndiff --git a/MAINTAINERS b/MAINTAINERS\nindex 73a5555735..f11c0386e9 100644\n--- a/MAINTAINERS\n+++ b/MAINTAINERS\n@@ -867,7 +867,7 @@ M: Michael S. Tsirkin <mst@redhat.com>\n M: Paolo Bonzini <pbonzini@redhat.com>\n S: Supported\n F: hw/char/debugcon.c\n-F: hw/char/parallel.c\n+F: hw/char/parallel*\n F: hw/char/serial*\n F: hw/dma/i8257*\n F: hw/i2c/pm_smbus.c\n@@ -882,6 +882,7 @@ F: hw/timer/i8254*\n 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/i2c/pm_smbus.h\n F: include/hw/isa/i8257.h\n F: include/hw/timer/hpet.h\ndiff --git a/hw/char/Makefile.objs b/hw/char/Makefile.objs\nindex 1bcd37e98d..1b979100b7 100644\n--- a/hw/char/Makefile.objs\n+++ b/hw/char/Makefile.objs\n@@ -1,6 +1,7 @@\n common-obj-$(CONFIG_IPACK) += ipoctal232.o\n common-obj-$(CONFIG_ESCC) += escc.o\n common-obj-$(CONFIG_PARALLEL) += parallel.o\n+common-obj-$(CONFIG_PARALLEL) += parallel-isa.o\n common-obj-$(CONFIG_PL011) += pl011.o\n common-obj-$(CONFIG_SERIAL) += serial.o\n common-obj-$(CONFIG_SERIAL_ISA) += serial-isa.o\n", "prefixes": [ "03/29" ] }