hw/arm_gic: Move NCPU definition to arm_gic.c

[qemu.git] / hw / realview_gic.c

diff --git a/hw/realview_gic.c b/hw/realview_gic.c
index 4121502c7be087ebbbeb56612936341078f5789e..d114242f2717a7edd6d5266891004482850e9066 100644 (file)
--- a/hw/realview_gic.c
+++ b/hw/realview_gic.c
@@ -9,8 +9,6 @@
 
 #include "sysbus.h"
 
 
 #include "sysbus.h"
 

-#define NCPU 1
-

 /* Only a single "CPU" interface is present.  */
 static inline int
 gic_get_current_cpu(void)
 /* Only a single "CPU" interface is present.  */
 static inline int
 gic_get_current_cpu(void)


@@ -40,7 +38,7 @@ static int realview_gic_init(SysBusDevice *dev)
      * number of interrupt lines, so we don't need to expose this as
      * a qdev property.
      */
      * number of interrupt lines, so we don't need to expose this as
      * a qdev property.
      */

-    gic_init(&s->gic, 96);
+    gic_init(&s->gic, 1, 96);

     realview_gic_map_setup(s);
     sysbus_init_mmio(dev, &s->container);
     return 0;
     realview_gic_map_setup(s);
     sysbus_init_mmio(dev, &s->container);
     return 0;


@@ -60,9 +58,9 @@ static TypeInfo realview_gic_info = {
     .class_init    = realview_gic_class_init,
 };
 
     .class_init    = realview_gic_class_init,
 };
 

-static void realview_gic_register_devices(void)
+static void realview_gic_register_types(void)

 {
     type_register_static(&realview_gic_info);
 }
 
 {
     type_register_static(&realview_gic_info);
 }
 

-device_init(realview_gic_register_devices)
+type_init(realview_gic_register_types)