From patchwork Mon Dec 17 16:24:44 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 206924 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id DE6C22C007B for ; Tue, 18 Dec 2012 04:02:29 +1100 (EST) Received: from localhost ([::1]:46959 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TkdVq-00019y-9t for incoming@patchwork.ozlabs.org; Mon, 17 Dec 2012 11:25:54 -0500 Received: from eggs.gnu.org ([208.118.235.92]:52836) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TkdVW-0000js-V7 for qemu-devel@nongnu.org; Mon, 17 Dec 2012 11:25:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TkdVV-0008Jz-Nn for qemu-devel@nongnu.org; Mon, 17 Dec 2012 11:25:34 -0500 Received: from mail-ie0-f173.google.com ([209.85.223.173]:36831) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TkdVV-0008Ju-IB for qemu-devel@nongnu.org; Mon, 17 Dec 2012 11:25:33 -0500 Received: by mail-ie0-f173.google.com with SMTP id e13so9604109iej.4 for ; Mon, 17 Dec 2012 08:25:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=PDgDLCcnDNia6JiHOVrdRTZ0L2eTQn5dEWU0XI2l0K4=; b=PN8uCJzbV/8aFascoD3iUyufNM7FpUzBTSAU8IwLDkPECmd79ARDMXzCcLJlC+xtub 1RUuYteyep/lvenKHclEhlaBif9cT6SBpjxbQC5OckT0eRpp49B7Nq0U2xRDTZ5B6fUz /UbydnB/aujZdlqtO71ZdzQCpLY57BSFgWg23l2Mu4PZv0WsGmzJg3E/VxrCY6BGZKrg 5Yqj87aKcz29lTy3GwkM1sVgJtsootXfqeYOldqW4ce0FSYLWEB53rKMzc+fmv4dKno6 S5SmukVoaePagIL6IG33lUKzcmeZUfvJvcV75raFCpVFMFa1/nFKDCvkNClYS+O2B+j+ WTmw== Received: by 10.50.33.138 with SMTP id r10mr9731552igi.6.1355761533007; Mon, 17 Dec 2012 08:25:33 -0800 (PST) Received: from yakj.usersys.redhat.com (93-34-219-150.ip51.fastwebnet.it. [93.34.219.150]) by mx.google.com with ESMTPS id bh3sm5950327igc.0.2012.12.17.08.25.28 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 17 Dec 2012 08:25:31 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 17 Dec 2012 17:24:44 +0100 Message-Id: <1355761490-10073-10-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.0.2 In-Reply-To: <1355761490-10073-1-git-send-email-pbonzini@redhat.com> References: <1355761490-10073-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 209.85.223.173 Cc: aliguori@us.ibm.com, mst@redhat.com Subject: [Qemu-devel] [PATCH 09/15] qdev: allow both pre- and post-order vists in qdev walking functions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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/qdev-core.h | 13 +++++++++---- hw/qdev.c | 45 +++++++++++++++++++++++++++++++++------------ 2 files changed, 42 insertions(+), 16 deletions(-) diff --git a/hw/qdev-core.h b/hw/qdev-core.h index f8bf9dd..7c2598e 100644 --- a/hw/qdev-core.h +++ b/hw/qdev-core.h @@ -177,10 +177,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); /** diff --git a/hw/qdev.c b/hw/qdev.c index 87ffad8..457f7bf 100644 --- a/hw/qdev.c +++ b/hw/qdev.c @@ -227,12 +227,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) @@ -342,49 +342,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) { 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; }