From patchwork Fri Aug 24 09:49:15 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pingfan liu X-Patchwork-Id: 179804 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 160BC2C0143 for ; Fri, 24 Aug 2012 19:50:53 +1000 (EST) Received: from localhost ([::1]:36489 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T4qXT-0002oX-3C for incoming@patchwork.ozlabs.org; Fri, 24 Aug 2012 05:50:51 -0400 Received: from eggs.gnu.org ([208.118.235.92]:41021) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T4qXH-0002o1-0D for qemu-devel@nongnu.org; Fri, 24 Aug 2012 05:50:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T4qXF-0002yn-UN for qemu-devel@nongnu.org; Fri, 24 Aug 2012 05:50:38 -0400 Received: from mail-iy0-f173.google.com ([209.85.210.173]:57958) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T4qXF-0002yh-Ph for qemu-devel@nongnu.org; Fri, 24 Aug 2012 05:50:37 -0400 Received: by iakx26 with SMTP id x26so2919551iak.4 for ; Fri, 24 Aug 2012 02:50:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=duti3DpPYLZCP1W/98EAGhS2fFEqHPOAm/AuZUEyotk=; b=nCmvuFDvt3lrwwGtd46cxz855bBHsLY9JE/chFjas++MCnvZirHW/aTlcZDtdsoupL w2HHjTCwZT4Z6Fi+lozx3o2ZTT1AIx6a2bK0co9zKQQTrfJ5OCvObIp+FFmrdJd/tr47 9rqLaVQGbG47J6tCss/MDa6wQkaW2XceO0xQWMXjTK2ctbTbZGD2324y1+Cfb6AJPvtp eVGBoKdY7ZSVI2435MzxF8ZqcFuVEmVKn/ZpYH7CS/MyW03GDvyY7N7DjGkKu930GtFz x6xHGJb3H8i4TLX72rLLesgODEGycdIEMXFPeR8amT+k+kRh7XJ0JLRr6kpafIXiT+zK HGmg== Received: by 10.50.170.68 with SMTP id ak4mr1431811igc.74.1345801837239; Fri, 24 Aug 2012 02:50:37 -0700 (PDT) Received: from localhost ([202.108.130.138]) by mx.google.com with ESMTPS id ce10sm180206igb.1.2012.08.24.02.50.35 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 24 Aug 2012 02:50:36 -0700 (PDT) From: Liu Ping Fan To: qemu-devel@nongnu.org Date: Fri, 24 Aug 2012 17:49:15 +0800 Message-Id: <1345801763-24227-3-git-send-email-qemulist@gmail.com> X-Mailer: git-send-email 1.7.4.4 In-Reply-To: <1345801763-24227-1-git-send-email-qemulist@gmail.com> References: <1345801763-24227-1-git-send-email-qemulist@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.210.173 Cc: Paolo Bonzini , Liu Ping Fan , Avi Kivity , Anthony Liguori Subject: [Qemu-devel] [PATCH 02/10] qdev: change iterator callback seq 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 From: Liu Ping Fan Some func should be called after iteration over object's children, for example, func will put ref of object. Signed-off-by: Liu Ping Fan --- hw/qdev.c | 30 ++++++++++++++++++++++-------- hw/qdev.h | 4 ++-- 2 files changed, 24 insertions(+), 10 deletions(-) diff --git a/hw/qdev.c b/hw/qdev.c index b5b74b9..ad618dd 100644 --- a/hw/qdev.c +++ b/hw/qdev.c @@ -230,13 +230,13 @@ 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, 0); } void qbus_reset_all_fn(void *opaque) { BusState *bus = opaque; - qbus_walk_children(bus, qdev_reset_one, qbus_reset_one, NULL); + qbus_walk_children(bus, qdev_reset_one, qbus_reset_one, NULL, 0); } /* can be used as ->unplug() callback for the simple cases */ @@ -342,12 +342,12 @@ BusState *qdev_get_child_bus(DeviceState *dev, const char *name) } int qbus_walk_children(BusState *bus, qdev_walkerfn *devfn, - qbus_walkerfn *busfn, void *opaque) + qbus_walkerfn *busfn, void *opaque, int after) { BusChild *kid; int err; - if (busfn) { + if ((after == 0) && busfn) { err = busfn(bus, opaque); if (err) { return err; @@ -355,22 +355,29 @@ int qbus_walk_children(BusState *bus, qdev_walkerfn *devfn, } QTAILQ_FOREACH(kid, &bus->children, sibling) { - err = qdev_walk_children(kid->child, devfn, busfn, opaque); + err = qdev_walk_children(kid->child, devfn, busfn, opaque, after); if (err < 0) { return err; } } + if ((after != 0) && busfn) { + err = busfn(bus, opaque); + if (err) { + return err; + } + } + return 0; } int qdev_walk_children(DeviceState *dev, qdev_walkerfn *devfn, - qbus_walkerfn *busfn, void *opaque) + qbus_walkerfn *busfn, void *opaque, int after) { BusState *bus; int err; - if (devfn) { + if ((after == 0) && devfn) { err = devfn(dev, opaque); if (err) { return err; @@ -378,12 +385,19 @@ int qdev_walk_children(DeviceState *dev, qdev_walkerfn *devfn, } QLIST_FOREACH(bus, &dev->child_bus, sibling) { - err = qbus_walk_children(bus, devfn, busfn, opaque); + err = qbus_walk_children(bus, devfn, busfn, opaque, after); if (err < 0) { return err; } } + if ((after != 0) && devfn) { + err = devfn(dev, opaque); + if (err) { + return err; + } + } + return 0; } diff --git a/hw/qdev.h b/hw/qdev.h index d699194..9fc8b46 100644 --- a/hw/qdev.h +++ b/hw/qdev.h @@ -195,9 +195,9 @@ BusState *qbus_create(const char *typename, DeviceState *parent, const char *nam * < 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); + qbus_walkerfn *busfn, void *opaque, int after); int qdev_walk_children(DeviceState *dev, qdev_walkerfn *devfn, - qbus_walkerfn *busfn, void *opaque); + qbus_walkerfn *busfn, void *opaque, int after); void qdev_reset_all(DeviceState *dev); void qbus_reset_all_fn(void *opaque);