ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

qdev: allow both pre- and post-order vists in qdev walking functions 

Resetting should be done in post-order, not pre-order.  However,
qdev_walk_children and qbus_walk_children do not allow this.  Fix
it by adding two extra arguments to the functions.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Paolo Bonzini 2013-12-06 17:54:26 +01:00 committed by Michael S. Tsirkin
parent 9bdbbfc3a0
commit 0293214b8c
2 changed files with 42 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
hw/core/qdev.c
View File

@ -240,12 +240,12 @@ static int qbus_reset_one(BusState *bus, void *opaque)
void qdev_reset_all(DeviceState *dev) void qdev_reset_all(DeviceState *dev)
{ {
qdev_walk_children(dev, qdev_reset_one, qbus_reset_one, NULL); qdev_walk_children(dev, qdev_reset_one, qbus_reset_one, NULL, NULL, NULL);
} }
void qbus_reset_all(BusState *bus) void qbus_reset_all(BusState *bus)
{ {
qbus_walk_children(bus, qdev_reset_one, qbus_reset_one, NULL); qbus_walk_children(bus, qdev_reset_one, qbus_reset_one, NULL, NULL, NULL);
} }
void qbus_reset_all_fn(void *opaque) void qbus_reset_all_fn(void *opaque)
@ -337,49 +337,70 @@ BusState *qdev_get_child_bus(DeviceState *dev, const char *name)
return NULL; return NULL;
} }
int qbus_walk_children(BusState *bus, qdev_walkerfn *devfn, int qbus_walk_children(BusState *bus,
qbus_walkerfn *busfn, void *opaque) qdev_walkerfn *pre_devfn, qbus_walkerfn *pre_busfn,
qdev_walkerfn *post_devfn, qbus_walkerfn *post_busfn,
void *opaque)
{ {
BusChild *kid; BusChild *kid;
int err; int err;
if (busfn) { if (pre_busfn) {
err = busfn(bus, opaque); err = pre_busfn(bus, opaque);
if (err) { if (err) {
return err; return err;
} }
} }
QTAILQ_FOREACH(kid, &bus->children, sibling) { QTAILQ_FOREACH(kid, &bus->children, sibling) {
err = qdev_walk_children(kid->child, devfn, busfn, opaque); err = qdev_walk_children(kid->child,
pre_devfn, pre_busfn,
post_devfn, post_busfn, opaque);
if (err < 0) { if (err < 0) {
return err; return err;
} }
} }
if (post_busfn) {
err = post_busfn(bus, opaque);
if (err) {
return err;
}
}
return 0; return 0;
} }
int qdev_walk_children(DeviceState *dev, qdev_walkerfn *devfn, int qdev_walk_children(DeviceState *dev,
qbus_walkerfn *busfn, void *opaque) qdev_walkerfn *pre_devfn, qbus_walkerfn *pre_busfn,
qdev_walkerfn *post_devfn, qbus_walkerfn *post_busfn,
void *opaque)
{ {
BusState *bus; BusState *bus;
int err; int err;
if (devfn) { if (pre_devfn) {
err = devfn(dev, opaque); err = pre_devfn(dev, opaque);
if (err) { if (err) {
return err; return err;
} }
} }
QLIST_FOREACH(bus, &dev->child_bus, sibling) { QLIST_FOREACH(bus, &dev->child_bus, sibling) {
err = qbus_walk_children(bus, devfn, busfn, opaque); err = qbus_walk_children(bus, pre_devfn, pre_busfn,
post_devfn, post_busfn, opaque);
if (err < 0) { if (err < 0) {
return err; return err;
} }
} }
if (post_devfn) {
err = post_devfn(dev, opaque);
if (err) {
return err;
}
}
return 0; return 0;
} }

13
include/hw/qdev-core.h
View File

@ -253,10 +253,15 @@ BusState *qbus_create(const char *typename, DeviceState *parent, const char *nam
/* Returns > 0 if either devfn or busfn skip walk somewhere in cursion, /* Returns > 0 if either devfn or busfn skip walk somewhere in cursion,
* < 0 if either devfn or busfn terminate walk somewhere in cursion, * < 0 if either devfn or busfn terminate walk somewhere in cursion,
* 0 otherwise. */ * 0 otherwise. */
int qbus_walk_children(BusState *bus, qdev_walkerfn *devfn, int qbus_walk_children(BusState *bus,
qbus_walkerfn *busfn, void *opaque); qdev_walkerfn *pre_devfn, qbus_walkerfn *pre_busfn,
int qdev_walk_children(DeviceState *dev, qdev_walkerfn *devfn, qdev_walkerfn *post_devfn, qbus_walkerfn *post_busfn,
qbus_walkerfn *busfn, void *opaque); void *opaque);
int qdev_walk_children(DeviceState *dev,
qdev_walkerfn *pre_devfn, qbus_walkerfn *pre_busfn,
qdev_walkerfn *post_devfn, qbus_walkerfn *post_busfn,
void *opaque);
void qdev_reset_all(DeviceState *dev); void qdev_reset_all(DeviceState *dev);
/** /**