From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47553) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VpxTu-0006Vv-V0 for qemu-devel@nongnu.org; Mon, 09 Dec 2013 04:50:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VpxTo-0001KC-Qx for qemu-devel@nongnu.org; Mon, 09 Dec 2013 04:50:26 -0500 Received: from mx1.redhat.com ([209.132.183.28]:58793) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VpxTo-0001K6-Hs for qemu-devel@nongnu.org; Mon, 09 Dec 2013 04:50:20 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id rB99oHwH026375 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 9 Dec 2013 04:50:19 -0500 Message-ID: <52A59256.6030105@redhat.com> Date: Mon, 09 Dec 2013 10:50:14 +0100 From: Paolo Bonzini MIME-Version: 1.0 References: <1386348867-25038-1-git-send-email-pbonzini@redhat.com> <1386348867-25038-4-git-send-email-pbonzini@redhat.com> In-Reply-To: Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 3/4] qdev: allow both pre- and post-order vists in qdev walking functions List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Bandan Das Cc: qemu-devel@nongnu.org, mst@redhat.com Il 07/12/2013 00:27, Bandan Das ha scritto: > Paolo Bonzini writes: > >> 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 >> --- >> hw/core/qdev.c | 45 +++++++++++++++++++++++++++++++++------------ >> include/hw/qdev-core.h | 13 +++++++++---- >> 2 files changed, 42 insertions(+), 16 deletions(-) >> >> diff --git a/hw/core/qdev.c b/hw/core/qdev.c >> index 758de9f..1c114b7 100644 >> --- a/hw/core/qdev.c >> +++ b/hw/core/qdev.c >> @@ -240,12 +240,12 @@ static int qbus_reset_one(BusState *bus, void *opaque) >> >> 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) >> { >> - 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) >> @@ -343,49 +343,70 @@ BusState *qdev_get_child_bus(DeviceState *dev, const char *name) >> return NULL; >> } >> >> -int qbus_walk_children(BusState *bus, qdev_walkerfn *devfn, >> - qbus_walkerfn *busfn, void *opaque) >> +int qbus_walk_children(BusState *bus, >> + qdev_walkerfn *pre_devfn, qbus_walkerfn *pre_busfn, >> + qdev_walkerfn *post_devfn, qbus_walkerfn *post_busfn, >> + void *opaque) >> { > > It's either pre or post right ? I also thought that the traversal > applies to the whole hierarchy not just buses or devices individually.. > Why not just have a single parameter that says pre or post, not much > difference but atleast one parameter less. This is a generic walk function. For reset you want post-order, but in other cases pre-order may make more sense, for example realize. Paolo > Bandan > >> BusChild *kid; >> int err; >> >> - if (busfn) { >> - err = busfn(bus, opaque); >> + if (pre_busfn) { >> + err = pre_busfn(bus, opaque); >> if (err) { >> return err; >> } >> } >> >> 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) { >> return err; >> } >> } >> >> + if (post_busfn) { >> + err = post_busfn(bus, opaque); >> + if (err) { >> + return err; >> + } >> + } >> + >> return 0; >> } >> >> -int qdev_walk_children(DeviceState *dev, qdev_walkerfn *devfn, >> - qbus_walkerfn *busfn, 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) >> { >> BusState *bus; >> int err; >> >> - if (devfn) { >> - err = devfn(dev, opaque); >> + if (pre_devfn) { >> + err = pre_devfn(dev, opaque); >> if (err) { >> return err; >> } >> } >> >> 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) { >> return err; >> } >> } >> >> + if (post_devfn) { >> + err = post_devfn(dev, opaque); >> + if (err) { >> + return err; >> + } >> + } >> + >> return 0; >> } >> >> diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h >> index d840f06..21ea2c6 100644 >> --- a/include/hw/qdev-core.h >> +++ b/include/hw/qdev-core.h >> @@ -274,10 +274,15 @@ BusState *qbus_create(const char *typename, DeviceState *parent, const char *nam >> /* Returns > 0 if either devfn or busfn skip walk somewhere in cursion, >> * < 0 if either devfn or busfn terminate walk somewhere in cursion, >> * 0 otherwise. */ >> -int qbus_walk_children(BusState *bus, qdev_walkerfn *devfn, >> - qbus_walkerfn *busfn, void *opaque); >> -int qdev_walk_children(DeviceState *dev, qdev_walkerfn *devfn, >> - qbus_walkerfn *busfn, void *opaque); >> +int qbus_walk_children(BusState *bus, >> + qdev_walkerfn *pre_devfn, qbus_walkerfn *pre_busfn, >> + qdev_walkerfn *post_devfn, qbus_walkerfn *post_busfn, >> + 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); >> >> /**