[Qemu-devel] [PATCH] rtc: initialize irq even if caller doesn't use rtc_init() function

[Hervé Poussineau]

rtc instanciated with -device has now a working irq line

Signed-off-by: Hervé Poussineau <address@hidden>
---
 hw/mc146818rtc.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/hw/mc146818rtc.c b/hw/mc146818rtc.c
index 657fa10..3067022 100644
--- a/hw/mc146818rtc.c
+++ b/hw/mc146818rtc.c
@@ -672,6 +672,7 @@ static int rtc_initfn(ISADevice *dev)
 
     memory_region_init_io(&s->io, &cmos_ops, s, "rtc", 2);
     isa_register_ioport(dev, &s->io, base);
+    isa_init_irq(dev, &s->irq, RTC_ISA_IRQ);
 
     qdev_set_legacy_instance_id(&dev->qdev, base, 2);
     qemu_register_reset(rtc_reset, s);
@@ -692,9 +693,8 @@ ISADevice *rtc_init(ISABus *bus, int base_year, qemu_irq 
intercept_irq)
     qdev_prop_set_int32(&dev->qdev, "base_year", base_year);
     qdev_init_nofail(&dev->qdev);
     if (intercept_irq) {
+        /* Use provided IRQ instead of default one */
         s->irq = intercept_irq;
-    } else {
-        isa_init_irq(dev, &s->irq, RTC_ISA_IRQ);
     }
     return dev;
 }
-- 
1.7.7.3