aboutsummaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2012-11-29 07:46:23 -0600
committerAnthony Liguori <aliguori@us.ibm.com>2012-11-29 09:11:03 -0600
commite912c96f7d2e5ccd8a6352ee74f5beee2a7d9976 (patch)
tree32bccac0a6fe9d817d8890bf73eeb700da9956b8 /hw
parente9bff10f8db94912b1b0e6e2e3394cae02faf614 (diff)
downloadqemu-e912c96f7d2e5ccd8a6352ee74f5beee2a7d9976.zip
qemu-e912c96f7d2e5ccd8a6352ee74f5beee2a7d9976.tar.gz
qemu-e912c96f7d2e5ccd8a6352ee74f5beee2a7d9976.tar.bz2
qdev: relax bus type check in qdev_device_add() (v2)
We are currently checking for an exact type match. Use QOM dynamic_cast to check for a compatible type instead. Cc: Konrad Frederic <fred.konrad@greensocs.com> Cc: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> --- v1 -> v2: - also add cast to qbus_find_recursive (Peter) - simplify by doing object_dynamic_cast instead of messing with classes
Diffstat (limited to 'hw')
-rw-r--r--hw/qdev-monitor.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/hw/qdev-monitor.c b/hw/qdev-monitor.c
index 479eecd..a1b4d6a 100644
--- a/hw/qdev-monitor.c
+++ b/hw/qdev-monitor.c
@@ -289,8 +289,7 @@ static BusState *qbus_find_recursive(BusState *bus, const char *name,
if (name && (strcmp(bus->name, name) != 0)) {
match = 0;
}
- if (bus_typename &&
- (strcmp(object_get_typename(OBJECT(bus)), bus_typename) != 0)) {
+ if (bus_typename && !object_dynamic_cast(OBJECT(bus), bus_typename)) {
match = 0;
}
if (match) {
@@ -435,7 +434,7 @@ DeviceState *qdev_device_add(QemuOpts *opts)
if (!bus) {
return NULL;
}
- if (strcmp(object_get_typename(OBJECT(bus)), k->bus_type) != 0) {
+ if (!object_dynamic_cast(OBJECT(bus), k->bus_type)) {
qerror_report(QERR_BAD_BUS_FOR_DEVICE,
driver, object_get_typename(OBJECT(bus)));
return NULL;