Commit df84f17d authored by Hervé Poussineau's avatar Hervé Poussineau Committed by Paolo Bonzini
Browse files

mc146818rtc: always register rtc to rtc list 



We are not required anymore to use rtc_init() function.

Acked-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Acked-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarHervé Poussineau <hpoussin@reactos.org>
Message-Id: <20171216090228.28505-5-hpoussin@reactos.org>
[PMD: rebased, fix OBJECT() value]
Signed-off-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20191018133547.10936-5-philmd@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent d93884e8

hw/timer/mc146818rtc.c

+2 −6
Original line number Diff line number Diff line
@@ -964,17 +964,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) {
@@ -982,9 +981,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;
@@ -1016,8 +1014,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 = {