david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qdev: add a maximum device allowed field for the bus.

Browse Source 
Add a max_dev field to BusClass to specify the maximum amount of devices allowed
on the bus (has no effect if max_dev=0)

Signed-off-by: KONRAD Frederic <fred.konrad@greensocs.com>

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
KONRAD Frederic 2013-01-15 00:08:00 +01:00 committed by Anthony Liguori
parent 016c718231
commit 1395af6f76
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/qdev-core.h
View File

@ -145,6 +145,8 @@ struct BusClass {
*/ */
char *(*get_fw_dev_path)(DeviceState *dev); char *(*get_fw_dev_path)(DeviceState *dev);
int (*reset)(BusState *bus); int (*reset)(BusState *bus);
/* maximum devices allowed on the bus, 0: no limit. */
int max_dev;
}; };
typedef struct BusChild { typedef struct BusChild {

12
hw/qdev-monitor.c
View File

@ -283,6 +283,7 @@ static DeviceState *qbus_find_dev(BusState *bus, char *elem)
static BusState *qbus_find_recursive(BusState *bus, const char *name, static BusState *qbus_find_recursive(BusState *bus, const char *name,
const char *bus_typename) const char *bus_typename)
{ {
BusClass *bus_class = BUS_GET_CLASS(bus);
BusChild *kid; BusChild *kid;
BusState *child, *ret; BusState *child, *ret;
int match = 1; int match = 1;
@ -293,6 +294,17 @@ static BusState *qbus_find_recursive(BusState *bus, const char *name,
if (bus_typename && !object_dynamic_cast(OBJECT(bus), bus_typename)) { if (bus_typename && !object_dynamic_cast(OBJECT(bus), bus_typename)) {
match = 0; match = 0;
} }
if ((bus_class->max_dev != 0) && (bus_class->max_dev <= bus->max_index)) {
if (name != NULL) {
/* bus was explicitly specified: return an error. */
qerror_report(ERROR_CLASS_GENERIC_ERROR, "Bus '%s' is full",
bus->name);
return NULL;
} else {
/* bus was not specified: try to find another one. */
match = 0;
}
}
if (match) { if (match) {
return bus; return bus;
} }