From nobody Mon Feb 9 22:19:58 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1498654472293932.5118033836447; Wed, 28 Jun 2017 05:54:32 -0700 (PDT) Received: from localhost ([::1]:33209 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dQCUI-0007EU-1O for importer@patchew.org; Wed, 28 Jun 2017 08:54:30 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47229) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dQCPO-0003B7-0x for qemu-devel@nongnu.org; Wed, 28 Jun 2017 08:49:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dQCPK-0001Ei-VS for qemu-devel@nongnu.org; Wed, 28 Jun 2017 08:49:26 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60484) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dQCPK-0001EP-Mh for qemu-devel@nongnu.org; Wed, 28 Jun 2017 08:49:22 -0400 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 mx1.redhat.com (Postfix) with ESMTPS id A6EF8C0467C5; Wed, 28 Jun 2017 12:49:21 +0000 (UTC) Received: from lemon.redhat.com (ovpn-12-85.pek2.redhat.com [10.72.12.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id B9BC089A9B; Wed, 28 Jun 2017 12:49:17 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com A6EF8C0467C5 Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=famz@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com A6EF8C0467C5 From: Fam Zheng To: qemu-devel@nongnu.org Date: Wed, 28 Jun 2017 20:48:47 +0800 Message-Id: <20170628124850.12821-5-famz@redhat.com> In-Reply-To: <20170628124850.12821-1-famz@redhat.com> References: <20170628124850.12821-1-famz@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Wed, 28 Jun 2017 12:49:21 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 4/7] qdev: Introduce DEFINE_PROP_LINK X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Markus Armbruster , "Dr . David Alan Gilbert" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This property can be used to replace the object_property_add_link in device code, to add a link to other objects. It's implemented by creating a wrapper property that basically forwards operations to a QOM "link-FOO" property, which handles the check callback and flags. The feature that is missing from QOM is the dynamic child pointer which is done in the added code with the usual "offset" approach. Signed-off-by: Fam Zheng --- hw/core/qdev-properties.c | 81 ++++++++++++++++++++++++++++++++++++++++= ++++ include/hw/qdev-core.h | 3 ++ include/hw/qdev-properties.h | 11 ++++++ 3 files changed, 95 insertions(+) diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c index 68cd653..3801379 100644 --- a/hw/core/qdev-properties.c +++ b/hw/core/qdev-properties.c @@ -1192,3 +1192,84 @@ PropertyInfo qdev_prop_size =3D { .set =3D set_size, .set_default_value =3D set_default_value_uint, }; + +/* --- object link property --- */ + +static ObjectProperty *link_property_get_or_create(Object *obj, Property *= prop, + Error **errp) +{ + Error *local_err =3D NULL; + Object **child =3D qdev_get_prop_ptr(DEVICE(obj), prop); + char *link_prop_name =3D g_strdup_printf("link-%s", prop->name); + ObjectProperty *op =3D object_property_find(obj, link_prop_name, NULL); + + if (op) { + goto out; + } + object_property_add_link(obj, link_prop_name, prop->link.type, + child, prop->link.check, + prop->link.flags, &local_err); + + if (local_err) { + error_propagate(errp, local_err); + goto out; + } + op =3D object_property_find(obj, link_prop_name, errp); +out: + g_free(link_prop_name); + return op; +} + +static void get_link_property(Object *obj, Visitor *v, + const char *name, void *opaque, + Error **errp) +{ + Property *prop =3D opaque; + ObjectProperty *op =3D link_property_get_or_create(obj, prop, NULL); + char *link_prop_name; + + if (!op) { + return; + } + link_prop_name =3D g_strdup_printf("link-%s", name); + object_get_link_property(obj, v, link_prop_name, op->opaque, errp); + g_free(link_prop_name); +} + +static void set_link_property(Object *obj, Visitor *v, + const char *name, void *opaque, + Error **errp) +{ + Object *target; + Property *prop =3D opaque; + Object **link_ptr =3D qdev_get_prop_ptr(DEVICE(obj), prop); + ObjectProperty *op =3D link_property_get_or_create(obj, prop, errp); + char *link_prop_name; + Error *local_err =3D NULL; + + if (!op) { + return; + } + + link_prop_name =3D g_strdup_printf("link-%s", name); + object_set_link_property(obj, v, link_prop_name, op->opaque, &local_er= r); + if (local_err) { + error_propagate(errp, local_err); + goto out; + } + target =3D object_property_get_link(obj, link_prop_name, &local_err); + if (local_err) { + error_propagate(errp, local_err); + goto out; + } + *link_ptr =3D target; + +out: + g_free(link_prop_name); +} + +PropertyInfo qdev_prop_link =3D { + .name =3D "link", + .get =3D get_link_property, + .set =3D set_link_property, +}; diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h index 9d7c1c0..a520226 100644 --- a/include/hw/qdev-core.h +++ b/include/hw/qdev-core.h @@ -233,6 +233,9 @@ struct Property { int arrayoffset; PropertyInfo *arrayinfo; int arrayfieldsize; + /* Only @check and @flags are used; @child is unuseful because we need= a + * dynamic pointer in @obj as derived from @offset. */ + LinkProperty link; }; =20 struct PropertyInfo { diff --git a/include/hw/qdev-properties.h b/include/hw/qdev-properties.h index 39bf4b2..c9ccc9e 100644 --- a/include/hw/qdev-properties.h +++ b/include/hw/qdev-properties.h @@ -30,6 +30,7 @@ extern PropertyInfo qdev_prop_pci_devfn; extern PropertyInfo qdev_prop_blocksize; extern PropertyInfo qdev_prop_pci_host_devaddr; extern PropertyInfo qdev_prop_arraylen; +extern PropertyInfo qdev_prop_link; =20 #define DEFINE_PROP(_name, _state, _field, _prop, _type) { \ .name =3D (_name), \ @@ -117,6 +118,16 @@ extern PropertyInfo qdev_prop_arraylen; .arrayoffset =3D offsetof(_state, _arrayfield), \ } =20 +#define DEFINE_PROP_LINK(_name, _state, _field, _type, _check, _flags) {\ + .name =3D (_name), \ + .info =3D &(qdev_prop_link), \ + .offset =3D offsetof(_state, _field) \ + + type_check(Object *, typeof_field(_state, _field)), \ + .link.check =3D _check, \ + .link.flags =3D _flags, \ + .link.type =3D _type, \ + } + #define DEFINE_PROP_UINT8(_n, _s, _f, _d) \ DEFINE_PROP_UNSIGNED(_n, _s, _f, _d, qdev_prop_uint8, uint8_t) #define DEFINE_PROP_UINT16(_n, _s, _f, _d) \ --=20 2.9.4