From 10c4c98ab7dc18169b37b76f6ea5e60ebe65222b Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Tue, 30 Jun 2009 14:12:08 +0200 Subject: 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 Signed-off-by: Paul Brook --- hw/ssi.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'hw/ssi.c') diff --git a/hw/ssi.c b/hw/ssi.c index b0bcf97..a5133be 100644 --- a/hw/ssi.c +++ b/hw/ssi.c @@ -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); } -- cgit v1.1