Add common BusState

Implement and use a common device bus state.  The main side-effect is
that creating a bus and attaching it to a parent device are no longer
separate operations.  For legacy code we allow a NULL parent, but that
should go away eventually.

Also tweak creation code to veriry theat a device in on the right bus.

Signed-off-by: Paul Brook <paul@codesourcery.com>

1 files changed, 24 insertions, 11 deletions

diff --git a/hw/ssi.c b/hw/ssi.c
index 9dfdbe94f8..52b7b7c593 100644
--- a/hw/ssi.c
+++ b/hw/ssi.c
@@ -10,16 +10,21 @@
 #include "ssi.h"
 
 struct SSIBus {
-    SSISlave *slave;
+    BusState qbus;
 };
 
-static void ssi_slave_init(DeviceState *dev, void *opaque)
+static void ssi_slave_init(DeviceState *dev, DeviceInfo *base_info)
 {
-    SSISlaveInfo *info = opaque;
+    SSISlaveInfo *info = container_of(base_info, SSISlaveInfo, qdev);
     SSISlave *s = SSI_SLAVE_FROM_QDEV(dev);
-    SSIBus *bus = qdev_get_bus(dev);
+    SSIBus *bus;
+
+    bus = FROM_QBUS(SSIBus, qdev_get_parent_bus(dev));
+    if (LIST_FIRST(&bus->qbus.children) != dev
+        || LIST_NEXT(dev, sibling) != NULL) {
+        hw_error("Too many devices on SSI bus");
+    }
 
-    bus->slave = s;
     s->info = info;
     info->init(s);
 }
@@ -27,26 +32,34 @@ static void ssi_slave_init(DeviceState *dev, void *opaque)
 void ssi_register_slave(const char *name, int size, SSISlaveInfo *info)
 {
     assert(size >= sizeof(SSISlave));
-    qdev_register(name, size, ssi_slave_init, info);
+    info->qdev.init = ssi_slave_init;
+    info->qdev.bus_type = BUS_TYPE_SSI;
+    qdev_register(name, size, &info->qdev);
 }
 
 DeviceState *ssi_create_slave(SSIBus *bus, const char *name)
 {
     DeviceState *dev;
-    dev = qdev_create(bus, name);
+    dev = qdev_create(&bus->qbus, name);
     qdev_init(dev);
     return dev;
 }
 
-SSIBus *ssi_create_bus(void)
+SSIBus *ssi_create_bus(DeviceState *parent, const char *name)
 {
-    return qemu_mallocz(sizeof(SSIBus));
+    BusState *bus;
+    bus = qbus_create(BUS_TYPE_SSI, sizeof(SSIBus), parent, name);
+    return FROM_QBUS(SSIBus, bus);
 }
 
 uint32_t ssi_transfer(SSIBus *bus, uint32_t val)
 {
-    if (!bus->slave) {
+    DeviceState *dev;
+    SSISlave *slave;
+    dev = LIST_FIRST(&bus->qbus.children);
+    if (!dev) {
         return 0;
     }
-    return bus->slave->info->transfer(bus->slave, val);
+    slave = SSI_SLAVE_FROM_QDEV(dev);
+    return slave->info->transfer(slave, val);
 }