[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 06/32] mc146818rtc: always register rtc to rtc list
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH 06/32] mc146818rtc: always register rtc to rtc list |
Date: |
Tue, 15 Oct 2019 18:26:39 +0200 |
From: Hervé Poussineau <address@hidden>
We are not required anymore to use rtc_init() function.
Acked-by: Michael S. Tsirkin <address@hidden>
Acked-by: Paolo Bonzini <address@hidden>
Signed-off-by: Hervé Poussineau <address@hidden>
Message-Id: <address@hidden>
[PMD: rebased, fix OBJECT() value]
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
---
hw/timer/mc146818rtc.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/hw/timer/mc146818rtc.c b/hw/timer/mc146818rtc.c
index 0c04b74c2e..8f7d3a9cdf 100644
--- a/hw/timer/mc146818rtc.c
+++ b/hw/timer/mc146818rtc.c
@@ -963,17 +963,16 @@ static void rtc_realizefn(DeviceState *dev, Error **errp)
object_property_add_tm(OBJECT(s), "date", rtc_get_date, NULL);
qdev_init_gpio_out(dev, &s->irq, 1);
+ QLIST_INSERT_HEAD(&rtc_devices, s, link);
}
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) {
@@ -981,9 +980,8 @@ 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);
- object_property_add_alias(qdev_get_machine(), "rtc-time", OBJECT(s),
+ object_property_add_alias(qdev_get_machine(), "rtc-time", OBJECT(isadev),
"date", NULL);
return isadev;
@@ -1015,8 +1013,6 @@ static void rtc_class_initfn(ObjectClass *klass, void
*data)
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 const TypeInfo mc146818rtc_info = {
--
2.21.0
- [PATCH 02/32] hw/i386/pc: Move kvm_i8259_init() declaration to sysemu/kvm.h, (continued)
- [PATCH 02/32] hw/i386/pc: Move kvm_i8259_init() declaration to sysemu/kvm.h, Philippe Mathieu-Daudé, 2019/10/15
- [PATCH 03/32] mc146818rtc: move structure to header file, Philippe Mathieu-Daudé, 2019/10/15
- [PATCH 04/32] mc146818rtc: Move RTC_ISA_IRQ definition, Philippe Mathieu-Daudé, 2019/10/15
- [PATCH 05/32] mc146818rtc: Include "mc146818rtc_regs.h" directly in mc146818rtc.c, Philippe Mathieu-Daudé, 2019/10/15
- [PATCH 06/32] mc146818rtc: always register rtc to rtc list,
Philippe Mathieu-Daudé <=
- [PATCH 07/32] MAINTAINERS: Keep PIIX4 South Bridge separate from PC Chipsets, Philippe Mathieu-Daudé, 2019/10/15
- [PATCH 08/32] piix4: rename some variables in realize function, Philippe Mathieu-Daudé, 2019/10/15
- [PATCH 09/32] piix4: add Reset Control Register, Philippe Mathieu-Daudé, 2019/10/15
- [PATCH 10/32] piix4: add a i8259 interrupt controller as specified in datasheet, Philippe Mathieu-Daudé, 2019/10/15