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 BE8F4C2D0DB for ; Thu, 23 Jan 2020 17:26:15 +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 874D021569 for ; Thu, 23 Jan 2020 17:26:15 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="LG7Ia07+" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 874D021569 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]:33390 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iugFC-0007z6-5B for qemu-devel@archiver.kernel.org; Thu, 23 Jan 2020 12:26:14 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:53025) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iucuL-0001JX-QG for qemu-devel@nongnu.org; Thu, 23 Jan 2020 08:52:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iucuK-0001GA-HU for qemu-devel@nongnu.org; Thu, 23 Jan 2020 08:52:29 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:27678 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 1iucuK-0001Ft-Ds for qemu-devel@nongnu.org; Thu, 23 Jan 2020 08:52:28 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579787548; 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=AXIT44GcHEqEwBK1Et1RXBJRReAeylHT2cdVn0IclIY=; b=LG7Ia07+3f2oZceKkNx2DQYCQ/jHL746/bTyvNm02/lCWbwvyjrKg0CY1dvER3YGXsVyQt uDpKBMfVXs4GO3mdNJC33iRho2thpJ7nUUFXaWGQiO91C+q1+cMxtln2TACVHlyswHXG+3 WQMvS9Zz/drOnCL1y8dcpzxsojvc93I= 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-344-PWM2SyfcPRucYRaxG2OgFA-1; Thu, 23 Jan 2020 08:52:26 -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 93F6D1854331 for ; Thu, 23 Jan 2020 13:52:25 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.112.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8D41A1CB; Thu, 23 Jan 2020 13:52:24 +0000 (UTC) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 45/59] object: add object_class_property_add_link() Date: Thu, 23 Jan 2020 14:50:35 +0100 Message-Id: <1579787449-27599-46-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: PWM2SyfcPRucYRaxG2OgFA-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: 205.139.110.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 Signed-off-by: Marc-Andr=C3=A9 Lureau Message-Id: <20200110153039.1379601-17-marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini --- 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 24d6ebe..5e2f60d 100644 --- a/include/qom/object.h +++ b/include/qom/object.h @@ -1514,6 +1514,7 @@ typedef enum { =20 /* private */ OBJ_PROP_LINK_DIRECT =3D 0x2, + OBJ_PROP_LINK_CLASS =3D 0x4, } ObjectPropertyLinkFlags; =20 /** @@ -1562,6 +1563,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 b2bc87b..a3da546 100644 --- a/qom/object.c +++ b/qom/object.c @@ -1716,6 +1716,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; @@ -1726,6 +1727,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; } @@ -1841,7 +1844,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, @@ -1894,6 +1899,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 1.8.3.1