From nobody Tue Feb 10 07:42:14 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=1575199422; cv=none; d=zohomail.com; s=zohoarc; b=fLD8vu1d82D2BeCXPAGulOxPHZlaQ4NB3IklnvX7d2w6vm+YNhrjrrkyMCyJFYjTLStthpwHruyO2YvXbedAD5D59TT0T2jBX8cN3N2Hh2VAkTq+/ejwpGtfMtlF48aYOHbIQJjzFSi6LweEX6FaU1s/qnxxym5NbeBnhSITY/I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1575199422; 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=T3a7HE0ymqxfhhzo/muumHux+x+kqshE/WjXiUl1mtg=; b=GYWjnQZss4WsnZ1YH0XhpNB9BQFi0L0Gmgqpl8niDgeXESC0WcO9BKv9j1xsbWD7TFwlzhsYV2Y28QDyREYPPiewTi+wyzcuUyFWyyoEHJaLGI7PhyhGXjRWMm4fPTf8kwJY01JqcWDQUbKgq9um6oiMC9A30e+rjaFgU/TSxPw= 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 157519942283575.63021491794984; Sun, 1 Dec 2019 03:23:42 -0800 (PST) Received: from localhost ([::1]:50246 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ibNKH-0007rK-9M for importer@patchew.org; Sun, 01 Dec 2019 06:23:41 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:37690) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ibNDm-0001Vx-Iz for qemu-devel@nongnu.org; Sun, 01 Dec 2019 06:17:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ibNDk-00008k-Ss for qemu-devel@nongnu.org; Sun, 01 Dec 2019 06:16:58 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:31692 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 1ibNDk-00007S-GH for qemu-devel@nongnu.org; Sun, 01 Dec 2019 06:16:56 -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-318-qfd8ovITPAWg7L2FA5HzZQ-1; Sun, 01 Dec 2019 06:16:55 -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 3299A800D4E for ; Sun, 1 Dec 2019 11:16:54 +0000 (UTC) Received: from localhost (unknown [10.36.112.15]) by smtp.corp.redhat.com (Postfix) with ESMTP id 904BF600C8; Sun, 1 Dec 2019 11:16:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575199016; 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=T3a7HE0ymqxfhhzo/muumHux+x+kqshE/WjXiUl1mtg=; b=i851VwgckJ/jStDWeayQQpffSimVBiWqtK2XOoYiAjvCzAvjk/43K3NV/MFxCgMgNXtowh RrpP4Wf1IjG0i6n+F90KThwgZXc/OFrPkfFh05RPr1/kmpz/W8FkMWRAP6xK6yGyzO4wD0 kNG63eXo+vViC0Ce1Z57+cdK/JlBMgM= From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Subject: [PATCH 08/26] object: make object_class_property_add* return property Date: Sun, 1 Dec 2019 15:15:13 +0400 Message-Id: <20191201111531.1136947-9-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.79 on 10.5.11.11 X-MC-Unique: qfd8ovITPAWg7L2FA5HzZQ-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.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: pbonzini@redhat.com, berrange@redhat.com, ehabkost@redhat.com, =?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" This will help calling other ObjectProperty associated functions easily after. Signed-off-by: Marc-Andr=C3=A9 Lureau --- include/qom/object.h | 24 +++++++++++------ qom/object.c | 64 ++++++++++++++++++++++++++++++-------------- 2 files changed, 60 insertions(+), 28 deletions(-) diff --git a/include/qom/object.h b/include/qom/object.h index 8d442cf633..102d941ca5 100644 --- a/include/qom/object.h +++ b/include/qom/object.h @@ -1537,7 +1537,8 @@ void object_property_add_str(Object *obj, const char = *name, void (*set)(Object *, const char *, Error **), Error **errp); =20 -void object_class_property_add_str(ObjectClass *klass, const char *name, +ObjectProperty *object_class_property_add_str(ObjectClass *klass, + const char *name, char *(*get)(Object *, Error **), void (*set)(Object *, const char *, Error **), @@ -1559,7 +1560,8 @@ void object_property_add_bool(Object *obj, const char= *name, void (*set)(Object *, bool, Error **), Error **errp); =20 -void object_class_property_add_bool(ObjectClass *klass, const char *name, +ObjectProperty *object_class_property_add_bool(ObjectClass *klass, + const char *name, bool (*get)(Object *, Error **), void (*set)(Object *, bool, Error **), Error **errp); @@ -1583,7 +1585,8 @@ void object_property_add_enum(Object *obj, const char= *name, void (*set)(Object *, int, Error **), Error **errp); =20 -void object_class_property_add_enum(ObjectClass *klass, const char *name, +ObjectProperty *object_class_property_add_enum(ObjectClass *klass, + const char *name, const char *typename, const QEnumLookup *lookup, int (*get)(Object *, Error **), @@ -1604,7 +1607,8 @@ void object_property_add_tm(Object *obj, const char *= name, void (*get)(Object *, struct tm *, Error **), Error **errp); =20 -void object_class_property_add_tm(ObjectClass *klass, const char *name, +ObjectProperty *object_class_property_add_tm(ObjectClass *klass, + const char *name, void (*get)(Object *, struct tm *, Error= **), Error **errp); =20 @@ -1620,7 +1624,8 @@ void object_class_property_add_tm(ObjectClass *klass,= const char *name, */ void object_property_add_uint8_ptr(Object *obj, const char *name, const uint8_t *v, Error **errp); -void object_class_property_add_uint8_ptr(ObjectClass *klass, const char *n= ame, +ObjectProperty *object_class_property_add_uint8_ptr(ObjectClass *klass, + const char *name, const uint8_t *v, Error **errp); =20 /** @@ -1635,7 +1640,8 @@ void object_class_property_add_uint8_ptr(ObjectClass = *klass, const char *name, */ void object_property_add_uint16_ptr(Object *obj, const char *name, const uint16_t *v, Error **errp); -void object_class_property_add_uint16_ptr(ObjectClass *klass, const char *= name, +ObjectProperty *object_class_property_add_uint16_ptr(ObjectClass *klass, + const char *name, const uint16_t *v, Error **errp); =20 /** @@ -1650,7 +1656,8 @@ void object_class_property_add_uint16_ptr(ObjectClass= *klass, const char *name, */ void object_property_add_uint32_ptr(Object *obj, const char *name, const uint32_t *v, Error **errp); -void object_class_property_add_uint32_ptr(ObjectClass *klass, const char *= name, +ObjectProperty *object_class_property_add_uint32_ptr(ObjectClass *klass, + const char *name, const uint32_t *v, Error **errp); =20 /** @@ -1665,7 +1672,8 @@ void object_class_property_add_uint32_ptr(ObjectClass= *klass, const char *name, */ void object_property_add_uint64_ptr(Object *obj, const char *name, const uint64_t *v, Error **Errp); -void object_class_property_add_uint64_ptr(ObjectClass *klass, const char *= name, +ObjectProperty *object_class_property_add_uint64_ptr(ObjectClass *klass, + const char *name, const uint64_t *v, Error **Errp); =20 /** diff --git a/qom/object.c b/qom/object.c index 844a2d66bf..de43b30e5e 100644 --- a/qom/object.c +++ b/qom/object.c @@ -2041,7 +2041,8 @@ void object_property_add_str(Object *obj, const char = *name, } } =20 -void object_class_property_add_str(ObjectClass *klass, const char *name, +ObjectProperty * +object_class_property_add_str(ObjectClass *klass, const char *name, char *(*get)(Object *, Error **), void (*set)(Object *, const char *, Error **), @@ -2049,11 +2050,12 @@ void object_class_property_add_str(ObjectClass *kla= ss, const char *name, { Error *local_err =3D NULL; StringProperty *prop =3D g_malloc0(sizeof(*prop)); + ObjectProperty *rv; =20 prop->get =3D get; prop->set =3D set; =20 - object_class_property_add(klass, name, "string", + rv =3D object_class_property_add(klass, name, "string", get ? property_get_str : NULL, set ? property_set_str : NULL, property_release_str, @@ -2062,6 +2064,8 @@ void object_class_property_add_str(ObjectClass *klass= , const char *name, error_propagate(errp, local_err); g_free(prop); } + + return rv; } =20 typedef struct BoolProperty @@ -2131,18 +2135,20 @@ void object_property_add_bool(Object *obj, const ch= ar *name, } } =20 -void object_class_property_add_bool(ObjectClass *klass, const char *name, +ObjectProperty * +object_class_property_add_bool(ObjectClass *klass, const char *name, bool (*get)(Object *, Error **), void (*set)(Object *, bool, Error **), Error **errp) { Error *local_err =3D NULL; BoolProperty *prop =3D g_malloc0(sizeof(*prop)); + ObjectProperty *rv; =20 prop->get =3D get; prop->set =3D set; =20 - object_class_property_add(klass, name, "bool", + rv =3D object_class_property_add(klass, name, "bool", get ? property_get_bool : NULL, set ? property_set_bool : NULL, property_release_bool, @@ -2151,6 +2157,8 @@ void object_class_property_add_bool(ObjectClass *klas= s, const char *name, error_propagate(errp, local_err); g_free(prop); } + + return rv; } =20 static void property_get_enum(Object *obj, Visitor *v, const char *name, @@ -2216,7 +2224,8 @@ void object_property_add_enum(Object *obj, const char= *name, } } =20 -void object_class_property_add_enum(ObjectClass *klass, const char *name, +ObjectProperty * +object_class_property_add_enum(ObjectClass *klass, const char *name, const char *typename, const QEnumLookup *lookup, int (*get)(Object *, Error **), @@ -2225,12 +2234,13 @@ void object_class_property_add_enum(ObjectClass *kl= ass, const char *name, { Error *local_err =3D NULL; EnumProperty *prop =3D g_malloc(sizeof(*prop)); + ObjectProperty *rv; =20 prop->lookup =3D lookup; prop->get =3D get; prop->set =3D set; =20 - object_class_property_add(klass, name, typename, + rv =3D object_class_property_add(klass, name, typename, get ? property_get_enum : NULL, set ? property_set_enum : NULL, property_release_enum, @@ -2239,6 +2249,8 @@ void object_class_property_add_enum(ObjectClass *klas= s, const char *name, error_propagate(errp, local_err); g_free(prop); } + + return rv; } =20 typedef struct TMProperty { @@ -2319,16 +2331,18 @@ void object_property_add_tm(Object *obj, const char= *name, } } =20 -void object_class_property_add_tm(ObjectClass *klass, const char *name, +ObjectProperty * +object_class_property_add_tm(ObjectClass *klass, const char *name, void (*get)(Object *, struct tm *, Error= **), Error **errp) { Error *local_err =3D NULL; TMProperty *prop =3D g_malloc0(sizeof(*prop)); + ObjectProperty *rv; =20 prop->get =3D get; =20 - object_class_property_add(klass, name, "struct tm", + rv =3D object_class_property_add(klass, name, "struct tm", get ? property_get_tm : NULL, NULL, property_release_tm, prop, &local_err); @@ -2336,6 +2350,8 @@ void object_class_property_add_tm(ObjectClass *klass,= const char *name, error_propagate(errp, local_err); g_free(prop); } + + return rv; } =20 static char *qdev_get_type(Object *obj, Error **errp) @@ -2378,11 +2394,13 @@ void object_property_add_uint8_ptr(Object *obj, con= st char *name, NULL, NULL, (void *)v, errp); } =20 -void object_class_property_add_uint8_ptr(ObjectClass *klass, const char *n= ame, +ObjectProperty * +object_class_property_add_uint8_ptr(ObjectClass *klass, const char *name, const uint8_t *v, Error **errp) { - object_class_property_add(klass, name, "uint8", property_get_uint8_ptr, - NULL, NULL, (void *)v, errp); + return object_class_property_add(klass, name, "uint8", + property_get_uint8_ptr, + NULL, NULL, (void *)v, errp); } =20 void object_property_add_uint16_ptr(Object *obj, const char *name, @@ -2392,11 +2410,13 @@ void object_property_add_uint16_ptr(Object *obj, co= nst char *name, NULL, NULL, (void *)v, errp); } =20 -void object_class_property_add_uint16_ptr(ObjectClass *klass, const char *= name, +ObjectProperty * +object_class_property_add_uint16_ptr(ObjectClass *klass, const char *name, const uint16_t *v, Error **errp) { - object_class_property_add(klass, name, "uint16", property_get_uint16_p= tr, - NULL, NULL, (void *)v, errp); + return object_class_property_add(klass, name, "uint16", + property_get_uint16_ptr, + NULL, NULL, (void *)v, errp); } =20 void object_property_add_uint32_ptr(Object *obj, const char *name, @@ -2406,11 +2426,13 @@ void object_property_add_uint32_ptr(Object *obj, co= nst char *name, NULL, NULL, (void *)v, errp); } =20 -void object_class_property_add_uint32_ptr(ObjectClass *klass, const char *= name, +ObjectProperty * +object_class_property_add_uint32_ptr(ObjectClass *klass, const char *name, const uint32_t *v, Error **errp) { - object_class_property_add(klass, name, "uint32", property_get_uint32_p= tr, - NULL, NULL, (void *)v, errp); + return object_class_property_add(klass, name, "uint32", + property_get_uint32_ptr, + NULL, NULL, (void *)v, errp); } =20 void object_property_add_uint64_ptr(Object *obj, const char *name, @@ -2420,11 +2442,13 @@ void object_property_add_uint64_ptr(Object *obj, co= nst char *name, NULL, NULL, (void *)v, errp); } =20 -void object_class_property_add_uint64_ptr(ObjectClass *klass, const char *= name, +ObjectProperty * +object_class_property_add_uint64_ptr(ObjectClass *klass, const char *name, const uint64_t *v, Error **errp) { - object_class_property_add(klass, name, "uint64", property_get_uint64_p= tr, - NULL, NULL, (void *)v, errp); + return object_class_property_add(klass, name, "uint64", + property_get_uint64_ptr, + NULL, NULL, (void *)v, errp); } =20 typedef struct { --=20 2.24.0