[{"id":1773858,"web_url":"http://patchwork.ozlabs.org/comment/1773858/","msgid":"","list_archive_url":null,"date":"2017-09-22T20:11:33","subject":"Re: [Qemu-devel] [PATCH 24/34] hw/timer/mc146818: rename rtc_init()\n\t-> mc146818_init()","submitter":{"id":2909,"url":"http://patchwork.ozlabs.org/api/people/2909/","name":"Hervé Poussineau","email":"hpoussin@reactos.org"},"content":"Le 22/09/2017 à 18:01, Philippe Mathieu-Daudé a écrit :\n> and remove the old i386/pc dependency\n> \n> Signed-off-by: Philippe Mathieu-Daudé \n> ---\n> include/hw/timer/mc146818rtc.h | 3 ++-\n> hw/alpha/dp264.c | 2 +-\n> hw/i386/pc.c | 2 +-\n> hw/isa/i82378.c | 3 ++-\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/ppc/pnv.c | 2 +-\n> hw/timer/mc146818rtc.c | 2 +-\n> 10 files changed, 12 insertions(+), 10 deletions(-)\n\nReviewed-by: Hervé Poussineau ","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\" (1024-bit key;\n\tunprotected) header.d=reactos.org header.i=@reactos.org\n\theader.b=\"Z9B+BTzf\"; 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 3xzPsm4zNyz9t32\n\tfor ;\n\tSat, 23 Sep 2017 06:17:32 +1000 (AEST)","from localhost ([::1]:60876 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dvUOA-0000kW-8R\n\tfor incoming@patchwork.ozlabs.org; Fri, 22 Sep 2017 16:17:30 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:32909)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dvUIc-0004cc-07\n\tfor qemu-devel@nongnu.org; Fri, 22 Sep 2017 16:11:46 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dvUIb-0004sD-45\n\tfor qemu-devel@nongnu.org; Fri, 22 Sep 2017 16:11:45 -0400","from iserv.reactos.org ([2a01:4f8:221:4c5::3]:47088)\n\tby eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)\n\t(Exim 4.71) (envelope-from )\n\tid 1dvUIT-0004o7-0I; Fri, 22 Sep 2017 16:11:37 -0400","from rob92-5-82-227-227-196.fbx.proxad.net ([82.227.227.196]\n\thelo=[192.168.0.35]) by iserv.reactos.org with esmtpsa\n\t(TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2)\n\t(envelope-from )\n\tid 1dvUIR-0005W0-Vd; Fri, 22 Sep 2017 20:11:36 +0000"],"DKIM-Signature":"v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;\n\td=reactos.org; s=25047; \n\th=Content-Transfer-Encoding:Content-Type:In-Reply-To:MIME-Version:Date:Message-ID:From:References:Cc:To:Subject;\n\tbh=FwfDtmuFO0TTGXweUiZDwZEfPi34f4ETrDwakp2ND7g=; \n\tb=Z9B+BTzfOVh9dhdj+Zq/3Dn8rAstk+sci7yzS/0ib5DEA7J5PsiYUzKzXY4sa74iPYf0OGr3J2FXgSqblnH5N5C5+hLeezrjK23M529oHL6EodTaw4yeJp6/r0uwzpD1JjQSisB1SdpxxPJq4dQwsmvEm+fFMnAorIGDq9flHf0=;","To":"=?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= ,\n\tPeter Maydell ,\n\tThomas Huth , \tPaolo Bonzini ,\n\t\"Michael S. Tsirkin\" , \n\tAurelien Jarno , Yongbok Kim\n\t, Richard Henderson ,\n\tDavid Gibson ,\n\tAlexander Graf ","References":"<20170922154014.29350-1-f4bug@amsat.org>\n\t<20170922160111.31885-2-f4bug@amsat.org>","From":"=?utf-8?q?Herv=C3=A9_Poussineau?= ","Message-ID":"","Date":"Fri, 22 Sep 2017 22:11:33 +0200","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101\n\tThunderbird/52.2.1","MIME-Version":"1.0","In-Reply-To":"<20170922160111.31885-2-f4bug@amsat.org>","Content-Type":"text/plain; charset=utf-8; format=flowed","Content-Language":"en-US","Content-Transfer-Encoding":"8bit","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]","X-Received-From":"2a01:4f8:221:4c5::3","Subject":"Re: [Qemu-devel] [PATCH 24/34] hw/timer/mc146818: rename rtc_init()\n\t-> mc146818_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, qemu-devel@nongnu.org","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"}},{"id":1773976,"web_url":"http://patchwork.ozlabs.org/comment/1773976/","msgid":"<20170923051041.GY4998@umbus.fritz.box>","list_archive_url":null,"date":"2017-09-23T05:10:41","subject":"Re: [Qemu-devel] [PATCH 24/34] hw/timer/mc146818: rename rtc_init()\n\t-> mc146818_init()","submitter":{"id":47,"url":"http://patchwork.ozlabs.org/api/people/47/","name":"David Gibson","email":"david@gibson.dropbear.id.au"},"content":"On Fri, Sep 22, 2017 at 01:01:01PM -0300, Philippe Mathieu-Daudé wrote:\n> and remove the old i386/pc dependency\n> \n> Signed-off-by: Philippe Mathieu-Daudé \n\nReviewed-by: David Gibson \n\n> ---\n> include/hw/timer/mc146818rtc.h | 3 ++-\n> hw/alpha/dp264.c | 2 +-\n> hw/i386/pc.c | 2 +-\n> hw/isa/i82378.c | 3 ++-\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/ppc/pnv.c | 2 +-\n> hw/timer/mc146818rtc.c | 2 +-\n> 10 files changed, 12 insertions(+), 10 deletions(-)\n> \n> diff --git a/include/hw/timer/mc146818rtc.h b/include/hw/timer/mc146818rtc.h\n> index 7c8e64b203..fe6ed63f71 100644\n> --- a/include/hw/timer/mc146818rtc.h\n> +++ b/include/hw/timer/mc146818rtc.h\n> @@ -6,7 +6,8 @@\n> \n> #define TYPE_MC146818_RTC \"mc146818rtc\"\n> \n> -ISADevice *rtc_init(ISABus *bus, int base_year, qemu_irq intercept_irq);\n> +ISADevice *mc146818_rtc_init(ISABus *bus, int base_year,\n> + qemu_irq intercept_irq);\n> void rtc_set_memory(ISADevice *dev, int addr, int val);\n> int rtc_get_memory(ISADevice *dev, int addr);\n> \n> diff --git a/hw/alpha/dp264.c b/hw/alpha/dp264.c\n> index 2253990654..df6dadf13f 100644\n> --- a/hw/alpha/dp264.c\n> +++ b/hw/alpha/dp264.c\n> @@ -80,7 +80,7 @@ static void clipper_init(MachineState *machine)\n> clipper_pci_map_irq);\n> \n> /* Since we have an SRM-compatible PALcode, use the SRM epoch. */\n> - rtc_init(isa_bus, 1900, rtc_irq);\n> + mc146818_rtc_init(isa_bus, 1900, rtc_irq);\n> \n> i8254_pit_init(isa_bus, 0x40, 0, NULL);\n> isa_create_simple(isa_bus, TYPE_I8042);\n> diff --git a/hw/i386/pc.c b/hw/i386/pc.c\n> index 76d4be5991..788844e0de 100644\n> --- a/hw/i386/pc.c\n> +++ b/hw/i386/pc.c\n> @@ -1545,7 +1545,7 @@ void pc_basic_device_init(ISABus *isa_bus, qemu_irq *gsi,\n> rtc_irq = qdev_get_gpio_in(hpet, HPET_LEGACY_RTC_INT);\n> }\n> }\n> - *rtc_state = rtc_init(isa_bus, 2000, rtc_irq);\n> + *rtc_state = mc146818_rtc_init(isa_bus, 2000, rtc_irq);\n> \n> qemu_register_boot_set(pc_boot_set, *rtc_state);\n> \n> diff --git a/hw/isa/i82378.c b/hw/isa/i82378.c\n> index 7a8baef23c..14b006cadc 100644\n> --- a/hw/isa/i82378.c\n> +++ b/hw/isa/i82378.c\n> @@ -21,6 +21,7 @@\n> #include \"hw/pci/pci.h\"\n> #include \"hw/i386/pc.h\"\n> #include \"hw/timer/i8254.h\"\n> +#include \"hw/timer/mc146818rtc.h\"\n> #include \"hw/audio/pcspk.h\"\n> \n> #define TYPE_I82378 \"i82378\"\n> @@ -106,7 +107,7 @@ static void i82378_realize(PCIDevice *pci, Error **errp)\n> isa = isa_create_simple(isabus, \"i82374\");\n> \n> /* timer */\n> - isa_create_simple(isabus, \"mc146818rtc\");\n> + isa_create_simple(isabus, TYPE_MC146818_RTC);\n> }\n> \n> static void i82378_init(Object *obj)\n> diff --git a/hw/mips/mips_fulong2e.c b/hw/mips/mips_fulong2e.c\n> index 6dc6a0ac18..7ebbffa8f2 100644\n> --- a/hw/mips/mips_fulong2e.c\n> +++ b/hw/mips/mips_fulong2e.c\n> @@ -371,7 +371,7 @@ static void mips_fulong2e_init(MachineState *machine)\n> /* Super I/O */\n> isa_create_simple(isa_bus, TYPE_I8042);\n> \n> - rtc_init(isa_bus, 2000, NULL);\n> + mc146818_rtc_init(isa_bus, 2000, NULL);\n> \n> serial_hds_isa_init(isa_bus, 0, MAX_SERIAL_PORTS);\n> parallel_hds_isa_init(isa_bus, 1);\n> diff --git a/hw/mips/mips_jazz.c b/hw/mips/mips_jazz.c\n> index 1b54602c1d..439bbd71fe 100644\n> --- a/hw/mips/mips_jazz.c\n> +++ b/hw/mips/mips_jazz.c\n> @@ -295,7 +295,7 @@ static void mips_jazz_init(MachineState *machine,\n> fdctrl_init_sysbus(qdev_get_gpio_in(rc4030, 1), -1, 0x80003000, fds);\n> \n> /* Real time clock */\n> - rtc_init(isa_bus, 1980, NULL);\n> + mc146818_rtc_init(isa_bus, 1980, NULL);\n> memory_region_init_io(rtc, NULL, &rtc_ops, NULL, \"rtc\", 0x1000);\n> memory_region_add_subregion(address_space, 0x80004000, rtc);\n> \n> diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c\n> index 050da36f1d..6945fa47c3 100644\n> --- a/hw/mips/mips_malta.c\n> +++ b/hw/mips/mips_malta.c\n> @@ -1225,7 +1225,7 @@ void mips_malta_init(MachineState *machine)\n> /* Super I/O */\n> isa_create_simple(isa_bus, TYPE_I8042);\n> \n> - rtc_init(isa_bus, 2000, NULL);\n> + mc146818_rtc_init(isa_bus, 2000, NULL);\n> serial_hds_isa_init(isa_bus, 0, 2);\n> parallel_hds_isa_init(isa_bus, 1);\n> \n> diff --git a/hw/mips/mips_r4k.c b/hw/mips/mips_r4k.c\n> index 946097a31f..349da59912 100644\n> --- a/hw/mips/mips_r4k.c\n> +++ b/hw/mips/mips_r4k.c\n> @@ -279,7 +279,7 @@ void mips_r4k_init(MachineState *machine)\n> i8259 = i8259_init(isa_bus, env->irq[2]);\n> isa_bus_irqs(isa_bus, i8259);\n> \n> - rtc_init(isa_bus, 2000, NULL);\n> + mc146818_rtc_init(isa_bus, 2000, NULL);\n> \n> pit = i8254_pit_init(isa_bus, 0x40, 0, NULL);\n> \n> diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c\n> index 47221158d4..d188b899c5 100644\n> --- a/hw/ppc/pnv.c\n> +++ b/hw/ppc/pnv.c\n> @@ -647,7 +647,7 @@ static void ppc_powernv_init(MachineState *machine)\n> serial_hds_isa_init(pnv->isa_bus, 0, MAX_SERIAL_PORTS);\n> \n> /* Create an RTC ISA device too */\n> - rtc_init(pnv->isa_bus, 2000, NULL);\n> + mc146818_rtc_init(pnv->isa_bus, 2000, NULL);\n> \n> /* OpenPOWER systems use a IPMI SEL Event message to notify the\n> * host to powerdown */\n> diff --git a/hw/timer/mc146818rtc.c b/hw/timer/mc146818rtc.c\n> index 82843ed03f..f7d8c4bae4 100644\n> --- a/hw/timer/mc146818rtc.c\n> +++ b/hw/timer/mc146818rtc.c\n> @@ -997,7 +997,7 @@ static void rtc_realizefn(DeviceState *dev, Error **errp)\n> qdev_init_gpio_out(dev, &s->irq, 1);\n> }\n> \n> -ISADevice *rtc_init(ISABus *bus, int base_year, qemu_irq intercept_irq)\n> +ISADevice *mc146818_rtc_init(ISABus *bus, int base_year, qemu_irq intercept_irq)\n> {\n> DeviceState *dev;\n> ISADevice *isadev;","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\" (1024-bit key;\n\tunprotected) header.d=gibson.dropbear.id.au\n\theader.i=@gibson.dropbear.id.au header.b=\"RyQEMd45\"; \n\tdkim-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 3xzf7V0v9tz9t67\n\tfor ;\n\tSat, 23 Sep 2017 15:30:14 +1000 (AEST)","from localhost ([::1]:33728 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dvd12-0007M4-44\n\tfor incoming@patchwork.ozlabs.org; Sat, 23 Sep 2017 01:30:12 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:36124)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dvd0H-0007Jc-EW\n\tfor qemu-devel@nongnu.org; Sat, 23 Sep 2017 01:29:26 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dvd0E-00029n-GR\n\tfor qemu-devel@nongnu.org; Sat, 23 Sep 2017 01:29:25 -0400","from ozlabs.org ([103.22.144.67]:37387)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from )\n\tid 1dvd0D-000290-T7; Sat, 23 Sep 2017 01:29:22 -0400","by ozlabs.org (Postfix, from userid 1007)\n\tid 3xzf6R3Vvpz9sRm; Sat, 23 Sep 2017 15:29:19 +1000 (AEST)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple;\n\td=gibson.dropbear.id.au; s=201602; t=1506144559;\n\tbh=Naajsi2PWIbMGBFc2tPO4SuJkLmiEdJGDvROLcBSuXI=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=RyQEMd45T4+QafcREDEcMYYBHHUhg1vaRF8gkZAbDoyQa/f1dWSuuz2Oejam6UM7c\n\tzPkTlDvGwSrzHvAZA6DcOPw/SXDmWHxsZeFFOSVr9V9iVGfGVkc0dCmxlhqNj9/rEa\n\tQJ5OBtx3xwfsXffWaCjMHyYggDrGHMne0o9i/Vf8=","Date":"Sat, 23 Sep 2017 15:10:41 +1000","From":"David Gibson ","To":"Philippe =?iso-8859-1?q?Mathieu-Daud=E9?= ","Message-ID":"<20170923051041.GY4998@umbus.fritz.box>","References":"<20170922154014.29350-1-f4bug@amsat.org>\n\t<20170922160111.31885-2-f4bug@amsat.org>","MIME-Version":"1.0","Content-Type":"multipart/signed; micalg=pgp-sha256;\n\tprotocol=\"application/pgp-signature\"; boundary=\"Ng9nCnWcMXS7n1y7\"","Content-Disposition":"inline","In-Reply-To":"<20170922160111.31885-2-f4bug@amsat.org>","User-Agent":"Mutt/1.9.0 (2017-09-02)","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"103.22.144.67","Subject":"Re: [Qemu-devel] [PATCH 24/34] hw/timer/mc146818: rename rtc_init()\n\t-> mc146818_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":"Peter Maydell , Thomas Huth ,\n\t\"Michael S. Tsirkin\" , qemu-ppc@nongnu.org, Alexander\n\tGraf , qemu-devel@nongnu.org, \tqemu-trivial@nongnu.org,\n\t=?iso-8859-1?q?Herv=E9?= Poussineau ,\n\tYongbok Kim ,\n\tPaolo Bonzini , Aurelien Jarno\n\t, Richard Henderson ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"}}]