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.5 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, 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 37682C432C0 for ; Sun, 1 Dec 2019 11:36:07 +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 0111920725 for ; Sun, 1 Dec 2019 11:36:07 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="XLZaBwiz" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0111920725 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]:50372 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ibNWI-0004ri-00 for qemu-devel@archiver.kernel.org; Sun, 01 Dec 2019 06:36:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:37955) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ibNFR-0002Ub-QK for qemu-devel@nongnu.org; Sun, 01 Dec 2019 06:18:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ibNFP-00019J-L3 for qemu-devel@nongnu.org; Sun, 01 Dec 2019 06:18:41 -0500 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:32141 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 1ibNFJ-0000ze-6d for qemu-devel@nongnu.org; Sun, 01 Dec 2019 06:18:38 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575199099; 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=HJ3s5HRWndCtFZ03zuB2XJy9MPRuZClbTMjM+Cu0Fdw=; b=XLZaBwizYDg3Iu3HyGiDiVTHhKZqaEPTz5S9QrLjEVMD7OBHhaUlo+ZDNiL3LaMywmKW+d F5DfbJQovM6MyAmwFISkg3ZHVLILy0+oz5ZR0G7w15FpC9QILklXVwZQbstASfxdtPkTeF 5dyreEfUMf0K8pEfEDzaNT3UIXzO3tk= 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-48-rsAnvJPqOd2HZ8yy9yEdQQ-1; Sun, 01 Dec 2019 06:18:18 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9D8DC800D4C for ; Sun, 1 Dec 2019 11:18:17 +0000 (UTC) Received: from localhost (unknown [10.36.112.15]) by smtp.corp.redhat.com (Postfix) with ESMTP id B29D910013A7; Sun, 1 Dec 2019 11:18:13 +0000 (UTC) From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Subject: [PATCH 16/26] object: add object_class_property_add_link() Date: Sun, 1 Dec 2019 15:15:21 +0400 Message-Id: <20191201111531.1136947-17-marcandre.lureau@redhat.com> In-Reply-To: <20191201111531.1136947-1-marcandre.lureau@redhat.com> References: <20191201111531.1136947-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-MC-Unique: rsAnvJPqOd2HZ8yy9yEdQQ-1 X-Mimecast-Spam-Score: 0 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] [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: pbonzini@redhat.com, berrange@redhat.com, ehabkost@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Marc-Andr=C3=A9 Lureau --- include/qom/object.h | 9 +++++++++ qom/object.c | 46 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 54 insertions(+), 1 deletion(-) diff --git a/include/qom/object.h b/include/qom/object.h index 9bef5783f1..6cafc5f368 100644 --- a/include/qom/object.h +++ b/include/qom/object.h @@ -1512,6 +1512,7 @@ typedef enum { =20 /* private */ OBJ_PROP_LINK_DIRECT =3D 0x2, + OBJ_PROP_LINK_CLASS =3D 0x4, } ObjectPropertyLinkFlags; =20 /** @@ -1560,6 +1561,14 @@ void object_property_add_link(Object *obj, const cha= r *name, ObjectPropertyLinkFlags flags, Error **errp); =20 +ObjectProperty *object_class_property_add_link(ObjectClass *oc, + const char *name, + const char *type, ptrdiff_t offset, + void (*check)(const Object *obj, const char = *name, + Object *val, Error **errp), + ObjectPropertyLinkFlags flags, + Error **errp); + /** * object_property_add_str: * @obj: the object to add a property to diff --git a/qom/object.c b/qom/object.c index b73fe66dc9..9227dbc08b 100644 --- a/qom/object.c +++ b/qom/object.c @@ -1699,6 +1699,7 @@ typedef struct { union { Object **targetp; Object *target; /* if OBJ_PROP_LINK_DIRECT, when holding the point= er */ + ptrdiff_t offset; /* if OBJ_PROP_LINK_CLASS */ }; void (*check)(const Object *, const char *, Object *, Error **); ObjectPropertyLinkFlags flags; @@ -1709,6 +1710,8 @@ object_link_get_targetp(Object *obj, LinkProperty *lp= rop) { if (lprop->flags & OBJ_PROP_LINK_DIRECT) { return &lprop->target; + } else if (lprop->flags & OBJ_PROP_LINK_CLASS) { + return (void *)obj + lprop->offset; } else { return lprop->targetp; } @@ -1824,7 +1827,9 @@ static void object_release_link_property(Object *obj,= const char *name, if ((prop->flags & OBJ_PROP_LINK_STRONG) && *targetp) { object_unref(*targetp); } - g_free(prop); + if (!(prop->flags & OBJ_PROP_LINK_CLASS)) { + g_free(prop); + } } =20 static void object_add_link_prop(Object *obj, const char *name, @@ -1877,6 +1882,45 @@ void object_property_add_link(Object *obj, const cha= r *name, object_add_link_prop(obj, name, type, targetp, check, flags, errp); } =20 +ObjectProperty * +object_class_property_add_link(ObjectClass *oc, + const char *name, + const char *type, ptrdiff_t offset, + void (*check)(const Object *obj, const char *name, + Object *val, Error **errp), + ObjectPropertyLinkFlags flags, + Error **errp) +{ + Error *local_err =3D NULL; + LinkProperty *prop =3D g_new0(LinkProperty, 1); + gchar *full_type; + ObjectProperty *op; + + prop->offset =3D offset; + prop->check =3D check; + prop->flags =3D flags | OBJ_PROP_LINK_CLASS; + + full_type =3D g_strdup_printf("link<%s>", type); + + op =3D object_class_property_add(oc, name, full_type, + object_get_link_property, + check ? object_set_link_property : NULL= , + object_release_link_property, + prop, + &local_err); + if (local_err) { + error_propagate(errp, local_err); + g_free(prop); + goto out; + } + + op->resolve =3D object_resolve_link_property; + +out: + g_free(full_type); + return op; +} + void object_property_add_const_link(Object *obj, const char *name, Object *target, Error **errp) { --=20 2.24.0