[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 8/9] hw/isa/vt82c686: QOM'ify RTC creation
From: |
Bernhard Beschow |
Subject: |
[PATCH 8/9] hw/isa/vt82c686: QOM'ify RTC creation |
Date: |
Tue, 23 Aug 2022 00:43:54 +0200 |
Signed-off-by: Bernhard Beschow <shentey@gmail.com>
---
hw/isa/vt82c686.c | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c
index 47f2fd2669..ee745d5d49 100644
--- a/hw/isa/vt82c686.c
+++ b/hw/isa/vt82c686.c
@@ -546,6 +546,7 @@ struct ViaISAState {
qemu_irq cpu_intr;
qemu_irq *isa_irqs;
ViaSuperIOState via_sio;
+ RTCState rtc;
PCIIDEState ide;
UHCIState uhci[2];
ViaPMState pm;
@@ -567,6 +568,7 @@ static void via_isa_init(Object *obj)
{
ViaISAState *s = VIA_ISA(obj);
+ object_initialize_child(obj, "rtc", &s->rtc, TYPE_MC146818_RTC);
object_initialize_child(obj, "ide", &s->ide, "via-ide");
object_initialize_child(obj, "uhci1", &s->uhci[0], "vt82c686b-usb-uhci");
object_initialize_child(obj, "uhci2", &s->uhci[1], "vt82c686b-usb-uhci");
@@ -615,7 +617,15 @@ static void via_isa_realize(PCIDevice *d, Error **errp)
isa_bus_irqs(isa_bus, s->isa_irqs);
i8254_pit_init(isa_bus, 0x40, 0, NULL);
i8257_dma_init(isa_bus, 0);
- mc146818_rtc_init(isa_bus, 2000, NULL);
+
+ /* RTC */
+ qdev_prop_set_int32(DEVICE(&s->rtc), "base_year", 2000);
+ if (!qdev_realize(DEVICE(&s->rtc), BUS(isa_bus), errp)) {
+ return;
+ }
+ object_property_add_alias(qdev_get_machine(), "rtc-time", OBJECT(&s->rtc),
+ "date");
+ isa_connect_gpio_out(ISA_DEVICE(&s->rtc), 0, s->rtc.isairq);
for (i = 0; i < PCI_CONFIG_HEADER_SIZE; i++) {
if (i < PCI_COMMAND || i >= PCI_REVISION_ID) {
--
2.37.2
- Re: [PATCH 4/9] hw/isa/vt82c686: QOM'ify via-ide creation, (continued)
[PATCH 6/9] hw/isa/vt82c686: QOM'ify pm creation, Bernhard Beschow, 2022/08/22
[PATCH 7/9] hw/isa/vt82c686: QOM'ify ac97 and mc97 creation, Bernhard Beschow, 2022/08/22
[PATCH 8/9] hw/isa/vt82c686: QOM'ify RTC creation,
Bernhard Beschow <=
- Re: [PATCH 8/9] hw/isa/vt82c686: QOM'ify RTC creation, BALATON Zoltan, 2022/08/22
- Re: [PATCH 8/9] hw/isa/vt82c686: QOM'ify RTC creation, Bernhard Beschow, 2022/08/23
- Re: [PATCH 8/9] hw/isa/vt82c686: QOM'ify RTC creation, BALATON Zoltan, 2022/08/23
- Re: [PATCH 8/9] hw/isa/vt82c686: QOM'ify RTC creation, BB, 2022/08/29
- Re: [PATCH 8/9] hw/isa/vt82c686: QOM'ify RTC creation, BALATON Zoltan, 2022/08/29
- Re: [PATCH 8/9] hw/isa/vt82c686: QOM'ify RTC creation, BB, 2022/08/29
[PATCH 9/9] hw/isa/vt82c686: Reuse errp, Bernhard Beschow, 2022/08/22