qdev: add return value to init() callbacks.

[qemu.git] / hw / pl080.c

diff --git a/hw/pl080.c b/hw/pl080.c
index a6ea8ebf9669bf5d8d1b8f05c37913dd60a2d2b3..2df65fab9483b11549edac59dbac4c9027c763be 100644 (file)
--- a/hw/pl080.c
+++ b/hw/pl080.c
@@ -319,7 +319,7 @@ static CPUWriteMemoryFunc * const pl080_writefn[] = {
    pl080_write
 };
 
-static void pl08x_init(SysBusDevice *dev, int nchannels)
+static int pl08x_init(SysBusDevice *dev, int nchannels)
 {
     int iomemtype;
     pl080_state *s = FROM_SYSBUS(pl080_state, dev);
@@ -330,16 +330,17 @@ static void pl08x_init(SysBusDevice *dev, int nchannels)
     sysbus_init_irq(dev, &s->irq);
     s->nchannels = nchannels;
     /* ??? Save/restore.  */
+    return 0;
 }
 
-static void pl080_init(SysBusDevice *dev)
+static int pl080_init(SysBusDevice *dev)
 {
-    pl08x_init(dev, 8);
+    return pl08x_init(dev, 8);
 }
 
-static void pl081_init(SysBusDevice *dev)
+static int pl081_init(SysBusDevice *dev)
 {
-    pl08x_init(dev, 2);
+    return pl08x_init(dev, 2);
 }
 
 /* The PL080 and PL081 are the same except for the number of channels