From nobody Mon Feb 9 15:30:21 2026 Delivered-To: importer@patchew.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=1605218618; cv=none; d=zohomail.com; s=zohoarc; b=mxcTsGFv7maGI7NVbL1MU2Yyd02n2VFTb2+Kbc9ci0OJrY7yXL5YO5w5xyYQfD/RmJfu771Kz2lLuwBEH4ORuCMJEl2u0XVJt7RPC7q56BpdMBbMeG/h72uG3pH/p8/50sQ/4D5yfcbOYmn1OwavE9+LriMZPNbhd3WfDRzbxC4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605218618; 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=LXR7duY2tvL6a/t3iaiFSweT4mtqDHoY6W+RdWpyXN4=; b=a3uh8zD0FHsrG+LyXDBUIxusaN2GmdUj8kNYoXwEevJcysUDadBPtERwzf2sa0ve8S8CZxKlm8wie4nmjVXqrBWj1A7L3bNyxsh8IBvmSMOttw+MobOi6sXnZEEGrrgx3Q56Ouv5qjaOK82cYpaAd8L4EiTiZ04lD6E68z7mPjo= 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 1605218618211552.9922326764002; Thu, 12 Nov 2020 14:03:38 -0800 (PST) Received: from localhost ([::1]:49454 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kdKgq-0003Cr-Ig for importer@patchew.org; Thu, 12 Nov 2020 17:03:36 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33500) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kdKPz-0006wl-1X for qemu-devel@nongnu.org; Thu, 12 Nov 2020 16:46:11 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:43233) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kdKPu-0003b5-TX for qemu-devel@nongnu.org; Thu, 12 Nov 2020 16:46:10 -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-472-JnHEIIEsNUezlM-4WMO4ew-1; Thu, 12 Nov 2020 16:46:04 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7CE7A1018F73; Thu, 12 Nov 2020 21:46:03 +0000 (UTC) Received: from localhost (ovpn-114-68.rdu2.redhat.com [10.10.114.68]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1D3DB19C59; Thu, 12 Nov 2020 21:46:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605217566; 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=LXR7duY2tvL6a/t3iaiFSweT4mtqDHoY6W+RdWpyXN4=; b=GKNHyojMe2c16wASWi6UvfF0w6monb3zj+wN6Tvwm3E8W6NVNAZyKd6ADXHnmCn0dDvGZA d1RiHvMgmj40vvzTYYs3uiv2WvCZxlAyJOPIZhEKTHKSxOkci8mQvlYu9fehkelqIoOqW8 4BwUrQM7+K0KAabvaez7NVg/7a3rwUE= X-MC-Unique: JnHEIIEsNUezlM-4WMO4ew-1 From: Eduardo Habkost To: qemu-devel@nongnu.org Subject: [PATCH v3 27/53] qdev: Rename qdev_propinfo_* to field_prop_* Date: Thu, 12 Nov 2020 16:43:24 -0500 Message-Id: <20201112214350.872250-28-ehabkost@redhat.com> In-Reply-To: <20201112214350.872250-1-ehabkost@redhat.com> References: <20201112214350.872250-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ehabkost@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=63.128.21.124; envelope-from=ehabkost@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/12 16:09:27 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: Kevin Wolf , "Daniel P. Berrange" , John Snow , Markus Armbruster , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Paolo Bonzini , Igor Mammedov , Stefan Berger Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) These functions will be moved to be part of QOM, so rename them. Signed-off-by: Eduardo Habkost --- Changes v2: * Rename to field_prop_* instead of object_propinfo_* --- Cc: Paolo Bonzini Cc: "Daniel P. Berrang=C3=A9" Cc: Eduardo Habkost Cc: qemu-devel@nongnu.org --- hw/core/qdev-prop-internal.h | 28 +++++++-------- hw/core/qdev-properties-system.c | 48 ++++++++++++------------- hw/core/qdev-properties.c | 62 ++++++++++++++++---------------- 3 files changed, 69 insertions(+), 69 deletions(-) diff --git a/hw/core/qdev-prop-internal.h b/hw/core/qdev-prop-internal.h index 6f17ddf271..740a5e530b 100644 --- a/hw/core/qdev-prop-internal.h +++ b/hw/core/qdev-prop-internal.h @@ -8,22 +8,22 @@ #ifndef HW_CORE_QDEV_PROP_INTERNAL_H #define HW_CORE_QDEV_PROP_INTERNAL_H =20 -void qdev_propinfo_get_enum(Object *obj, Visitor *v, const char *name, - void *opaque, Error **errp); -void qdev_propinfo_set_enum(Object *obj, Visitor *v, const char *name, - void *opaque, Error **errp); +void field_prop_get_enum(Object *obj, Visitor *v, const char *name, + void *opaque, Error **errp); +void field_prop_set_enum(Object *obj, Visitor *v, const char *name, + void *opaque, Error **errp); =20 -void qdev_propinfo_set_default_value_enum(ObjectProperty *op, - const Property *prop); -void qdev_propinfo_set_default_value_int(ObjectProperty *op, - const Property *prop); -void qdev_propinfo_set_default_value_uint(ObjectProperty *op, - const Property *prop); +void field_prop_set_default_value_enum(ObjectProperty *op, + const Property *prop); +void field_prop_set_default_value_int(ObjectProperty *op, + const Property *prop); +void field_prop_set_default_value_uint(ObjectProperty *op, + const Property *prop); =20 -void qdev_propinfo_get_int32(Object *obj, Visitor *v, const char *name, - void *opaque, Error **errp); -void qdev_propinfo_get_size32(Object *obj, Visitor *v, const char *name, - void *opaque, Error **errp); +void field_prop_get_int32(Object *obj, Visitor *v, const char *name, + void *opaque, Error **errp); +void field_prop_get_size32(Object *obj, Visitor *v, const char *name, + void *opaque, Error **errp); =20 /** * object_property_add_field: Add a field property to an object instance diff --git a/hw/core/qdev-properties-system.c b/hw/core/qdev-properties-sys= tem.c index 0d3e57bba0..96a0bc5109 100644 --- a/hw/core/qdev-properties-system.c +++ b/hw/core/qdev-properties-system.c @@ -537,9 +537,9 @@ QEMU_BUILD_BUG_ON(sizeof(LostTickPolicy) !=3D sizeof(in= t)); const PropertyInfo qdev_prop_losttickpolicy =3D { .name =3D "LostTickPolicy", .enum_table =3D &LostTickPolicy_lookup, - .get =3D qdev_propinfo_get_enum, - .set =3D qdev_propinfo_set_enum, - .set_default_value =3D qdev_propinfo_set_default_value_enum, + .get =3D field_prop_get_enum, + .set =3D field_prop_set_enum, + .set_default_value =3D field_prop_set_default_value_enum, }; =20 /* --- blocksize --- */ @@ -568,9 +568,9 @@ const PropertyInfo qdev_prop_blocksize =3D { .name =3D "size", .description =3D "A power of two between " MIN_BLOCK_SIZE_STR " and " MAX_BLOCK_SIZE_STR, - .get =3D qdev_propinfo_get_size32, + .get =3D field_prop_get_size32, .set =3D set_blocksize, - .set_default_value =3D qdev_propinfo_set_default_value_uint, + .set_default_value =3D field_prop_set_default_value_uint, }; =20 /* --- Block device error handling policy --- */ @@ -582,9 +582,9 @@ const PropertyInfo qdev_prop_blockdev_on_error =3D { .description =3D "Error handling policy, " "report/ignore/enospc/stop/auto", .enum_table =3D &BlockdevOnError_lookup, - .get =3D qdev_propinfo_get_enum, - .set =3D qdev_propinfo_set_enum, - .set_default_value =3D qdev_propinfo_set_default_value_enum, + .get =3D field_prop_get_enum, + .set =3D field_prop_set_enum, + .set_default_value =3D field_prop_set_default_value_enum, }; =20 /* --- BIOS CHS translation */ @@ -596,9 +596,9 @@ const PropertyInfo qdev_prop_bios_chs_trans =3D { .description =3D "Logical CHS translation algorithm, " "auto/none/lba/large/rechs", .enum_table =3D &BiosAtaTranslation_lookup, - .get =3D qdev_propinfo_get_enum, - .set =3D qdev_propinfo_set_enum, - .set_default_value =3D qdev_propinfo_set_default_value_enum, + .get =3D field_prop_get_enum, + .set =3D field_prop_set_enum, + .set_default_value =3D field_prop_set_default_value_enum, }; =20 /* --- FDC default drive types */ @@ -608,9 +608,9 @@ const PropertyInfo qdev_prop_fdc_drive_type =3D { .description =3D "FDC drive type, " "144/288/120/none/auto", .enum_table =3D &FloppyDriveType_lookup, - .get =3D qdev_propinfo_get_enum, - .set =3D qdev_propinfo_set_enum, - .set_default_value =3D qdev_propinfo_set_default_value_enum, + .get =3D field_prop_get_enum, + .set =3D field_prop_set_enum, + .set_default_value =3D field_prop_set_default_value_enum, }; =20 /* --- MultiFDCompression --- */ @@ -620,9 +620,9 @@ const PropertyInfo qdev_prop_multifd_compression =3D { .description =3D "multifd_compression values, " "none/zlib/zstd", .enum_table =3D &MultiFDCompression_lookup, - .get =3D qdev_propinfo_get_enum, - .set =3D qdev_propinfo_set_enum, - .set_default_value =3D qdev_propinfo_set_default_value_enum, + .get =3D field_prop_get_enum, + .set =3D field_prop_set_enum, + .set_default_value =3D field_prop_set_default_value_enum, }; =20 /* --- Reserved Region --- */ @@ -766,9 +766,9 @@ const PropertyInfo qdev_prop_pci_devfn =3D { .name =3D "int32", .description =3D "Slot and optional function number, example: 06.0 or = 06", .print =3D print_pci_devfn, - .get =3D qdev_propinfo_get_int32, + .get =3D field_prop_get_int32, .set =3D set_pci_devfn, - .set_default_value =3D qdev_propinfo_set_default_value_int, + .set_default_value =3D field_prop_set_default_value_int, }; =20 /* --- pci host address --- */ @@ -881,9 +881,9 @@ const PropertyInfo qdev_prop_off_auto_pcibar =3D { .name =3D "OffAutoPCIBAR", .description =3D "off/auto/bar0/bar1/bar2/bar3/bar4/bar5", .enum_table =3D &OffAutoPCIBAR_lookup, - .get =3D qdev_propinfo_get_enum, - .set =3D qdev_propinfo_set_enum, - .set_default_value =3D qdev_propinfo_set_default_value_enum, + .get =3D field_prop_get_enum, + .set =3D field_prop_set_enum, + .set_default_value =3D field_prop_set_default_value_enum, }; =20 /* --- PCIELinkSpeed 2_5/5/8/16 -- */ @@ -953,7 +953,7 @@ const PropertyInfo qdev_prop_pcie_link_speed =3D { .enum_table =3D &PCIELinkSpeed_lookup, .get =3D get_prop_pcielinkspeed, .set =3D set_prop_pcielinkspeed, - .set_default_value =3D qdev_propinfo_set_default_value_enum, + .set_default_value =3D field_prop_set_default_value_enum, }; =20 /* --- PCIELinkWidth 1/2/4/8/12/16/32 -- */ @@ -1041,7 +1041,7 @@ const PropertyInfo qdev_prop_pcie_link_width =3D { .enum_table =3D &PCIELinkWidth_lookup, .get =3D get_prop_pcielinkwidth, .set =3D set_prop_pcielinkwidth, - .set_default_value =3D qdev_propinfo_set_default_value_enum, + .set_default_value =3D field_prop_set_default_value_enum, }; =20 /* --- UUID --- */ diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c index 8436b60ec4..d2f565f552 100644 --- a/hw/core/qdev-properties.c +++ b/hw/core/qdev-properties.c @@ -96,8 +96,8 @@ static ObjectPropertyAccessor *field_prop_setter(const Pr= opertyInfo *info) return info->set ? field_prop_set : NULL; } =20 -void qdev_propinfo_get_enum(Object *obj, Visitor *v, const char *name, - void *opaque, Error **errp) +void field_prop_get_enum(Object *obj, Visitor *v, const char *name, + void *opaque, Error **errp) { Property *prop =3D opaque; int *ptr =3D qdev_get_prop_ptr(obj, prop); @@ -105,8 +105,8 @@ void qdev_propinfo_get_enum(Object *obj, Visitor *v, co= nst char *name, visit_type_enum(v, name, ptr, prop->info->enum_table, errp); } =20 -void qdev_propinfo_set_enum(Object *obj, Visitor *v, const char *name, - void *opaque, Error **errp) +void field_prop_set_enum(Object *obj, Visitor *v, const char *name, + void *opaque, Error **errp) { Property *prop =3D opaque; int *ptr =3D qdev_get_prop_ptr(obj, prop); @@ -114,8 +114,8 @@ void qdev_propinfo_set_enum(Object *obj, Visitor *v, co= nst char *name, visit_type_enum(v, name, ptr, prop->info->enum_table, errp); } =20 -void qdev_propinfo_set_default_value_enum(ObjectProperty *op, - const Property *prop) +void field_prop_set_default_value_enum(ObjectProperty *op, + const Property *prop) { object_property_set_default_str(op, qapi_enum_lookup(prop->info->enum_table, prop->defval.i)); @@ -123,9 +123,9 @@ void qdev_propinfo_set_default_value_enum(ObjectPropert= y *op, =20 const PropertyInfo qdev_prop_enum =3D { .name =3D "enum", - .get =3D qdev_propinfo_get_enum, - .set =3D qdev_propinfo_set_enum, - .set_default_value =3D qdev_propinfo_set_default_value_enum, + .get =3D field_prop_get_enum, + .set =3D field_prop_set_enum, + .set_default_value =3D field_prop_set_default_value_enum, }; =20 /* Bit */ @@ -278,14 +278,14 @@ static void set_uint8(Object *obj, Visitor *v, const = char *name, void *opaque, visit_type_uint8(v, name, ptr, errp); } =20 -void qdev_propinfo_set_default_value_int(ObjectProperty *op, - const Property *prop) +void field_prop_set_default_value_int(ObjectProperty *op, + const Property *prop) { object_property_set_default_int(op, prop->defval.i); } =20 -void qdev_propinfo_set_default_value_uint(ObjectProperty *op, - const Property *prop) +void field_prop_set_default_value_uint(ObjectProperty *op, + const Property *prop) { object_property_set_default_uint(op, prop->defval.u); } @@ -294,7 +294,7 @@ const PropertyInfo qdev_prop_uint8 =3D { .name =3D "uint8", .get =3D get_uint8, .set =3D set_uint8, - .set_default_value =3D qdev_propinfo_set_default_value_uint, + .set_default_value =3D field_prop_set_default_value_uint, }; =20 /* --- 16bit integer --- */ @@ -321,7 +321,7 @@ const PropertyInfo qdev_prop_uint16 =3D { .name =3D "uint16", .get =3D get_uint16, .set =3D set_uint16, - .set_default_value =3D qdev_propinfo_set_default_value_uint, + .set_default_value =3D field_prop_set_default_value_uint, }; =20 /* --- 32bit integer --- */ @@ -344,8 +344,8 @@ static void set_uint32(Object *obj, Visitor *v, const c= har *name, visit_type_uint32(v, name, ptr, errp); } =20 -void qdev_propinfo_get_int32(Object *obj, Visitor *v, const char *name, - void *opaque, Error **errp) +void field_prop_get_int32(Object *obj, Visitor *v, const char *name, + void *opaque, Error **errp) { Property *prop =3D opaque; int32_t *ptr =3D qdev_get_prop_ptr(obj, prop); @@ -366,14 +366,14 @@ const PropertyInfo qdev_prop_uint32 =3D { .name =3D "uint32", .get =3D get_uint32, .set =3D set_uint32, - .set_default_value =3D qdev_propinfo_set_default_value_uint, + .set_default_value =3D field_prop_set_default_value_uint, }; =20 const PropertyInfo qdev_prop_int32 =3D { .name =3D "int32", - .get =3D qdev_propinfo_get_int32, + .get =3D field_prop_get_int32, .set =3D set_int32, - .set_default_value =3D qdev_propinfo_set_default_value_int, + .set_default_value =3D field_prop_set_default_value_int, }; =20 /* --- 64bit integer --- */ @@ -418,14 +418,14 @@ const PropertyInfo qdev_prop_uint64 =3D { .name =3D "uint64", .get =3D get_uint64, .set =3D set_uint64, - .set_default_value =3D qdev_propinfo_set_default_value_uint, + .set_default_value =3D field_prop_set_default_value_uint, }; =20 const PropertyInfo qdev_prop_int64 =3D { .name =3D "int64", .get =3D get_int64, .set =3D set_int64, - .set_default_value =3D qdev_propinfo_set_default_value_int, + .set_default_value =3D field_prop_set_default_value_int, }; =20 /* --- string --- */ @@ -477,15 +477,15 @@ const PropertyInfo qdev_prop_on_off_auto =3D { .name =3D "OnOffAuto", .description =3D "on/off/auto", .enum_table =3D &OnOffAuto_lookup, - .get =3D qdev_propinfo_get_enum, - .set =3D qdev_propinfo_set_enum, - .set_default_value =3D qdev_propinfo_set_default_value_enum, + .get =3D field_prop_get_enum, + .set =3D field_prop_set_enum, + .set_default_value =3D field_prop_set_default_value_enum, }; =20 /* --- 32bit unsigned int 'size' type --- */ =20 -void qdev_propinfo_get_size32(Object *obj, Visitor *v, const char *name, - void *opaque, Error **errp) +void field_prop_get_size32(Object *obj, Visitor *v, const char *name, + void *opaque, Error **errp) { Property *prop =3D opaque; uint32_t *ptr =3D qdev_get_prop_ptr(obj, prop); @@ -518,9 +518,9 @@ static void set_size32(Object *obj, Visitor *v, const c= har *name, void *opaque, =20 const PropertyInfo qdev_prop_size32 =3D { .name =3D "size", - .get =3D qdev_propinfo_get_size32, + .get =3D field_prop_get_size32, .set =3D set_size32, - .set_default_value =3D qdev_propinfo_set_default_value_uint, + .set_default_value =3D field_prop_set_default_value_uint, }; =20 /* --- support for array properties --- */ @@ -617,7 +617,7 @@ const PropertyInfo qdev_prop_arraylen =3D { .name =3D "uint32", .get =3D get_uint32, .set =3D set_prop_arraylen, - .set_default_value =3D qdev_propinfo_set_default_value_uint, + .set_default_value =3D field_prop_set_default_value_uint, }; =20 /* --- public helpers --- */ @@ -816,7 +816,7 @@ const PropertyInfo qdev_prop_size =3D { .name =3D "size", .get =3D get_size, .set =3D set_size, - .set_default_value =3D qdev_propinfo_set_default_value_uint, + .set_default_value =3D field_prop_set_default_value_uint, }; =20 /* --- object link property --- */ --=20 2.28.0