From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41933) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X6g43-0005RU-OD for qemu-devel@nongnu.org; Mon, 14 Jul 2014 09:13:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X6g3w-00007a-PB for qemu-devel@nongnu.org; Mon, 14 Jul 2014 09:13:07 -0400 Received: from mail-pd0-f176.google.com ([209.85.192.176]:53648) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X6g3w-00006G-K5 for qemu-devel@nongnu.org; Mon, 14 Jul 2014 09:13:00 -0400 Received: by mail-pd0-f176.google.com with SMTP id y10so843827pdj.7 for ; Mon, 14 Jul 2014 06:12:59 -0700 (PDT) Message-ID: <53C3D744.4020301@ozlabs.ru> Date: Mon, 14 Jul 2014 23:12:36 +1000 From: Alexey Kardashevskiy MIME-Version: 1.0 References: <1405262468-8391-1-git-send-email-aik@ozlabs.ru> <53C3916D.7030809@redhat.com> In-Reply-To: <53C3916D.7030809@redhat.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH] qom: Make object_child_foreach safe for objects removal List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Paolo Bonzini , qemu-devel@nongnu.org Cc: Alexander Graf , =?UTF-8?B?QW5kcmVhcyBGw6RyYmVy?= On 07/14/2014 06:14 PM, Paolo Bonzini wrote: > Il 13/07/2014 16:41, Alexey Kardashevskiy ha scritto: >> Current object_child_foreach() uses QTAILQ_FOREACH() to walk >> through children and that makes children removal from the callback >> impossible. >> >> This makes object_child_foreach() use QTAILQ_FOREACH_SAFE(). >> >> Signed-off-by: Alexey Kardashevskiy >> --- >> >> The problem I am trying to solve is: >> there is a PHB with multiple DMA windows a.k.a. sPAPRTCETable's which are >> QOM children of PHB. One of RTAS functions is "reset" which is supposed to >> remove all windows (now just one) except the default one. >> >> I could call QTAILQ_FOREACH_SAFE in sPAPR PHB code but >> object_property_is_child() >> is static and we probably do not want to make it public. >> >> >> --- >> qom/object.c | 4 ++-- >> 1 file changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/qom/object.c b/qom/object.c >> index 0e8267b..4a814dc 100644 >> --- a/qom/object.c >> +++ b/qom/object.c >> @@ -678,10 +678,10 @@ void object_class_foreach(void (*fn)(ObjectClass >> *klass, void *opaque), >> int object_child_foreach(Object *obj, int (*fn)(Object *child, void >> *opaque), >> void *opaque) >> { >> - ObjectProperty *prop; >> + ObjectProperty *prop, *next; >> int ret = 0; >> >> - QTAILQ_FOREACH(prop, &obj->properties, node) { >> + QTAILQ_FOREACH_SAFE(prop, &obj->properties, node, next) { >> if (object_property_is_child(prop)) { >> ret = fn(prop->opaque, opaque); >> if (ret != 0) { >> > > The patch is certainly okay, do you need it in 2.1? Nope, I will need it for dynamic DMA windows (VFIO, PPC) which are not for 2.1 for sure. -- Alexey