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 6371ECD4F3D for ; Thu, 21 May 2026 13:54:08 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wQ3oW-0002HM-1I; Thu, 21 May 2026 09:51:52 -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 1wQ3oT-00020M-Bg for qemu-devel@nongnu.org; Thu, 21 May 2026 09:51:49 -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 1wQ3oR-0006TA-Ky for qemu-devel@nongnu.org; Thu, 21 May 2026 09:51:49 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1779371507; 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=k+gzzh0TF1FWRjL4FpB4zjStDbm4yVLLWmVa3Ip2Xtw=; b=F8EyaPkS48JUrsUQWi7CEfCR1QqD/YxqML+lHD4hE80BRQ7gv5zH2CwTEyNiQa1NQMugHM 6pDxkJWAZIJ6FHjXBaE1QNVR+SlpUfawDKRIkBMOr5KLYX6DwxFwvr/rbR8SRUi1hFGlr6 EwWg747j/ZWPdW1rU/gGnoIoyh1d/mo= Received: from mx-prod-mc-03.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-662-wWIs6mWWPkKLDZdIiiX2LA-1; Thu, 21 May 2026 09:51:44 -0400 X-MC-Unique: wWIs6mWWPkKLDZdIiiX2LA-1 X-Mimecast-MFC-AGG-ID: wWIs6mWWPkKLDZdIiiX2LA_1779371502 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id A156D195605E; Thu, 21 May 2026 13:51:42 +0000 (UTC) Received: from berrange.com (unknown [10.44.33.98]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 85B801956053; Thu, 21 May 2026 13:51:37 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: Hanna Reitz , Pierrick Bouvier , Paolo Bonzini , Kevin Wolf , qemu-block@nongnu.org, John Snow , Thanos Makatos , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= , John Levon , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Cleber Rosa , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [PULL 23/29] qom: shorten name of object_set_properties_from_keyval Date: Thu, 21 May 2026 14:49:37 +0100 Message-ID: <20260521134943.1714527-24-berrange@redhat.com> In-Reply-To: <20260521134943.1714527-1-berrange@redhat.com> References: <20260521134943.1714527-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 Received-SPF: pass client-ip=170.10.133.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 8 X-Spam_score: 0.8 X-Spam_bar: / X-Spam_report: (0.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, 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_H5=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 This matches the convention established by the object_set_props and object_set_propv methods. Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Marc-André Lureau Signed-off-by: Daniel P. Berrangé --- include/qom/object.h | 6 +++--- qom/object_interfaces.c | 12 ++++++------ system/qdev-monitor.c | 4 ++-- system/vl.c | 7 ++++--- 4 files changed, 15 insertions(+), 14 deletions(-) diff --git a/include/qom/object.h b/include/qom/object.h index a905a9e42f..83b0cd01b5 100644 --- a/include/qom/object.h +++ b/include/qom/object.h @@ -915,7 +915,7 @@ type_init(do_qemu_init_ ## type_array) bool type_print_class_properties(const char *type); /** - * object_set_properties_from_keyval: + * object_set_props_from_keyval: * @obj: a QOM object * @qdict: a dictionary with the properties to be set * @from_json: true if leaf values of @qdict are typed, false if they @@ -925,8 +925,8 @@ bool type_print_class_properties(const char *type); * For each key in the dictionary, parse the value string if needed, * then set the corresponding property in @obj. */ -void object_set_properties_from_keyval(Object *obj, const QDict *qdict, - bool from_json, Error **errp); +void object_set_props_from_keyval(Object *obj, const QDict *qdict, + bool from_json, Error **errp); /** * object_class_dynamic_cast_assert: diff --git a/qom/object_interfaces.c b/qom/object_interfaces.c index 415cbee8c5..4377d65b76 100644 --- a/qom/object_interfaces.c +++ b/qom/object_interfaces.c @@ -44,8 +44,8 @@ bool user_creatable_can_be_deleted(UserCreatable *uc) } } -static void object_set_properties_from_qdict(Object *obj, const QDict *qdict, - Visitor *v, Error **errp) +static void object_set_props_from_qdict(Object *obj, const QDict *qdict, + Visitor *v, Error **errp) { const QDictEntry *e; @@ -62,8 +62,8 @@ out: visit_end_struct(v, NULL); } -void object_set_properties_from_keyval(Object *obj, const QDict *qdict, - bool from_json, Error **errp) +void object_set_props_from_keyval(Object *obj, const QDict *qdict, + bool from_json, Error **errp) { Visitor *v; if (from_json) { @@ -71,7 +71,7 @@ void object_set_properties_from_keyval(Object *obj, const QDict *qdict, } else { v = qobject_input_visitor_new_keyval(QOBJECT(qdict)); } - object_set_properties_from_qdict(obj, qdict, v, errp); + object_set_props_from_qdict(obj, qdict, v, errp); visit_free(v); } @@ -110,7 +110,7 @@ Object *user_creatable_add_type(const char *type, const char *id, assert(qdict); obj = object_new_with_class(klass); - object_set_properties_from_qdict(obj, qdict, v, &local_err); + object_set_props_from_qdict(obj, qdict, v, &local_err); if (local_err) { goto out; } diff --git a/system/qdev-monitor.c b/system/qdev-monitor.c index e5b55e3004..dfc95a08c1 100644 --- a/system/qdev-monitor.c +++ b/system/qdev-monitor.c @@ -730,8 +730,8 @@ DeviceState *qdev_device_add_from_qdict(const QDict *opts, qdict_del(properties, "bus"); qdict_del(properties, "id"); - object_set_properties_from_keyval(&dev->parent_obj, properties, from_json, - errp); + object_set_props_from_keyval(&dev->parent_obj, properties, from_json, + errp); qobject_unref(properties); if (*errp) { goto err_del_dev; diff --git a/system/vl.c b/system/vl.c index e690aa3ed8..da36b2c6e1 100644 --- a/system/vl.c +++ b/system/vl.c @@ -2010,7 +2010,8 @@ static bool object_create_early(const char *type) static void qemu_apply_machine_options(QDict *qdict) { - object_set_properties_from_keyval(OBJECT(current_machine), qdict, false, &error_fatal); + object_set_props_from_keyval(OBJECT(current_machine), qdict, + false, &error_fatal); if (semihosting_enabled(false) && !semihosting_get_argc()) { /* fall back to the -kernel/-append */ @@ -2225,8 +2226,8 @@ static void qemu_create_machine(QDict *qdict) keyval_parse(machine_class->default_machine_opts, NULL, NULL, &error_abort); qemu_apply_legacy_machine_options(default_opts); - object_set_properties_from_keyval(OBJECT(current_machine), default_opts, - false, &error_abort); + object_set_props_from_keyval(OBJECT(current_machine), default_opts, + false, &error_abort); qobject_unref(default_opts); } } -- 2.54.0