From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8F40CC2D0DB for ; Thu, 23 Jan 2020 16:09:04 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5C7FB20684 for ; Thu, 23 Jan 2020 16:09:03 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="imRfnAZJ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5C7FB20684 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:60060 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iuf2T-0001rg-V1 for qemu-devel@archiver.kernel.org; Thu, 23 Jan 2020 11:09:02 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52978) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iucuH-0001Cj-NQ for qemu-devel@nongnu.org; Thu, 23 Jan 2020 08:52:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iucuG-0001Cp-8V for qemu-devel@nongnu.org; Thu, 23 Jan 2020 08:52:25 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:49572 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iucuG-0001Cb-4o for qemu-devel@nongnu.org; Thu, 23 Jan 2020 08:52:24 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579787543; 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=DTG8VVGuS/GFxBzkknwG9vv5It3iTI/wRfmZdKp/48U=; b=imRfnAZJlhun9pbnW5yX51uqtopixRk7Rkx2ASfyDKTwifY5KRHbHz8bl7RI8H9agAbL/3 ZHmjFffubp+bo0wpScn39WDOftn6/+OTvKwrBUvgXmFxoY6ysHsuoBROeMbUGZv3ubvtuw zhUTShwPJ837xCTB/8MjsDNkri0D65Q= 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-235-x6rp8K5xM9CDoGJiO99G0w-1; Thu, 23 Jan 2020 08:52:22 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2245D7A479 for ; Thu, 23 Jan 2020 13:52:21 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.112.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1C6A71CB; Thu, 23 Jan 2020 13:52:19 +0000 (UTC) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 42/59] object: rename link "child" to "target" Date: Thu, 23 Jan 2020 14:50:32 +0100 Message-Id: <1579787449-27599-43-git-send-email-pbonzini@redhat.com> In-Reply-To: <1579787449-27599-1-git-send-email-pbonzini@redhat.com> References: <1579787449-27599-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-MC-Unique: x6rp8K5xM9CDoGJiO99G0w-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 207.211.31.120 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: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Marc-Andr=C3=A9 Lureau 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 Message-Id: <20200110153039.1379601-14-marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini --- 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 82cf20f..a163adc 100644 --- a/include/qom/object.h +++ b/include/qom/object.h @@ -1528,7 +1528,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 @@ -1553,7 +1553,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 d7974e9..bb5b739 100644 --- a/qom/object.c +++ b/qom/object.c @@ -1713,7 +1713,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; @@ -1723,11 +1723,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 { @@ -1782,8 +1782,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 @@ -1805,7 +1805,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); @@ -1816,7 +1816,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, @@ -1824,14 +1824,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, @@ -1842,7 +1842,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 1.8.3.1