qdev: replace bus_type enum with bus_info struct.

BusInfo is filled with name and size (pretty much like I did for
DeviceInfo as well).  There is also a function pointer to print
bus-specific device information to the monitor.  sysbus is hooked
up there, I've also added a print function for PCI.

Device creation is slightly modified as well:  The device type search
loop now also checks the bus type while scanning the list instead of
complaining thereafter in case of a mismatch.  This effectively gives
each bus a private namespace for device names.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Paul Brook <paul@codesourcery.com>
This commit is contained in:
Gerd Hoffmann 2009-06-30 14:12:08 +02:00 committed by Paul Brook
parent 0aab0d3a4a
commit 10c4c98ab7
6 changed files with 103 additions and 62 deletions

View file

@ -13,6 +13,11 @@ struct SSIBus {
BusState qbus;
};
static struct BusInfo ssi_bus_info = {
.name = "SSI",
.size = sizeof(SSIBus),
};
static void ssi_slave_init(DeviceState *dev, DeviceInfo *base_info)
{
SSISlaveInfo *info = container_of(base_info, SSISlaveInfo, qdev);
@ -33,7 +38,7 @@ void ssi_register_slave(SSISlaveInfo *info)
{
assert(info->qdev.size >= sizeof(SSISlave));
info->qdev.init = ssi_slave_init;
info->qdev.bus_type = BUS_TYPE_SSI;
info->qdev.bus_info = &ssi_bus_info;
qdev_register(&info->qdev);
}
@ -48,7 +53,7 @@ DeviceState *ssi_create_slave(SSIBus *bus, const char *name)
SSIBus *ssi_create_bus(DeviceState *parent, const char *name)
{
BusState *bus;
bus = qbus_create(BUS_TYPE_SSI, sizeof(SSIBus), parent, name);
bus = qbus_create(&ssi_bus_info, parent, name);
return FROM_QBUS(SSIBus, bus);
}