aboutsummaryrefslogtreecommitdiff
path: root/hw/qdev.h
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2011-01-10 10:32:01 -0600
committerAnthony Liguori <aliguori@us.ibm.com>2011-01-10 10:32:01 -0600
commita7bd621d7a270645fb98426c82a0b251fdbc6000 (patch)
treeea7baf4b742064e092985f5c15d6579fbc6db20f /hw/qdev.h
parent8aaf42ed0f203da63860b0a3ab3ff2bdfe9b4cb0 (diff)
parenta6a7005d14b3c32d4864a718fb1cb19c789f58a5 (diff)
downloadqemu-a7bd621d7a270645fb98426c82a0b251fdbc6000.zip
qemu-a7bd621d7a270645fb98426c82a0b251fdbc6000.tar.gz
qemu-a7bd621d7a270645fb98426c82a0b251fdbc6000.tar.bz2
Merge remote branch 'mst/for_anthony' into staging
Diffstat (limited to 'hw/qdev.h')
-rw-r--r--hw/qdev.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/hw/qdev.h b/hw/qdev.h
index aaaf55a..2be775f 100644
--- a/hw/qdev.h
+++ b/hw/qdev.h
@@ -183,6 +183,8 @@ BusState *qdev_get_parent_bus(DeviceState *dev);
/*** BUS API. ***/
+DeviceState *qdev_find_recursive(BusState *bus, const char *id);
+
/* Returns 0 to walk children, > 0 to skip walk, < 0 to terminate walk. */
typedef int (qbus_walkerfn)(BusState *bus, void *opaque);
typedef int (qdev_walkerfn)(DeviceState *dev, void *opaque);
@@ -198,7 +200,8 @@ int qbus_walk_children(BusState *bus, qdev_walkerfn *devfn,
int qdev_walk_children(DeviceState *dev, qdev_walkerfn *devfn,
qbus_walkerfn *busfn, void *opaque);
void qdev_reset_all(DeviceState *dev);
-void qbus_reset_all(BusState *bus);
+void qbus_reset_all_fn(void *opaque);
+
void qbus_free(BusState *bus);
#define FROM_QBUS(type, dev) DO_UPCAST(type, qbus, dev)