[Qemu-devel] [PATCH 1/3] qdev-ify isa pic

[Gerd Hoffmann <kraxel@redhat.com>]

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 hw/i8259.c |   32 ++++++++++++++++++++++++++------
 1 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/hw/i8259.c b/hw/i8259.c
index 40f8bee..6c8b5c5 100644
--- a/hw/i8259.c
+++ b/hw/i8259.c
@@ -25,6 +25,7 @@
 #include "pc.h"
 #include "isa.h"
 #include "monitor.h"
+#include "sysbus.h"
 
 /* debug PIC */
 //#define DEBUG_PIC
@@ -54,6 +55,7 @@ typedef struct PicState {
 } PicState;
 
 struct PicState2 {
+    SysBusDevice busdev;
     /* 0 is master pic, 1 is slave pic */
     /* XXX: better separation between the two pics */
     PicState pics[2];
@@ -182,7 +184,8 @@ int64_t irq_time[16];
 
 static void i8259_set_irq(void *opaque, int irq, int level)
 {
-    PicState2 *s = opaque;
+    DeviceState *dev = opaque;
+    PicState2 *s = FROM_SYSBUS(PicState2, sysbus_from_qdev(dev));
 
 #if defined(DEBUG_PIC) || defined(DEBUG_IRQ_COUNT)
     if (level != irq_level[irq]) {
@@ -546,20 +549,37 @@ void irq_info(Monitor *mon)
 #endif
 }
 
-qemu_irq *i8259_init(qemu_irq parent_irq)
+static void i8259_initfn(SysBusDevice *sysdev)
 {
     PicState2 *s;
 
-    s = qemu_mallocz(sizeof(PicState2));
+    s = FROM_SYSBUS(PicState2, sysdev);
     pic_init1(0x20, 0x4d0, &s->pics[0]);
     pic_init1(0xa0, 0x4d1, &s->pics[1]);
     s->pics[0].elcr_mask = 0xf8;
     s->pics[1].elcr_mask = 0xde;
-    s->parent_irq = parent_irq;
     s->pics[0].pics_state = s;
     s->pics[1].pics_state = s;
-    isa_pic = s;
-    return qemu_allocate_irqs(i8259_set_irq, s, 16);
+    qdev_init_gpio_out(&sysdev->qdev, &s->parent_irq, 1);
+    qdev_init_gpio_in(&sysdev->qdev, i8259_set_irq, 16);
+}
+
+static void i8259_register(void)
+{
+    sysbus_register_dev("i8259", sizeof(PicState2), i8259_initfn);
+}
+device_init(i8259_register);
+
+qemu_irq *i8259_init(qemu_irq parent_irq)
+{
+    DeviceState *dev;
+
+    dev = qdev_create(NULL, "i8259");
+    qdev_init(dev);
+
+    isa_pic = FROM_SYSBUS(PicState2, sysbus_from_qdev(dev));
+    qdev_connect_gpio_out(dev, 0, parent_irq);
+    return dev->gpio_in;
 }
 
 void pic_set_alt_irq_func(PicState2 *s, SetIRQFunc *alt_irq_func,
-- 
1.6.2.2