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 Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D8E34C624D3 for ; Fri, 4 Sep 2026 19:59:45 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x2a4B-0007U5-J4; Fri, 04 Sep 2026 15:59:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x2a4A-0007SW-5z for qemu-devel@nongnu.org; Fri, 04 Sep 2026 15:59:14 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x2a48-0007vO-DN for qemu-devel@nongnu.org; Fri, 04 Sep 2026 15:59:13 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1788551951; 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=girJTupFSeQuIQp5Q8w9m8sFCIToXcJFLfuB706GG7E=; b=N61shNkyFyguUmeBIn75JT1QNoDj6+GLjY92uzonpyR4Gu8plkkgZv82rFhGxQZgFITKLr 97oRd0RUcs0Q8g1QB3Q2WjkmmRhgXyrwKXHA8jebzhq0U/fK/vLH5vAiV6MpIs29/blGPg pH4ti3150fn2RCQ/YJN7Wi26yUVhVOE= Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-646-XmUuvZj6PkKB3gsV_zKhMw-1; Fri, 04 Sep 2026 15:59:07 -0400 X-MC-Unique: XmUuvZj6PkKB3gsV_zKhMw-1 X-Mimecast-MFC-AGG-ID: XmUuvZj6PkKB3gsV_zKhMw_1788551946 Received: from mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.95]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 63F5019540D6; Fri, 4 Sep 2026 19:59:06 +0000 (UTC) Received: from localhost (headnet05.pony-001.prod.iad2.dc.redhat.com [10.2.32.117]) by mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 96A335BC; Fri, 4 Sep 2026 19:59:05 +0000 (UTC) From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Fri, 04 Sep 2026 23:57:59 +0400 Subject: [PATCH v4 16/75] qom: remove old enum property registration API MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Message-Id: <20260904-qom-qapi-v4-16-a985f168e938@redhat.com> References: <20260904-qom-qapi-v4-0-a985f168e938@redhat.com> In-Reply-To: <20260904-qom-qapi-v4-0-a985f168e938@redhat.com> To: qemu-devel@nongnu.org Cc: Markus Armbruster , Paolo Bonzini , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Michael Roth , Pierrick Bouvier , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Developer-Signature: v=1; a=openpgp-sha256; l=7293; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=u/jtz0VEJPO7qFKfQaHWT67kjziwn5hqQAMBuiinxLc=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqmyLJ22rzP+80E8Qj8kznDlRhyW3xNXF4ixE4H gdkFLHLvyqJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCapsiyQAKCRDa6OEJdZac 5Y0SD/99VCrvEfJPMyENvAcdbtbO4bE+U5dLsO/apQAgtOLe/0IejIxyk0DAXZohFqOUngdFUUy Nua/Hvq+eHDgTYXARJFlm0ePkgZv9NA+Uv0U4bf2qnVXb/V42KNUekg07g0P2CJ+H8m3PF0ZFfJ /NGVspVv4b0HwVJeEGe3zL+zgm5UpLHm2JFTZodTuPXqr646be4PEzA2os5tRvRyFCn+qSrV9/a 3J8/yHLSidnXNvyBK3J+ZnAiUL0h8bBy8UgCXeXAjnHkHuIaZqL1uvqxwMbrTModNE1HpN0bo51 /TuCVU/ZipoJi59mg96Qv5u7AYmtMRrPzi1xJ4K3IMHvL3XMlP7/A6tIN8pVuJUlcyLkA2T20ai SdNPPsmgZ7/VlKO5pjxhMfGcXerXwNoKLoIhuQOHJtLQoGTcJH2fINaD7y3toPUHPAhUG3DLF4u yMWQUxLXNe8ik5y5LJKZazolrlc7/JOkT3RwZhHRclKcghHENe3M8D+u5DA4vK/j0R8OqLQc2JY hPFk0JaPLhTcRarcfdRgNwJlnF5OfB6bE1bu4k6S108v59bjaapXV+o9ZG2UAithkqE8DLW6Acz Nykq6NmxDUcsTGEuE73wBi7ZYbZnCUew8BZReNl+97HS8UT1DPG9QD/EdyO6XhEKe6pYHR6DCPW 1wBuWjWZ6xhpsgA== X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.6 on 10.30.177.95 Received-SPF: pass client-ip=170.10.133.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Now that all callers use object_class_property_add_qapi_enum(), remove the legacy object_property_add_enum() and object_class_property_add_enum() functions along with their EnumProperty struct and property_get_enum / property_set_enum helpers. Simplify object_property_get_enum() to assert on qapi_type rather than falling back to the old EnumProperty opaque data. Signed-off-by: Marc-André Lureau --- include/qom/object.h | 45 ++-------------------------- qom/object.c | 82 ++-------------------------------------------------- 2 files changed, 4 insertions(+), 123 deletions(-) diff --git a/include/qom/object.h b/include/qom/object.h index c9a5fe4934d0..6d84bbb25bb5 100644 --- a/include/qom/object.h +++ b/include/qom/object.h @@ -1663,12 +1663,12 @@ char *object_get_canonical_path(const Object *obj); * because it was ambiguous, or %NULL. Set to %false on success. * * There are two types of supported paths--absolute paths and partial paths. - * + * * Absolute paths are derived from the root object and can follow child<> or * link<> properties. Since they can follow link<> properties, they can be * arbitrarily long. Absolute paths look like absolute filenames and are * prefixed with a leading slash. - * + * * Partial paths look like relative filenames. They do not begin with a * prefix. The matching rules for partial paths are subtle but designed to make * specifying objects easy. At each level of the composition tree, the partial @@ -1952,47 +1952,6 @@ ObjectProperty *object_class_property_add_bool(ObjectClass *klass, bool (*get)(Object *, Error **), void (*set)(Object *, bool, Error **)); -/** - * object_property_add_enum: - * @obj: the object to add a property to - * @name: the name of the property - * @typename: the name of the enum data type - * @lookup: enum value namelookup table - * @get: the getter or %NULL if the property is write-only. - * @set: the setter or %NULL if the property is read-only - * - * Add an enum property using getters/setters. This function will add a - * property of type '@typename'. - * - * Returns: The newly added property on success, or %NULL on failure. - */ -ObjectProperty *object_property_add_enum(Object *obj, const char *name, - const char *typename, - const QEnumLookup *lookup, - int (*get)(Object *, Error **), - void (*set)(Object *, int, Error **)); - -/** - * object_class_property_add_enum: - * @klass: the object class to add a property to - * @name: the name of the property - * @typename: the name of the enum data type - * @lookup: enum value namelookup table - * @get: the getter or %NULL if the property is write-only. - * @set: the setter or %NULL if the property is read-only - * - * Add an enum property using getters/setters. This function will add a - * property of type '@typename'. - * - * Returns: The newly added property on success, or %NULL on failure. - */ -ObjectProperty *object_class_property_add_enum(ObjectClass *klass, - const char *name, - const char *typename, - const QEnumLookup *lookup, - int (*get)(Object *, Error **), - void (*set)(Object *, int, Error **)); - /** * struct QapiEnumProp - Descriptor for a QOM property backed by a QAPI enum type * diff --git a/qom/object.c b/qom/object.c index 2d3bd2ae327d..8e6ca25dc49d 100644 --- a/qom/object.c +++ b/qom/object.c @@ -1764,12 +1764,6 @@ uint64_t object_property_get_uint(Object *obj, const char *name, return retval; } -typedef struct EnumProperty { - const QEnumLookup *lookup; - int (*get)(Object *, Error **); - void (*set)(Object *, int, Error **); -} EnumProperty; - int object_property_get_enum(Object *obj, const char *name, const char *typename, Error **errp) { @@ -1793,12 +1787,8 @@ int object_property_get_enum(Object *obj, const char *name, return -1; } - if (prop->qapi_type) { - ret = qapi_enum_parse(prop->qapi_type->lookup, str, -1, errp); - } else { - EnumProperty *enumprop = prop->opaque; - ret = qapi_enum_parse(enumprop->lookup, str, -1, errp); - } + assert(prop->qapi_type); + ret = qapi_enum_parse(prop->qapi_type->lookup, str, -1, errp); g_free(str); return ret; @@ -2533,74 +2523,6 @@ object_class_property_add_bool(ObjectClass *klass, const char *name, prop); } -static void property_get_enum(Object *obj, Visitor *v, const char *name, - void *opaque, Error **errp) -{ - EnumProperty *prop = opaque; - int value; - Error *err = NULL; - - value = prop->get(obj, &err); - if (err) { - error_propagate(errp, err); - return; - } - - visit_type_enum(v, name, &value, prop->lookup, errp); -} - -static void property_set_enum(Object *obj, Visitor *v, const char *name, - void *opaque, Error **errp) -{ - EnumProperty *prop = opaque; - int value; - - if (!visit_type_enum(v, name, &value, prop->lookup, errp)) { - return; - } - prop->set(obj, value, errp); -} - -ObjectProperty * -object_property_add_enum(Object *obj, const char *name, - const char *typename, - const QEnumLookup *lookup, - int (*get)(Object *, Error **), - void (*set)(Object *, int, Error **)) -{ - EnumProperty *prop = g_malloc(sizeof(*prop)); - - prop->lookup = lookup; - prop->get = get; - prop->set = set; - - return object_property_add(obj, name, typename, - get ? property_get_enum : NULL, - set ? property_set_enum : NULL, - property_release_data, - prop); -} - -ObjectProperty * -object_class_property_add_enum(ObjectClass *klass, const char *name, - const char *typename, - const QEnumLookup *lookup, - int (*get)(Object *, Error **), - void (*set)(Object *, int, Error **)) -{ - EnumProperty *prop = g_malloc(sizeof(*prop)); - - prop->lookup = lookup; - prop->get = get; - prop->set = set; - - return object_class_property_add(klass, name, typename, - get ? property_get_enum : NULL, - set ? property_set_enum : NULL, - NULL, - prop); -} - static void get_qapi_enum(Object *obj, Visitor *v, const char *name, void *opaque, Error **errp) { -- 2.55.0.543.g5ebe2ebe4ea8