From: Peter Maydell <peter.maydell@linaro.org>
Date: Fri, 15 Mar 2013 14:34:19 +0000 (+0000)
Subject: sysbus: make SysBusDeviceClass::init optional
X-Git-Tag: qemu-xen-4.4.0-rc1~6^2~820
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=4ce5dae;p=qemu-upstream-4.4-testing.git

sysbus: make SysBusDeviceClass::init optional

Make the SysBusDeviceClass::init optional, for devices which
genuinely don't need to do anything here. In particular, simple
devices which can do all their initialization in their
instance_init method don't need either a DeviceClass::realize
or SysBusDeviceClass::init method.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Acked-by: Andreas Färber <afaerber@suse.de>
Reviewed-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Message-id: 1363358063-23973-2-git-send-email-peter.maydell@linaro.org
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---

diff --git a/hw/sysbus.c b/hw/sysbus.c
index 702fc728f..9a1946834 100644
--- a/hw/sysbus.c
+++ b/hw/sysbus.c
@@ -137,6 +137,9 @@ static int sysbus_device_init(DeviceState *dev)
     SysBusDevice *sd = SYS_BUS_DEVICE(dev);
     SysBusDeviceClass *sbc = SYS_BUS_DEVICE_GET_CLASS(sd);
 
+    if (!sbc->init) {
+        return 0;
+    }
     return sbc->init(sd);
 }