spice: fix initialization order

[qemu.git] / hw / realview_gic.c

diff --git a/hw/realview_gic.c b/hw/realview_gic.c
index 479f939553a27ba2c3e9d24b975296ae6f726f7f..5bc37a7120b1c6c944e1ee3729acc1d832b57467 100644 (file)
--- a/hw/realview_gic.c
+++ b/hw/realview_gic.c
@@ -9,67 +9,66 @@
 
 #include "sysbus.h"
 
 
 #include "sysbus.h"
 

-#define GIC_NIRQ 96
-#define NCPU 1
-
-/* Only a single "CPU" interface is present.  */
-static inline int
-gic_get_current_cpu(void)
-{
-  return 0;
-}
-
-#include "arm_gic.c"
-

 typedef struct {
 typedef struct {

-    gic_state gic;
-    MemoryRegion iomem;
+    SysBusDevice busdev;
+    DeviceState *gic;

     MemoryRegion container;
 } RealViewGICState;
 
     MemoryRegion container;
 } RealViewGICState;
 

-static uint64_t realview_gic_cpu_read(void *opaque, target_phys_addr_t offset,
-                                      unsigned size)
+static void realview_gic_set_irq(void *opaque, int irq, int level)

 {
 {

-    gic_state *s = (gic_state *)opaque;
-    return gic_cpu_read(s, gic_get_current_cpu(), offset);
+    RealViewGICState *s = (RealViewGICState *)opaque;
+    qemu_set_irq(qdev_get_gpio_in(s->gic, irq), level);

 }
 
 }
 

-static void realview_gic_cpu_write(void *opaque, target_phys_addr_t offset,
-                                   uint64_t value, unsigned size)
+static int realview_gic_init(SysBusDevice *dev)

 {
 {

-    gic_state *s = (gic_state *)opaque;
-    gic_cpu_write(s, gic_get_current_cpu(), offset, value);
-}
+    RealViewGICState *s = FROM_SYSBUS(RealViewGICState, dev);
+    SysBusDevice *busdev;
+    /* The GICs on the RealView boards have a fixed nonconfigurable
+     * number of interrupt lines, so we don't need to expose this as
+     * a qdev property.
+     */
+    int numirq = 96;

 
 

-static const MemoryRegionOps realview_gic_cpu_ops = {
-    .read = realview_gic_cpu_read,
-    .write = realview_gic_cpu_write,
-    .endianness = DEVICE_NATIVE_ENDIAN,
-};
+    s->gic = qdev_create(NULL, "arm_gic");
+    qdev_prop_set_uint32(s->gic, "num-cpu", 1);
+    qdev_prop_set_uint32(s->gic, "num-irq", numirq);
+    qdev_init_nofail(s->gic);
+    busdev = sysbus_from_qdev(s->gic);
+
+    /* Pass through outbound IRQ lines from the GIC */
+    sysbus_pass_irq(dev, busdev);
+
+    /* Pass through inbound GPIO lines to the GIC */
+    qdev_init_gpio_in(&s->busdev.qdev, realview_gic_set_irq, numirq - 32);

 
 

-static void realview_gic_map_setup(RealViewGICState *s)
-{

     memory_region_init(&s->container, "realview-gic-container", 0x2000);
     memory_region_init(&s->container, "realview-gic-container", 0x2000);

-    memory_region_init_io(&s->iomem, &realview_gic_cpu_ops, &s->gic,
-                          "realview-gic", 0x1000);
-    memory_region_add_subregion(&s->container, 0, &s->iomem);
-    memory_region_add_subregion(&s->container, 0x1000, &s->gic.iomem);
+    memory_region_add_subregion(&s->container, 0,
+                                sysbus_mmio_get_region(busdev, 1));
+    memory_region_add_subregion(&s->container, 0x1000,
+                                sysbus_mmio_get_region(busdev, 0));
+    sysbus_init_mmio(dev, &s->container);
+    return 0;

 }
 
 }
 

-static int realview_gic_init(SysBusDevice *dev)
+static void realview_gic_class_init(ObjectClass *klass, void *data)

 {
 {

-    RealViewGICState *s = FROM_SYSBUSGIC(RealViewGICState, dev);
+    SysBusDeviceClass *sdc = SYS_BUS_DEVICE_CLASS(klass);

 
 

-    gic_init(&s->gic);
-    realview_gic_map_setup(s);
-    sysbus_init_mmio(dev, &s->container);
-    return 0;
+    sdc->init = realview_gic_init;

 }
 
 }
 

-static void realview_gic_register_devices(void)
+static TypeInfo realview_gic_info = {
+    .name          = "realview_gic",
+    .parent        = TYPE_SYS_BUS_DEVICE,
+    .instance_size = sizeof(RealViewGICState),
+    .class_init    = realview_gic_class_init,
+};
+
+static void realview_gic_register_types(void)

 {
 {

-    sysbus_register_dev("realview_gic", sizeof(RealViewGICState),
-                        realview_gic_init);
+    type_register_static(&realview_gic_info);

 }
 
 }
 

-device_init(realview_gic_register_devices)
+type_init(realview_gic_register_types)