From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1e4FWR-0007FW-DZ for mharc-qemu-trivial@gnu.org; Mon, 16 Oct 2017 20:14:15 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34261) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4FWO-0007CQ-M8 for qemu-trivial@nongnu.org; Mon, 16 Oct 2017 20:14:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e4FWN-0004wI-Bh for qemu-trivial@nongnu.org; Mon, 16 Oct 2017 20:14:12 -0400 Received: from mail-qt0-x243.google.com ([2607:f8b0:400d:c0d::243]:51551) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1e4FWG-0004sP-FO; Mon, 16 Oct 2017 20:14:04 -0400 Received: by mail-qt0-x243.google.com with SMTP id h4so49710qtk.8; Mon, 16 Oct 2017 17:14:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=fUPwxV1I3KFXMiJ+jMQBDbL8UZVxROpx3APVL5xwb38=; b=ZnomJcKDEuLObyLMv/IVMSfultk3VOJlYFpj0ssYJrhXldvlVxYpxE5WbWddpjqJX+ 1YXnNeKU/NqTxkmyoKM7AyCllhzdP+dAxihXzYSmnH4dyAMBEX7S0djPKk1t1yxcBkOn CuSbazdaD2NJgWfota7Xwxv2l6ddD76qU6FDSqUqtE5qf6oq7bzCudcGBRtX6aV+R1ME k7Q07XFT3aduJ2vsSglJ1MrtZEkjo2UE+QZzIT8uVqtKBpT37CUNp4Xzrf1SqrOb9yK+ KLqYrSMkgoI64lJxFT2T4aMfkLgMyYPwW+sjpOjj9HD63bpQPHmTIeLnTZdEWYhR3qEq V29A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=fUPwxV1I3KFXMiJ+jMQBDbL8UZVxROpx3APVL5xwb38=; b=H7feDTff1McR4dzhOJiT4dNhqBhvJQuFhP5PXr36o420ub5xTAQTICu0wVkrXTOtHT I821UUzamIkAE4g9NF6/ILnoI9NeeXxnQUfRbaKN0YXr0uSRxVuL/5pey9Na+MzIUpx/ CpuC2CVreIWTUZXbEIdBPzdscQE5zC9StdnTqTuDGKA8Y/nhST933MMfkFDlz596mW4s ikwQaQYMWN8pHomBTXl5ptFXCMk9KOtwikF/tdxv3GDH3t2l2DI3MKov5brFgF7UtpZ5 4o+AmSQj+Y21jFM3ErhQgk49MOBtJopgDtzxe3WSAGfgOs7vI5YSQvXoUgXtmDzRfS8t w5cQ== X-Gm-Message-State: AMCzsaXqL5R94zO8lh7IoqxkUtQajY7wB/fRUQq6q94xeIoBlInsTHpi 2VpMwLjCoUvV6ScsIy1grS8= X-Google-Smtp-Source: AOwi7QDJ0kJ3iB49t8Qh5DkXHPg+fHCyxjRCVXFgefDIF6nAiIQ2fLh9B+aedbg21XivRWg00ToEcw== X-Received: by 10.237.60.154 with SMTP id d26mr15476525qtf.227.1508199243963; Mon, 16 Oct 2017 17:14:03 -0700 (PDT) Received: from x1.local ([181.93.89.178]) by smtp.gmail.com with ESMTPSA id r6sm5409043qkh.22.2017.10.16.17.14.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Oct 2017 17:14:03 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Michael Tokarev Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, qemu-ppc@nongnu.org, qemu-trivial@nongnu.org Date: Mon, 16 Oct 2017 21:12:02 -0300 Message-Id: <20171017001209.32276-33-f4bug@amsat.org> X-Mailer: git-send-email 2.15.0.rc0 In-Reply-To: <20171017001209.32276-1-f4bug@amsat.org> References: <20171017001209.32276-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 recognized. X-Received-From: 2607:f8b0:400d:c0d::243 Subject: [Qemu-trivial] [PATCH v2 32/39] hw/timer/mc146818: rename rtc_init() -> mc146818_rtc_init() X-BeenThere: qemu-trivial@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Oct 2017 00:14:14 -0000 Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Hervé Poussineau Reviewed-by: David Gibson --- include/hw/timer/mc146818rtc.h | 3 ++- hw/alpha/dp264.c | 2 +- hw/i386/pc.c | 2 +- hw/isa/i82378.c | 3 ++- hw/mips/mips_fulong2e.c | 2 +- hw/mips/mips_jazz.c | 2 +- hw/mips/mips_malta.c | 2 +- hw/mips/mips_r4k.c | 2 +- hw/ppc/pnv.c | 2 +- hw/timer/mc146818rtc.c | 2 +- 10 files changed, 12 insertions(+), 10 deletions(-) diff --git a/include/hw/timer/mc146818rtc.h b/include/hw/timer/mc146818rtc.h index 7c8e64b203..fe6ed63f71 100644 --- a/include/hw/timer/mc146818rtc.h +++ b/include/hw/timer/mc146818rtc.h @@ -6,7 +6,8 @@ #define TYPE_MC146818_RTC "mc146818rtc" -ISADevice *rtc_init(ISABus *bus, int base_year, qemu_irq intercept_irq); +ISADevice *mc146818_rtc_init(ISABus *bus, int base_year, + qemu_irq intercept_irq); void rtc_set_memory(ISADevice *dev, int addr, int val); int rtc_get_memory(ISADevice *dev, int addr); diff --git a/hw/alpha/dp264.c b/hw/alpha/dp264.c index 2253990654..df6dadf13f 100644 --- a/hw/alpha/dp264.c +++ b/hw/alpha/dp264.c @@ -80,7 +80,7 @@ static void clipper_init(MachineState *machine) clipper_pci_map_irq); /* Since we have an SRM-compatible PALcode, use the SRM epoch. */ - rtc_init(isa_bus, 1900, rtc_irq); + mc146818_rtc_init(isa_bus, 1900, rtc_irq); i8254_pit_init(isa_bus, 0x40, 0, NULL); isa_create_simple(isa_bus, TYPE_I8042); diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 6959a0a712..39076aeb9f 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1544,7 +1544,7 @@ void pc_basic_device_init(ISABus *isa_bus, qemu_irq *gsi, rtc_irq = qdev_get_gpio_in(hpet, HPET_LEGACY_RTC_INT); } } - *rtc_state = rtc_init(isa_bus, 2000, rtc_irq); + *rtc_state = mc146818_rtc_init(isa_bus, 2000, rtc_irq); qemu_register_boot_set(pc_boot_set, *rtc_state); diff --git a/hw/isa/i82378.c b/hw/isa/i82378.c index a9c15f858d..a5d67bc6d7 100644 --- a/hw/isa/i82378.c +++ b/hw/isa/i82378.c @@ -21,6 +21,7 @@ #include "hw/pci/pci.h" #include "hw/i386/pc.h" #include "hw/timer/i8254.h" +#include "hw/timer/mc146818rtc.h" #include "hw/audio/pcspk.h" #define TYPE_I82378 "i82378" @@ -106,7 +107,7 @@ static void i82378_realize(PCIDevice *pci, Error **errp) isa = isa_create_simple(isabus, "i82374"); /* timer */ - isa_create_simple(isabus, "mc146818rtc"); + isa_create_simple(isabus, TYPE_MC146818_RTC); } static void i82378_init(Object *obj) diff --git a/hw/mips/mips_fulong2e.c b/hw/mips/mips_fulong2e.c index a35745a407..bf021ba018 100644 --- a/hw/mips/mips_fulong2e.c +++ b/hw/mips/mips_fulong2e.c @@ -370,7 +370,7 @@ static void mips_fulong2e_init(MachineState *machine) /* Super I/O */ isa_create_simple(isa_bus, TYPE_I8042); - rtc_init(isa_bus, 2000, NULL); + mc146818_rtc_init(isa_bus, 2000, NULL); serial_hds_isa_init(isa_bus, 0, MAX_SERIAL_PORTS); parallel_hds_isa_init(isa_bus, 1); diff --git a/hw/mips/mips_jazz.c b/hw/mips/mips_jazz.c index 1bbef7eeb5..f5112fab39 100644 --- a/hw/mips/mips_jazz.c +++ b/hw/mips/mips_jazz.c @@ -294,7 +294,7 @@ static void mips_jazz_init(MachineState *machine, fdctrl_init_sysbus(qdev_get_gpio_in(rc4030, 1), -1, 0x80003000, fds); /* Real time clock */ - rtc_init(isa_bus, 1980, NULL); + mc146818_rtc_init(isa_bus, 1980, NULL); memory_region_init_io(rtc, NULL, &rtc_ops, NULL, "rtc", 0x1000); memory_region_add_subregion(address_space, 0x80004000, rtc); diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c index 45c7f589aa..7e8194be17 100644 --- a/hw/mips/mips_malta.c +++ b/hw/mips/mips_malta.c @@ -1224,7 +1224,7 @@ void mips_malta_init(MachineState *machine) /* Super I/O */ isa_create_simple(isa_bus, TYPE_I8042); - rtc_init(isa_bus, 2000, NULL); + mc146818_rtc_init(isa_bus, 2000, NULL); serial_hds_isa_init(isa_bus, 0, 2); parallel_hds_isa_init(isa_bus, 1); diff --git a/hw/mips/mips_r4k.c b/hw/mips/mips_r4k.c index 946097a31f..349da59912 100644 --- a/hw/mips/mips_r4k.c +++ b/hw/mips/mips_r4k.c @@ -279,7 +279,7 @@ void mips_r4k_init(MachineState *machine) i8259 = i8259_init(isa_bus, env->irq[2]); isa_bus_irqs(isa_bus, i8259); - rtc_init(isa_bus, 2000, NULL); + mc146818_rtc_init(isa_bus, 2000, NULL); pit = i8254_pit_init(isa_bus, 0x40, 0, NULL); diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c index d46d91c76f..0e47757bff 100644 --- a/hw/ppc/pnv.c +++ b/hw/ppc/pnv.c @@ -651,7 +651,7 @@ static void ppc_powernv_init(MachineState *machine) serial_hds_isa_init(pnv->isa_bus, 0, MAX_SERIAL_PORTS); /* Create an RTC ISA device too */ - rtc_init(pnv->isa_bus, 2000, NULL); + mc146818_rtc_init(pnv->isa_bus, 2000, NULL); /* OpenPOWER systems use a IPMI SEL Event message to notify the * host to powerdown */ diff --git a/hw/timer/mc146818rtc.c b/hw/timer/mc146818rtc.c index 7764be25ec..35a05a64cc 100644 --- a/hw/timer/mc146818rtc.c +++ b/hw/timer/mc146818rtc.c @@ -999,7 +999,7 @@ static void rtc_realizefn(DeviceState *dev, Error **errp) qdev_init_gpio_out(dev, &s->irq, 1); } -ISADevice *rtc_init(ISABus *bus, int base_year, qemu_irq intercept_irq) +ISADevice *mc146818_rtc_init(ISABus *bus, int base_year, qemu_irq intercept_irq) { DeviceState *dev; ISADevice *isadev; -- 2.15.0.rc0