qdev: add return value to init() callbacks.

[mirror_qemu.git] / hw / pl110.c

diff --git a/hw/pl110.c b/hw/pl110.c
index 9b5724b1e93b1b5cf7b1ec13eff7bb502d4e0b78..173458a7cdffa0a2040face597c23dc9d131decd 100644 (file)
--- a/hw/pl110.c
+++ b/hw/pl110.c
@@ -352,7 +352,7 @@ static CPUWriteMemoryFunc * const pl110_writefn[] = {
    pl110_write
 };
 
-static void pl110_init(SysBusDevice *dev)
+static int pl110_init(SysBusDevice *dev)
 {
     pl110_state *s = FROM_SYSBUS(pl110_state, dev);
     int iomemtype;
@@ -365,13 +365,14 @@ static void pl110_init(SysBusDevice *dev)
                                  pl110_invalidate_display,
                                  NULL, NULL, s);
     /* ??? Save/restore.  */
+    return 0;
 }
 
-static void pl110_versatile_init(SysBusDevice *dev)
+static int pl110_versatile_init(SysBusDevice *dev)
 {
     pl110_state *s = FROM_SYSBUS(pl110_state, dev);
     s->versatile = 1;
-    pl110_init(dev);
+    return pl110_init(dev);
 }
 
 static void pl110_register_devices(void)