Sparc64: fix PCI probe problems

[qemu.git] / hw / ssi.c

diff --git a/hw/ssi.c b/hw/ssi.c
index 9dfdbe94f8673c565565b2b038ef6a0d9f1a7ce6..cfe7c072f1a3b1b330af07eb6e48d19a25d86a6d 100644 (file)
--- a/hw/ssi.c
+++ b/hw/ssi.c
@@ -10,43 +10,61 @@
 #include "ssi.h"
 
 struct SSIBus {
-    SSISlave *slave;
+    BusState qbus;
+};
+
+static struct BusInfo ssi_bus_info = {
+    .name = "SSI",
+    .size = sizeof(SSIBus),
 };
 
-static void ssi_slave_init(DeviceState *dev, void *opaque)
+static int 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 (QLIST_FIRST(&bus->qbus.children) != dev
+        || QLIST_NEXT(dev, sibling) != NULL) {
+        hw_error("Too many devices on SSI bus");
+    }
 
-    bus->slave = s;
     s->info = info;
-    info->init(s);
+    return info->init(s);
 }
 
-void ssi_register_slave(const char *name, int size, SSISlaveInfo *info)
+void ssi_register_slave(SSISlaveInfo *info)
 {
-    assert(size >= sizeof(SSISlave));
-    qdev_register(name, size, ssi_slave_init, info);
+    assert(info->qdev.size >= sizeof(SSISlave));
+    info->qdev.init = ssi_slave_init;
+    info->qdev.bus_info = &ssi_bus_info;
+    qdev_register(&info->qdev);
 }
 
 DeviceState *ssi_create_slave(SSIBus *bus, const char *name)
 {
     DeviceState *dev;
-    dev = qdev_create(bus, name);
-    qdev_init(dev);
+    dev = qdev_create(&bus->qbus, name);
+    qdev_init_nofail(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(&ssi_bus_info, parent, name);
+    return FROM_QBUS(SSIBus, bus);
 }
 
 uint32_t ssi_transfer(SSIBus *bus, uint32_t val)
 {
-    if (!bus->slave) {
+    DeviceState *dev;
+    SSISlave *slave;
+    dev = QLIST_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);
 }