@@ -289,7 +289,7 @@ static DeviceState *qbus_find_dev(BusState *bus, char *elem)
}
static BusState *qbus_find_recursive(BusState *bus, const char *name,
- const char *type)
+ const char *type, Error **errp)
{
BusChild *kid;
@@ -317,7 +317,7 @@ static BusState *qbus_find_recursive(BusState *bus, const char *name,
QLIST_FOREACH(child, &dev->child_bus, sibling) {
BusState *ret;
- ret = qbus_find_recursive(child, name, type);
+ ret = qbus_find_recursive(child, name, type, NULL);
if (ret) {
return ret;
}
@@ -342,7 +342,7 @@ static BusState *qbus_find(const char *path)
assert(!path[0]);
elem[0] = len = 0;
}
- bus = qbus_find_recursive(sysbus_get_default(), elem, NULL);
+ bus = qbus_find_recursive(sysbus_get_default(), elem, NULL, NULL);
if (!bus) {
qerror_report(QERR_BUS_NOT_FOUND, elem);
return NULL;
@@ -459,7 +459,8 @@ DeviceState *qdev_device_add(QemuOpts *opts)
return NULL;
}
} else {
- bus = qbus_find_recursive(sysbus_get_default(), NULL, k->bus_type);
+ bus = qbus_find_recursive(sysbus_get_default(), NULL, k->bus_type,
+ NULL);
if (!bus) {
qerror_report(QERR_NO_BUS_FOR_DEVICE,
k->bus_type, driver);
Signed-off-by: Laszlo Ersek <lersek@redhat.com> --- hw/qdev-monitor.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-)