From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40444) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XCmoz-0006UZ-Ax for qemu-devel@nongnu.org; Thu, 31 Jul 2014 05:38:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XCmor-0004vu-44 for qemu-devel@nongnu.org; Thu, 31 Jul 2014 05:38:49 -0400 Received: from mail-wg0-x234.google.com ([2a00:1450:400c:c00::234]:43807) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XCmoq-0004vp-T7 for qemu-devel@nongnu.org; Thu, 31 Jul 2014 05:38:41 -0400 Received: by mail-wg0-f52.google.com with SMTP id a1so2442904wgh.11 for ; Thu, 31 Jul 2014 02:38:39 -0700 (PDT) Sender: Paolo Bonzini Message-ID: <53DA0E9A.5060900@redhat.com> Date: Thu, 31 Jul 2014 11:38:34 +0200 From: Paolo Bonzini MIME-Version: 1.0 References: <94678df77e4485703fc990aacc9c01b823d5cbee.1406784296.git.peter.crosthwaite@xilinx.com> In-Reply-To: Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH qom v1 2/2] memory: remove object_property_add_child_array List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Crosthwaite , qemu-devel@nongnu.org Cc: afaerber@suse.de Il 31/07/2014 07:35, Peter Crosthwaite ha scritto: > Obsoleted by automatic object_property_add arrayification. > > Signed-off-by: Peter Crosthwaite > --- > > memory.c | 30 +++++------------------------- > 1 file changed, 5 insertions(+), 25 deletions(-) > > diff --git a/memory.c b/memory.c > index 64d7176..5272bf9 100644 > --- a/memory.c > +++ b/memory.c > @@ -877,30 +877,6 @@ static char *memory_region_escape_name(const char *name) > return escaped; > } > > -static void object_property_add_child_array(Object *owner, > - const char *name, > - Object *child) > -{ > - int i; > - char *base_name = memory_region_escape_name(name); > - > - for (i = 0; ; i++) { > - char *full_name = g_strdup_printf("%s[%d]", base_name, i); > - Error *local_err = NULL; > - > - object_property_add_child(owner, full_name, child, &local_err); > - g_free(full_name); > - if (!local_err) { > - break; > - } > - > - error_free(local_err); > - } > - > - g_free(base_name); > -} > - > - > void memory_region_init(MemoryRegion *mr, > Object *owner, > const char *name, > @@ -918,8 +894,12 @@ void memory_region_init(MemoryRegion *mr, > mr->name = g_strdup(name); > > if (name) { > - object_property_add_child_array(owner, name, OBJECT(mr)); > + char *escaped_name = memory_region_escape_name(name); > + char *name_array = g_strdup_printf("%s[*]", escaped_name); > + object_property_add_child(owner, name_array, OBJECT(mr), &error_abort); > object_unref(OBJECT(mr)); > + g_free(name_array); > + g_free(escaped_name); > } > } > > Reviewed-by: Paolo Bonzini