vga: change tabs to spaces

[qemu] / hw / isa-bus.c

diff --git a/hw/isa-bus.c b/hw/isa-bus.c
index ebcc081..2843b51 100644 (file)
--- a/hw/isa-bus.c
+++ b/hw/isa-bus.c
@@ -104,14 +104,15 @@ void isa_init_irq(ISADevice *dev, qemu_irq *p)
     dev->nirqs++;
 }
 
-static void isa_qdev_init(DeviceState *qdev, DeviceInfo *base)
+static int isa_qdev_init(DeviceState *qdev, DeviceInfo *base)
 {
     ISADevice *dev = DO_UPCAST(ISADevice, qdev, qdev);
     ISADeviceInfo *info = DO_UPCAST(ISADeviceInfo, qdev, base);
 
     dev->isairq[0] = -1;
     dev->isairq[1] = -1;
-    info->init(dev);
+
+    return info->init(dev);
 }
 
 void isa_qdev_register(ISADeviceInfo *info)
@@ -136,10 +137,12 @@ ISADevice *isa_create_simple(const char *name, uint32_t iobase, uint32_t iobase2
     isa->iobase[0] = iobase;
     isa->iobase[1] = iobase2;
     qdev_init(dev);
-    if (-1 != irq)
+    if (irq != -1) {
         isa_connect_irq(isa, 0, irq);
-    if (-1 != irq2)
+    }
+    if (irq2 != -1) {
         isa_connect_irq(isa, 1, irq2);
+    }
     return isa;
 }
 
@@ -156,9 +159,10 @@ static void isabus_dev_print(Monitor *mon, DeviceState *dev, int indent)
     }
 }
 
-static void isabus_bridge_init(SysBusDevice *dev)
+static int isabus_bridge_init(SysBusDevice *dev)
 {
     /* nothing */
+    return 0;
 }
 
 static SysBusDeviceInfo isabus_bridge_info = {