[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 09/15] qbus_find_recursive(): extend signature wi
From: |
Laszlo Ersek |
Subject: |
[Qemu-devel] [PATCH v2 09/15] qbus_find_recursive(): extend signature with Error |
Date: |
Tue, 5 Feb 2013 21:39:22 +0100 |
Signed-off-by: Laszlo Ersek <address@hidden>
---
hw/qdev-monitor.c | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/hw/qdev-monitor.c b/hw/qdev-monitor.c
index 64359ee..0a0bced 100644
--- a/hw/qdev-monitor.c
+++ b/hw/qdev-monitor.c
@@ -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);
--
1.7.1
- Re: [Qemu-devel] [PATCH v2 05/15] qdev_prop_parse(): change return type to void, (continued)
- [Qemu-devel] [PATCH v2 06/15] set_property(): extend signature with Error, Laszlo Ersek, 2013/02/05
- [Qemu-devel] [PATCH v2 07/15] set_property(): push error handling to callers, Laszlo Ersek, 2013/02/05
- [Qemu-devel] [PATCH v2 12/15] qbus_find(): propagate error handling / consumption to callers, Laszlo Ersek, 2013/02/05
- [Qemu-devel] [PATCH v2 11/15] qbus_find(): extend signature with Error, Laszlo Ersek, 2013/02/05
- [Qemu-devel] [PATCH v2 15/15] qdev_device_add(): beautify "driver not found" error message, Laszlo Ersek, 2013/02/05
- [Qemu-devel] [PATCH v2 09/15] qbus_find_recursive(): extend signature with Error,
Laszlo Ersek <=
- [Qemu-devel] [PATCH v2 08/15] qbus_find_recursive(): reorganize, Laszlo Ersek, 2013/02/05
- [Qemu-devel] [PATCH v2 13/15] qdev_device_add(): extend signature with Error, Laszlo Ersek, 2013/02/05
- [Qemu-devel] [PATCH v2 14/15] qdev_device_add(): push error handling/consumption to callers, Laszlo Ersek, 2013/02/05
- [Qemu-devel] [PATCH v2 10/15] qbus_find_recursive(): push Error and make it terminate a recursive search, Laszlo Ersek, 2013/02/05
- Re: [Qemu-devel] [PATCH v2 00/15] propagate Errors to do_device_add(), Luiz Capitulino, 2013/02/08