[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 04/16] mc146818rtc: always register rtc to rtc li
From: |
Hervé Poussineau |
Subject: |
[Qemu-devel] [PATCH v3 04/16] mc146818rtc: always register rtc to rtc list |
Date: |
Fri, 29 Dec 2017 15:29:10 +0100 |
We are not required anymore to use rtc_init() function.
Signed-off-by: Hervé Poussineau <address@hidden>
---
hw/timer/mc146818rtc.c | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/hw/timer/mc146818rtc.c b/hw/timer/mc146818rtc.c
index 3e8c0b7d33..0b0da691cc 100644
--- a/hw/timer/mc146818rtc.c
+++ b/hw/timer/mc146818rtc.c
@@ -905,6 +905,13 @@ static void rtc_get_date(Object *obj, struct tm
*current_tm, Error **errp)
rtc_get_time(s, current_tm);
}
+static int rtc_initfn(DeviceState *dev)
+{
+ RTCState *s = MC146818_RTC(dev);
+ QLIST_INSERT_HEAD(&rtc_devices, s, link);
+ return 0;
+}
+
static void rtc_realizefn(DeviceState *dev, Error **errp)
{
ISADevice *isadev = ISA_DEVICE(dev);
@@ -973,11 +980,9 @@ ISADevice *mc146818_rtc_init(ISABus *bus, int base_year,
qemu_irq intercept_irq)
{
DeviceState *dev;
ISADevice *isadev;
- RTCState *s;
isadev = isa_create(bus, TYPE_MC146818_RTC);
dev = DEVICE(isadev);
- s = MC146818_RTC(isadev);
qdev_prop_set_int32(dev, "base_year", base_year);
qdev_init_nofail(dev);
if (intercept_irq) {
@@ -985,7 +990,6 @@ ISADevice *mc146818_rtc_init(ISABus *bus, int base_year,
qemu_irq intercept_irq)
} else {
isa_connect_gpio_out(isadev, 0, RTC_ISA_IRQ);
}
- QLIST_INSERT_HEAD(&rtc_devices, s, link);
return isadev;
}
@@ -1012,12 +1016,11 @@ static void rtc_class_initfn(ObjectClass *klass, void
*data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
+ dc->init = rtc_initfn;
dc->realize = rtc_realizefn;
dc->reset = rtc_resetdev;
dc->vmsd = &vmstate_rtc;
dc->props = mc146818rtc_properties;
- /* Reason: needs to be wired up by rtc_init() */
- dc->user_creatable = false;
}
static void rtc_finalize(Object *obj)
--
2.11.0
- [Qemu-devel] [PATCH v3 00/16] piix4: cleanup and improvements, Hervé Poussineau, 2017/12/29
- [Qemu-devel] [PATCH v3 14/16] piix4: convert reset function to QOM, Hervé Poussineau, 2017/12/29
- [Qemu-devel] [PATCH v3 16/16] piix4: we can now instanciate a PIIX4 with -device, Hervé Poussineau, 2017/12/29
- [Qemu-devel] [PATCH v3 10/16] piix4: add a i8042 keyboard/mouse controller as specified in datasheet, Hervé Poussineau, 2017/12/29
- [Qemu-devel] [PATCH v3 09/16] piix4: add a i8254 pit controller as specified in datasheet, Hervé Poussineau, 2017/12/29
- [Qemu-devel] [PATCH v3 02/16] serial/parallel: move object structures to header file, Hervé Poussineau, 2017/12/29
- [Qemu-devel] [PATCH v3 07/16] piix4: add a i8259 interrupt controller as specified in datasheet, Hervé Poussineau, 2017/12/29
- [Qemu-devel] [PATCH v3 06/16] piix4: add Reset Control Register, Hervé Poussineau, 2017/12/29
- [Qemu-devel] [PATCH v3 11/16] piix4: add a floppy controller, 1 parallel port and 2 serial ports, Hervé Poussineau, 2017/12/29
- [Qemu-devel] [PATCH v3 05/16] piix4: rename some variables in realize function, Hervé Poussineau, 2017/12/29
- [Qemu-devel] [PATCH v3 04/16] mc146818rtc: always register rtc to rtc list,
Hervé Poussineau <=
- [Qemu-devel] [PATCH v3 13/16] piix4: add a speaker as specified in datasheet, Hervé Poussineau, 2017/12/29
- [Qemu-devel] [PATCH v3 01/16] fdc: move object structures to header file, Hervé Poussineau, 2017/12/29
- [Qemu-devel] [PATCH v3 08/16] piix4: add a i8257 dma controller as specified in datasheet, Hervé Poussineau, 2017/12/29
- [Qemu-devel] [PATCH v3 12/16] piix4: add a mc146818rtc controller as specified in datasheet, Hervé Poussineau, 2017/12/29
- [Qemu-devel] [PATCH v3 03/16] mc146818rtc: move structure to header file, Hervé Poussineau, 2017/12/29
- [Qemu-devel] [PATCH v3 15/16] piix4: rename PIIX4 object to piix4-isa, Hervé Poussineau, 2017/12/29