From nobody Tue Feb 10 19:49:02 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1578671453; cv=none; d=zohomail.com; s=zohoarc; b=fzCWMtkrB/9+0JBhp8x2ZvYrmq8BZzMatIY6/q2yS4xMGiKlGKVEGlEZwoK4MoMi8bQGcBDcHXqbS2E+IwhYfkvTkeb2UujeYmU21ZhZgtEHASxPqjfWCdN7M8YiRLB3yAemR/P8UCYfElnXAIEGNrkvf+ckTtSfTEoYas8GqGQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578671453; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ONK3peM5o23dysGCeGaKgCbK3oNvNYjMkTlDgtsX0Xs=; b=DhMs3l+qtchYkuEwZcvQ67mNlRWC1D65+VACMEae68v9+GeOMQcN4gf/qW99eu1iK9/qg6e/4HrRHPo4mOvIMEHrIebLnbJlAGofnIuivDH6cugbGU5x/N9EVM1xEFbb917vlEA/bn/IOLAiUF1fKRW4IvWpyVA84CwWReQBjv4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 157867145303779.06278406738318; Fri, 10 Jan 2020 07:50:53 -0800 (PST) Received: from localhost ([::1]:48296 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipwYl-0006FE-N6 for importer@patchew.org; Fri, 10 Jan 2020 10:50:51 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57796) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipwHz-0008Ud-1u for qemu-devel@nongnu.org; Fri, 10 Jan 2020 10:33:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ipwHw-0001ij-RI for qemu-devel@nongnu.org; Fri, 10 Jan 2020 10:33:30 -0500 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:26549 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ipwHw-0001ga-MM for qemu-devel@nongnu.org; Fri, 10 Jan 2020 10:33:28 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-404-JCQs080AN728TBHds9nVJg-1; Fri, 10 Jan 2020 10:33:24 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 118568C3068 for ; Fri, 10 Jan 2020 15:33:24 +0000 (UTC) Received: from localhost (ovpn-112-59.ams2.redhat.com [10.36.112.59]) by smtp.corp.redhat.com (Postfix) with ESMTP id 265F019C6A; Fri, 10 Jan 2020 15:33:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1578670408; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ONK3peM5o23dysGCeGaKgCbK3oNvNYjMkTlDgtsX0Xs=; b=Os3bWgsZyWb+vLKlVsbBAQOPVnpaWPpBR9KAk0LQYh/rEpoW7BeWkeXJakWWNALaYzlAhe ZEbm1Cg1i5Ipggjrdc7ligKwoOFWbesrKrb7Pro61XbnzCn9AXYaeiM1zi7IisV5N+SDVW rTnvuG4SVqglwOLU99Bhx583mO8O3n0= From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Subject: [PATCH 13/26] object: rename link "child" to "target" Date: Fri, 10 Jan 2020 19:30:26 +0400 Message-Id: <20200110153039.1379601-14-marcandre.lureau@redhat.com> In-Reply-To: <20200110153039.1379601-1-marcandre.lureau@redhat.com> References: <20200110153039.1379601-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-MC-Unique: JCQs080AN728TBHds9nVJg-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.61 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , "Daniel P . Berrange" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Eduardo Habkost , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" A child property is a different kind of property. Let's use "target" for the link target. Signed-off-by: Marc-Andr=C3=A9 Lureau --- include/qom/object.h | 4 ++-- qom/object.c | 24 ++++++++++++------------ 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/include/qom/object.h b/include/qom/object.h index fb133d693f..7e66bc78c9 100644 --- a/include/qom/object.h +++ b/include/qom/object.h @@ -1545,7 +1545,7 @@ void object_property_allow_set_link(const Object *, c= onst char *, * @obj: the object to add a property to * @name: the name of the property * @type: the qobj type of the link - * @child: a pointer to where the link object reference is stored + * @targetp: a pointer to where the link object reference is stored * @check: callback to veto setting or NULL if the property is read-only * @flags: additional options for the link * @errp: if an error occurs, a pointer to an area to store the error @@ -1570,7 +1570,7 @@ void object_property_allow_set_link(const Object *, c= onst char *, * modified. */ void object_property_add_link(Object *obj, const char *name, - const char *type, Object **child, + const char *type, Object **targetp, void (*check)(const Object *obj, const char = *name, Object *val, Error **errp), ObjectPropertyLinkFlags flags, diff --git a/qom/object.c b/qom/object.c index 9df4c14226..47d8be81a6 100644 --- a/qom/object.c +++ b/qom/object.c @@ -1720,7 +1720,7 @@ void object_property_allow_set_link(const Object *obj= , const char *name, } =20 typedef struct { - Object **child; + Object **targetp; void (*check)(const Object *, const char *, Object *, Error **); ObjectPropertyLinkFlags flags; } LinkProperty; @@ -1730,11 +1730,11 @@ static void object_get_link_property(Object *obj, V= isitor *v, Error **errp) { LinkProperty *lprop =3D opaque; - Object **child =3D lprop->child; + Object **targetp =3D lprop->targetp; gchar *path; =20 - if (*child) { - path =3D object_get_canonical_path(*child); + if (*targetp) { + path =3D object_get_canonical_path(*targetp); visit_type_str(v, name, &path, errp); g_free(path); } else { @@ -1789,8 +1789,8 @@ static void object_set_link_property(Object *obj, Vis= itor *v, { Error *local_err =3D NULL; LinkProperty *prop =3D opaque; - Object **child =3D prop->child; - Object *old_target =3D *child; + Object **targetp =3D prop->targetp; + Object *old_target =3D *targetp; Object *new_target =3D NULL; char *path =3D NULL; =20 @@ -1812,7 +1812,7 @@ static void object_set_link_property(Object *obj, Vis= itor *v, return; } =20 - *child =3D new_target; + *targetp =3D new_target; if (prop->flags & OBJ_PROP_LINK_STRONG) { object_ref(new_target); object_unref(old_target); @@ -1823,7 +1823,7 @@ static Object *object_resolve_link_property(Object *p= arent, void *opaque, const { LinkProperty *lprop =3D opaque; =20 - return *lprop->child; + return *lprop->targetp; } =20 static void object_release_link_property(Object *obj, const char *name, @@ -1831,14 +1831,14 @@ static void object_release_link_property(Object *ob= j, const char *name, { LinkProperty *prop =3D opaque; =20 - if ((prop->flags & OBJ_PROP_LINK_STRONG) && *prop->child) { - object_unref(*prop->child); + if ((prop->flags & OBJ_PROP_LINK_STRONG) && *prop->targetp) { + object_unref(*prop->targetp); } g_free(prop); } =20 void object_property_add_link(Object *obj, const char *name, - const char *type, Object **child, + const char *type, Object **targetp, void (*check)(const Object *, const char *, Object *, Error **), ObjectPropertyLinkFlags flags, @@ -1849,7 +1849,7 @@ void object_property_add_link(Object *obj, const char= *name, gchar *full_type; ObjectProperty *op; =20 - prop->child =3D child; + prop->targetp =3D targetp; prop->check =3D check; prop->flags =3D flags; =20 --=20 2.25.0.rc1.20.g2443f3f80d.dirty