{"id":817616,"url":"http://patchwork.ozlabs.org/api/patches/817616/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170922154014.29350-21-f4bug@amsat.org/","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":"<20170922154014.29350-21-f4bug@amsat.org>","list_archive_url":null,"date":"2017-09-22T15:40:00","name":"[20/34] hw/timer/i8254: rename pit_init() -> i8254_pit_init()","commit_ref":null,"pull_url":null,"state":"superseded","archived":true,"hash":"3cde55475d33325e1db52ae949eba4e6e08064d1","submitter":{"id":70924,"url":"http://patchwork.ozlabs.org/api/people/70924/?format=json","name":"Philippe Mathieu-Daudé","email":"f4bug@amsat.org"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170922154014.29350-21-f4bug@amsat.org/mbox/","series":[{"id":4657,"url":"http://patchwork.ozlabs.org/api/series/4657/?format=json","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/817616/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/817616/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=)","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=\"Mr79v41e\"; 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 3xzJ8Y2jQdz9s83\n\tfor ;\n\tSat, 23 Sep 2017 01:59:57 +1000 (AEST)","from localhost ([::1]:59680 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dvQMt-0003jJ-EE\n\tfor incoming@patchwork.ozlabs.org; Fri, 22 Sep 2017 11:59:55 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:41935)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from )\n\tid 1dvQ5E-0005E4-2f\n\tfor qemu-devel@nongnu.org; Fri, 22 Sep 2017 11:41:41 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from )\n\tid 1dvQ5C-0003YS-Pf\n\tfor qemu-devel@nongnu.org; Fri, 22 Sep 2017 11:41:40 -0400","from mail-qt0-x241.google.com ([2607:f8b0:400d:c0d::241]:38701)\n\tby eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)\n\t(Exim 4.71) (envelope-from )\n\tid 1dvQ5C-0003YB-L4; Fri, 22 Sep 2017 11:41:38 -0400","by mail-qt0-x241.google.com with SMTP id o3so882433qte.5;\n\tFri, 22 Sep 2017 08:41:38 -0700 (PDT)","from yoga.lan ([181.93.89.178]) by smtp.gmail.com with ESMTPSA id\n\tz75sm71742qkb.71.2017.09.22.08.41.34\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tFri, 22 Sep 2017 08:41:37 -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=WnfLy07d8CgOU9m6fr5W5G59F8m3luymQtirRIVYzcg=;\n\tb=Mr79v41eWvtK6a+LwPcSNTJssmgideWc6dtbJd0Kv+XXGQ9jQDPceMTo9e2beI6tq0\n\tCQYqzw+7q6i/VYXrCJbdX+cCYOrAY2yUmyejB9XQ4CC64wucEAOiBnxab1vp0byJp3p2\n\tv40ZGVO1VRhuJSpleGFsbguqQm74jr7TO4BJdQWuYbji6QpUdpV/DmJgmx0HHRoQsXlW\n\tGcVqmOJTBOqVRqauBs7N7PBqXJIlYFcjJDfsRyFVQuMB5MVolAX4arCe9YUPIZ9Q1Kok\n\tXlYn6w9m9QFPIcR/2erRrf2ROpWJG5zEUF4jSFxGtEVN53c/6Mkd1pSc9dIfhDYOBIhE\n\tn6vA==","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=WnfLy07d8CgOU9m6fr5W5G59F8m3luymQtirRIVYzcg=;\n\tb=pFWeyw0RGe7amsCzb6+982kmq/cSI3gVmX1ssizbks0pZE1kv5VGVF08IlBeAzTUrn\n\tFT6MFrDhUvzdEgbnDLf5g8BzcSmxymaf//YT1jmhQT17iC/iIt3DrgINUcgxC/iIkIxF\n\thtTm9aMhGT7XnhIBBQ2T5JgHGihdYppVOvBU+IIkD3rFyq/Uff8vLgD8WQVe9WQ/t8sB\n\t6pbyaDN+Tf9VI6aUJbpDqFeGDq5cfVcJu49mHPY3Imv9nZAGmB8DXdM6kyDujhAZjE44\n\tAaq5zV1zBR6hTi2vcqkLHheo5DKKnYetTeApGD7N7HoCgQioJI8pMmJ2pXWmrzPqP/d8\n\tBz3w==","X-Gm-Message-State":"AHPjjUglxZhyXTi0E+nEo8x1jBt+KCrsECp5DxtKE6qPUuJS0hBhtrEs\n\tOnDuu5Eil2egB/Zj45ngh9M=","X-Google-Smtp-Source":"AOwi7QDptKm6D0UTjPTtgHxOjSTU74TWAucXbs8bSdUFHJpnfP1o0zUGSmp4V66x4vkZ9LASlontaw==","X-Received":"by 10.200.33.235 with SMTP id 40mr8835211qtz.185.1506094898032; \n\tFri, 22 Sep 2017 08:41:38 -0700 (PDT)","From":"=?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= ","To":"Peter Maydell , Thomas Huth ,\n\tPaolo Bonzini ,\n\t\"Michael S. Tsirkin\" , =?utf-8?q?Herv=C3=A9_Poussinea?=\n\t=?utf-8?q?u?= ,\n\tAurelien Jarno , Yongbok Kim\n\t, Richard Henderson ","Date":"Fri, 22 Sep 2017 12:40:00 -0300","Message-Id":"<20170922154014.29350-21-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:c0d::241","Subject":"[Qemu-devel] [PATCH 20/34] hw/timer/i8254: rename pit_init() ->\n\ti8254_pit_init()","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","Cc":"qemu-trivial@nongnu.org, qemu-ppc@nongnu.org, =?utf-8?q?Philippe_Mathi?=\n\t=?utf-8?b?ZXUtRGF1ZMOp?= , \tqemu-devel@nongnu.org","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"- add entry for i82378 in MAINTAINERS\n- remove the old i386/pc dependency\n\nSigned-off-by: Philippe Mathieu-Daudé \n---\n include/hw/timer/i8254.h | 5 +++--\n include/hw/timer/i8254_internal.h | 2 +-\n hw/alpha/dp264.c | 2 +-\n hw/i386/pc.c | 2 +-\n hw/isa/i82378.c | 2 +-\n hw/mips/mips_fulong2e.c | 2 +-\n hw/mips/mips_jazz.c | 2 +-\n hw/mips/mips_malta.c | 2 +-\n hw/mips/mips_r4k.c | 2 +-\n hw/timer/i8254.c | 1 -\n hw/timer/i8254_common.c | 1 -\n MAINTAINERS | 1 +\n 12 files changed, 12 insertions(+), 12 deletions(-)","diff":"diff --git a/include/hw/timer/i8254.h b/include/hw/timer/i8254.h\nindex 5adae9fa44..5b12eb918e 100644\n--- a/include/hw/timer/i8254.h\n+++ b/include/hw/timer/i8254.h\n@@ -26,6 +26,7 @@\n #define HW_I8254_H\n \n #include \"hw/hw.h\"\n+#include \"hw/qdev.h\"\n #include \"hw/isa/isa.h\"\n \n #define PIT_FREQ 1193182\n@@ -48,8 +49,8 @@ typedef struct PITChannelInfo {\n #define TYPE_I8254 \"isa-pit\"\n #define TYPE_KVM_I8254 \"kvm-pit\"\n \n-static inline ISADevice *pit_init(ISABus *bus, int base, int isa_irq,\n- qemu_irq alt_irq)\n+static inline ISADevice *i8254_pit_init(ISABus *bus, int base, int isa_irq,\n+ qemu_irq alt_irq)\n {\n DeviceState *dev;\n ISADevice *d;\ndiff --git a/include/hw/timer/i8254_internal.h b/include/hw/timer/i8254_internal.h\nindex dc09cc0467..c37a438f82 100644\n--- a/include/hw/timer/i8254_internal.h\n+++ b/include/hw/timer/i8254_internal.h\n@@ -26,8 +26,8 @@\n #define QEMU_I8254_INTERNAL_H\n \n #include \"hw/hw.h\"\n-#include \"hw/i386/pc.h\"\n #include \"hw/isa/isa.h\"\n+#include \"qemu/timer.h\"\n \n typedef struct PITChannelState {\n int count; /* can be 65536 */\ndiff --git a/hw/alpha/dp264.c b/hw/alpha/dp264.c\nindex 1b121306c2..1bd5243648 100644\n--- a/hw/alpha/dp264.c\n+++ b/hw/alpha/dp264.c\n@@ -81,7 +81,7 @@ static void clipper_init(MachineState *machine)\n /* Since we have an SRM-compatible PALcode, use the SRM epoch. */\n rtc_init(isa_bus, 1900, rtc_irq);\n \n- pit_init(isa_bus, 0x40, 0, NULL);\n+ i8254_pit_init(isa_bus, 0x40, 0, NULL);\n isa_create_simple(isa_bus, \"i8042\");\n \n /* VGA setup. Don't bother loading the bios. */\ndiff --git a/hw/i386/pc.c b/hw/i386/pc.c\nindex f116cede91..5cb0ae67cd 100644\n--- a/hw/i386/pc.c\n+++ b/hw/i386/pc.c\n@@ -1551,7 +1551,7 @@ void pc_basic_device_init(ISABus *isa_bus, qemu_irq *gsi,\n if (kvm_pit_in_kernel()) {\n pit = kvm_pit_init(isa_bus, 0x40);\n } else {\n- pit = pit_init(isa_bus, 0x40, pit_isa_irq, pit_alt_irq);\n+ pit = i8254_pit_init(isa_bus, 0x40, pit_isa_irq, pit_alt_irq);\n }\n if (hpet) {\n /* connect PIT to output control line of the HPET */\ndiff --git a/hw/isa/i82378.c b/hw/isa/i82378.c\nindex 4d29a9900c..7a8baef23c 100644\n--- a/hw/isa/i82378.c\n+++ b/hw/isa/i82378.c\n@@ -97,7 +97,7 @@ static void i82378_realize(PCIDevice *pci, Error **errp)\n isa_bus_irqs(isabus, s->i8259);\n \n /* 1 82C54 (pit) */\n- isa = pit_init(isabus, 0x40, 0, NULL);\n+ isa = i8254_pit_init(isabus, 0x40, 0, NULL);\n \n /* speaker */\n pcspk_init(isabus, isa);\ndiff --git a/hw/mips/mips_fulong2e.c b/hw/mips/mips_fulong2e.c\nindex 75318680e1..22e6c05fb5 100644\n--- a/hw/mips/mips_fulong2e.c\n+++ b/hw/mips/mips_fulong2e.c\n@@ -363,7 +363,7 @@ static void mips_fulong2e_init(MachineState *machine)\n smbus_eeprom_init(smbus, 1, eeprom_spd, sizeof(eeprom_spd));\n \n /* init other devices */\n- pit = pit_init(isa_bus, 0x40, 0, NULL);\n+ pit = i8254_pit_init(isa_bus, 0x40, 0, NULL);\n DMA_init(isa_bus, 0);\n \n /* Super I/O */\ndiff --git a/hw/mips/mips_jazz.c b/hw/mips/mips_jazz.c\nindex 7e6626dc88..5f37852499 100644\n--- a/hw/mips/mips_jazz.c\n+++ b/hw/mips/mips_jazz.c\n@@ -222,7 +222,7 @@ static void mips_jazz_init(MachineState *machine,\n i8259 = i8259_init(isa_bus, env->irq[4]);\n isa_bus_irqs(isa_bus, i8259);\n DMA_init(isa_bus, 0);\n- pit = pit_init(isa_bus, 0x40, 0, NULL);\n+ pit = i8254_pit_init(isa_bus, 0x40, 0, NULL);\n pcspk_init(isa_bus, pit);\n \n /* Video card */\ndiff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c\nindex 2adb9bcf89..de547d732f 100644\n--- a/hw/mips/mips_malta.c\n+++ b/hw/mips/mips_malta.c\n@@ -1217,7 +1217,7 @@ void mips_malta_init(MachineState *machine)\n isa_get_irq(NULL, 9), NULL, 0, NULL);\n smbus_eeprom_init(smbus, 8, smbus_eeprom_buf, smbus_eeprom_size);\n g_free(smbus_eeprom_buf);\n- pit = pit_init(isa_bus, 0x40, 0, NULL);\n+ pit = i8254_pit_init(isa_bus, 0x40, 0, NULL);\n DMA_init(isa_bus, 0);\n \n /* Super I/O */\ndiff --git a/hw/mips/mips_r4k.c b/hw/mips/mips_r4k.c\nindex 1272d4ef9d..48fad52540 100644\n--- a/hw/mips/mips_r4k.c\n+++ b/hw/mips/mips_r4k.c\n@@ -280,7 +280,7 @@ void mips_r4k_init(MachineState *machine)\n \n rtc_init(isa_bus, 2000, NULL);\n \n- pit = pit_init(isa_bus, 0x40, 0, NULL);\n+ pit = i8254_pit_init(isa_bus, 0x40, 0, NULL);\n \n serial_hds_isa_init(isa_bus, 0, MAX_SERIAL_PORTS);\n \ndiff --git a/hw/timer/i8254.c b/hw/timer/i8254.c\nindex 5e61ad50a8..dbc4a0baec 100644\n--- a/hw/timer/i8254.c\n+++ b/hw/timer/i8254.c\n@@ -23,7 +23,6 @@\n */\n #include \"qemu/osdep.h\"\n #include \"hw/hw.h\"\n-#include \"hw/i386/pc.h\"\n #include \"hw/isa/isa.h\"\n #include \"qemu/timer.h\"\n #include \"hw/timer/i8254.h\"\ndiff --git a/hw/timer/i8254_common.c b/hw/timer/i8254_common.c\nindex ee064aa819..c850950699 100644\n--- a/hw/timer/i8254_common.c\n+++ b/hw/timer/i8254_common.c\n@@ -24,7 +24,6 @@\n */\n #include \"qemu/osdep.h\"\n #include \"hw/hw.h\"\n-#include \"hw/i386/pc.h\"\n #include \"hw/isa/isa.h\"\n #include \"qemu/timer.h\"\n #include \"hw/timer/i8254.h\"\ndiff --git a/MAINTAINERS b/MAINTAINERS\nindex 7f49f1d046..f7d377ead9 100644\n--- a/MAINTAINERS\n+++ b/MAINTAINERS\n@@ -705,6 +705,7 @@ F: hw/ppc/prep.c\n F: hw/ppc/prep_systemio.c\n 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: pc-bios/ppc_rom.bin\n \n","prefixes":["20/34"]}