From patchwork Wed Aug 20 06:56:26 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Crosthwaite X-Patchwork-Id: 381559 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 9F19D14013B for ; Wed, 20 Aug 2014 16:57:37 +1000 (EST) Received: from localhost ([::1]:54278 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XJzpv-0006dg-TI for incoming@patchwork.ozlabs.org; Wed, 20 Aug 2014 02:57:35 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38639) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XJzpR-0005yA-4q for qemu-devel@nongnu.org; Wed, 20 Aug 2014 02:57:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XJzpK-0004IO-TT for qemu-devel@nongnu.org; Wed, 20 Aug 2014 02:57:05 -0400 Received: from mail-yk0-f182.google.com ([209.85.160.182]:61296) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XJzpK-0004IG-Q2 for qemu-devel@nongnu.org; Wed, 20 Aug 2014 02:56:58 -0400 Received: by mail-yk0-f182.google.com with SMTP id q9so6232421ykb.41 for ; Tue, 19 Aug 2014 23:56:58 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=GU8SyBMaJyFLeHBWBB53fLB0ojnb/fCdekcFrTS6xTU=; b=jCEgR2hSLcanoZHs5uDQcQbTPQ+5Juwmm/FtDc6RJe6tK7UpSAORDrHSLAOlx4IQ3g SuKclKhEkrgBXGplzvOO3tviNJmLZQ7RQOIYJRGoSJTHLmtU0/G75lhtMIzAOFhfX18n dzLVX0DkAHEu1QCOQvTu5+tfKu9x1ptj86nuWTKO/IFIywbxiKc8baNpjXxXw+8pltWA Lgq8Cbczs8K7fkMbL1/N97z9JgX2Ob9SLcQ2AsB+Qn2AF5R0ACVtPFTcndoyTKy1FyX0 36KrBAm+l8ni7w3eYRfll5pUIdGM+Ui5UIVHelD1SZtIhMoFgD7pVSvbe/UTsGBA42tE 3KcQ== X-Gm-Message-State: ALoCoQldwn7Z5bkPj/4tdqodQkXDZldtHUsNC2LfYt/6RueHIZVsrW60qESyPFW67FHBrgN2GRoI X-Received: by 10.236.35.103 with SMTP id t67mr67187907yha.7.1408517818422; Tue, 19 Aug 2014 23:56:58 -0700 (PDT) Received: from localhost ([149.199.62.254]) by mx.google.com with ESMTPSA id m8sm12044935yhm.15.2014.08.19.23.56.57 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 19 Aug 2014 23:56:57 -0700 (PDT) From: Peter Crosthwaite To: qemu-devel@nongnu.org Date: Tue, 19 Aug 2014 23:56:26 -0700 Message-Id: <25f61368c0607b4a16db58b101e164a6651ee6e2.1408517666.git.peter.crosthwaite@xilinx.com> X-Mailer: git-send-email 2.0.1.1.gfbfc394 In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.160.182 Cc: pbonzini@redhat.com, afaerber@suse.de Subject: [Qemu-devel] [PATCH qom v4 2/2] memory: remove object_property_add_child_array 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 Obsoleted by automatic object_property_add arrayification. Reviewed-by: Paolo Bonzini Signed-off-by: Peter Crosthwaite --- memory.c | 30 +++++------------------------- 1 file changed, 5 insertions(+), 25 deletions(-) diff --git a/memory.c b/memory.c index d0966c0..4053c4b 100644 --- a/memory.c +++ b/memory.c @@ -876,30 +876,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, @@ -916,8 +892,12 @@ void memory_region_init(MemoryRegion *mr, } 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); } }