[24/36] qdev: Rename qdev_propinfo_* to object_propinfo_*

Message ID	20201029220246.472693-25-ehabkost@redhat.com
State	New
Headers	show Return-Path: <SRS0=EqPw=EE=nongnu.org=qemu-devel-bounces+qemu-devel=archiver.kernel.org@kernel.org> DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 04136214F1 From: Eduardo Habkost <ehabkost@redhat.com> To: qemu-devel@nongnu.org Subject: [PATCH 24/36] qdev: Rename qdev_propinfo_* to object_propinfo_* Date: Thu, 29 Oct 2020 18:02:34 -0400 Message-Id: <20201029220246.472693-25-ehabkost@redhat.com> In-Reply-To: <20201029220246.472693-1-ehabkost@redhat.com> References: <20201029220246.472693-1-ehabkost@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=63.128.21.124; envelope-from=ehabkost@redhat.com; helo=us-smtp-delivery-124.mimecast.com Precedence: list Cc: "Daniel P. Berrange" <berrange@redhat.com>, John Snow <jsnow@redhat.com>, Markus Armbruster <armbru@redhat.com>, Igor Mammedov <imammedo@redhat.com>, Paolo Bonzini <pbonzini@redhat.com>, =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= <philmd@redhat.com> Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org>
Series	Make qdev static property API usable by any QOM type \| expand [00/36] Make qdev static property API usable by any QOM type [02/36] cpu: Move cpu_common_props to hw/core/cpu.c [05/36] sparc: Check dev->realized at sparc_set_nwindows() [06/36] qdev: Don't use dev->id on set_size32() error message [07/36] qdev: Make PropertyInfo.print method get Object* argument [08/36] qdev: Make bit_prop_set() get Object* argument [11/36] qdev: Make check_prop_still_unset() get Object* argument [12/36] qdev: Make error_set_from_qdev_prop_error() get Object* argument [17/36] qdev: Separate generic and device-specific property registration [20/36] qdev: Reuse object_property_add_static() when adding array elements [21/36] qom: Add allow_set callback to ObjectProperty [23/36] qdev: Make qdev_propinfo_get_uint16() static [24/36] qdev: Rename qdev_propinfo_* to object_propinfo_* [26/36] qdev: Move softmmu properties to qdev-properties-system.h [29/36] qdev: Move qdev_prop_tpm declaration to tpm_prop.h [30/36] qdev: Rename qdev_prop_* to prop_info_* [32/36] qdev: Move base property types to qom/property-types.c [35/36] machine: Use DEFINE_PROP_BOOL for boolean properties [36/36] qom: Include static property API reference in documentation

On Fri, Oct 30, 2020 at 2:13 AM Eduardo Habkost <ehabkost@redhat.com> wrote: > These functions will be moved to be part of QOM, so rename them. > > Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> > Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> > --- > Cc: Paolo Bonzini <pbonzini@redhat.com> > Cc: "Daniel P. Berrangé" <berrange@redhat.com> > Cc: Eduardo Habkost <ehabkost@redhat.com> > Cc: qemu-devel@nongnu.org > --- > hw/core/qdev-prop-internal.h | 28 +++++++++---------- > hw/core/qdev-properties-system.c | 48 ++++++++++++++++---------------- > hw/core/qdev-properties.c | 48 ++++++++++++++++---------------- > 3 files changed, 62 insertions(+), 62 deletions(-) > > diff --git a/hw/core/qdev-prop-internal.h b/hw/core/qdev-prop-internal.h > index c8006a21c7..41ec9e8942 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 > > -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 object_propinfo_get_enum(Object *obj, Visitor *v, const char *name, > + void *opaque, Error **errp); > +void object_propinfo_set_enum(Object *obj, Visitor *v, const char *name, > + void *opaque, Error **errp); > > -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 object_propinfo_set_default_value_enum(ObjectProperty *op, > + const Property *prop); > +void object_propinfo_set_default_value_int(ObjectProperty *op, > + const Property *prop); > +void object_propinfo_set_default_value_uint(ObjectProperty *op, > + const Property *prop); > > -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 object_propinfo_get_int32(Object *obj, Visitor *v, const char *name, > + void *opaque, Error **errp); > +void object_propinfo_get_size32(Object *obj, Visitor *v, const char *name, > + void *opaque, Error **errp); > > /** > * object_property_add_static: Add a static property to an object instance > diff --git a/hw/core/qdev-properties-system.c > b/hw/core/qdev-properties-system.c > index 60a45f5620..d9355053d2 100644 > --- a/hw/core/qdev-properties-system.c > +++ b/hw/core/qdev-properties-system.c > @@ -535,9 +535,9 @@ QEMU_BUILD_BUG_ON(sizeof(LostTickPolicy) != > sizeof(int)); > const PropertyInfo qdev_prop_losttickpolicy = { > .name = "LostTickPolicy", > .enum_table = &LostTickPolicy_lookup, > - .get = qdev_propinfo_get_enum, > - .set = qdev_propinfo_set_enum, > - .set_default_value = qdev_propinfo_set_default_value_enum, > + .get = object_propinfo_get_enum, > + .set = object_propinfo_set_enum, > + .set_default_value = object_propinfo_set_default_value_enum, > }; > > /* --- blocksize --- */ > @@ -566,9 +566,9 @@ const PropertyInfo qdev_prop_blocksize = { > .name = "size", > .description = "A power of two between " MIN_BLOCK_SIZE_STR > " and " MAX_BLOCK_SIZE_STR, > - .get = qdev_propinfo_get_size32, > + .get = object_propinfo_get_size32, > .set = set_blocksize, > - .set_default_value = qdev_propinfo_set_default_value_uint, > + .set_default_value = object_propinfo_set_default_value_uint, > }; > > /* --- Block device error handling policy --- */ > @@ -580,9 +580,9 @@ const PropertyInfo qdev_prop_blockdev_on_error = { > .description = "Error handling policy, " > "report/ignore/enospc/stop/auto", > .enum_table = &BlockdevOnError_lookup, > - .get = qdev_propinfo_get_enum, > - .set = qdev_propinfo_set_enum, > - .set_default_value = qdev_propinfo_set_default_value_enum, > + .get = object_propinfo_get_enum, > + .set = object_propinfo_set_enum, > + .set_default_value = object_propinfo_set_default_value_enum, > }; > > /* --- BIOS CHS translation */ > @@ -594,9 +594,9 @@ const PropertyInfo qdev_prop_bios_chs_trans = { > .description = "Logical CHS translation algorithm, " > "auto/none/lba/large/rechs", > .enum_table = &BiosAtaTranslation_lookup, > - .get = qdev_propinfo_get_enum, > - .set = qdev_propinfo_set_enum, > - .set_default_value = qdev_propinfo_set_default_value_enum, > + .get = object_propinfo_get_enum, > + .set = object_propinfo_set_enum, > + .set_default_value = object_propinfo_set_default_value_enum, > }; > > /* --- FDC default drive types */ > @@ -606,9 +606,9 @@ const PropertyInfo qdev_prop_fdc_drive_type = { > .description = "FDC drive type, " > "144/288/120/none/auto", > .enum_table = &FloppyDriveType_lookup, > - .get = qdev_propinfo_get_enum, > - .set = qdev_propinfo_set_enum, > - .set_default_value = qdev_propinfo_set_default_value_enum, > + .get = object_propinfo_get_enum, > + .set = object_propinfo_set_enum, > + .set_default_value = object_propinfo_set_default_value_enum, > }; > > /* --- MultiFDCompression --- */ > @@ -618,9 +618,9 @@ const PropertyInfo qdev_prop_multifd_compression = { > .description = "multifd_compression values, " > "none/zlib/zstd", > .enum_table = &MultiFDCompression_lookup, > - .get = qdev_propinfo_get_enum, > - .set = qdev_propinfo_set_enum, > - .set_default_value = qdev_propinfo_set_default_value_enum, > + .get = object_propinfo_get_enum, > + .set = object_propinfo_set_enum, > + .set_default_value = object_propinfo_set_default_value_enum, > }; > > /* --- Reserved Region --- */ > @@ -764,9 +764,9 @@ const PropertyInfo qdev_prop_pci_devfn = { > .name = "int32", > .description = "Slot and optional function number, example: 06.0 or > 06", > .print = print_pci_devfn, > - .get = qdev_propinfo_get_int32, > + .get = object_propinfo_get_int32, > .set = set_pci_devfn, > - .set_default_value = qdev_propinfo_set_default_value_int, > + .set_default_value = object_propinfo_set_default_value_int, > }; > > /* --- pci host address --- */ > @@ -879,9 +879,9 @@ const PropertyInfo qdev_prop_off_auto_pcibar = { > .name = "OffAutoPCIBAR", > .description = "off/auto/bar0/bar1/bar2/bar3/bar4/bar5", > .enum_table = &OffAutoPCIBAR_lookup, > - .get = qdev_propinfo_get_enum, > - .set = qdev_propinfo_set_enum, > - .set_default_value = qdev_propinfo_set_default_value_enum, > + .get = object_propinfo_get_enum, > + .set = object_propinfo_set_enum, > + .set_default_value = object_propinfo_set_default_value_enum, > }; > > /* --- PCIELinkSpeed 2_5/5/8/16 -- */ > @@ -951,7 +951,7 @@ const PropertyInfo qdev_prop_pcie_link_speed = { > .enum_table = &PCIELinkSpeed_lookup, > .get = get_prop_pcielinkspeed, > .set = set_prop_pcielinkspeed, > - .set_default_value = qdev_propinfo_set_default_value_enum, > + .set_default_value = object_propinfo_set_default_value_enum, > }; > > /* --- PCIELinkWidth 1/2/4/8/12/16/32 -- */ > @@ -1039,5 +1039,5 @@ const PropertyInfo qdev_prop_pcie_link_width = { > .enum_table = &PCIELinkWidth_lookup, > .get = get_prop_pcielinkwidth, > .set = set_prop_pcielinkwidth, > - .set_default_value = qdev_propinfo_set_default_value_enum, > + .set_default_value = object_propinfo_set_default_value_enum, > }; > diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c > index 5189626c09..e4aba2b237 100644 > --- a/hw/core/qdev-properties.c > +++ b/hw/core/qdev-properties.c > @@ -93,7 +93,7 @@ static ObjectPropertyAccessor *static_prop_setter(const > PropertyInfo *info) > return info->set ? static_prop_set : NULL; > } > > -void qdev_propinfo_get_enum(Object *obj, Visitor *v, const char *name, > +void object_propinfo_get_enum(Object *obj, Visitor *v, const char *name, > void *opaque, Error **errp) > { > Property *prop = opaque; > @@ -102,7 +102,7 @@ void qdev_propinfo_get_enum(Object *obj, Visitor *v, > const char *name, > visit_type_enum(v, prop->name, ptr, prop->info->enum_table, errp); > } > > -void qdev_propinfo_set_enum(Object *obj, Visitor *v, const char *name, > +void object_propinfo_set_enum(Object *obj, Visitor *v, const char *name, > void *opaque, Error **errp) > { > Property *prop = opaque; > @@ -111,7 +111,7 @@ void qdev_propinfo_set_enum(Object *obj, Visitor *v, > const char *name, > visit_type_enum(v, prop->name, ptr, prop->info->enum_table, errp); > } > > -void qdev_propinfo_set_default_value_enum(ObjectProperty *op, > +void object_propinfo_set_default_value_enum(ObjectProperty *op, > const Property *prop) > { > object_property_set_default_str(op, > @@ -120,9 +120,9 @@ void > qdev_propinfo_set_default_value_enum(ObjectProperty *op, > > const PropertyInfo qdev_prop_enum = { > .name = "enum", > - .get = qdev_propinfo_get_enum, > - .set = qdev_propinfo_set_enum, > - .set_default_value = qdev_propinfo_set_default_value_enum, > + .get = object_propinfo_get_enum, > + .set = object_propinfo_set_enum, > + .set_default_value = object_propinfo_set_default_value_enum, > }; > > /* Bit */ > @@ -275,13 +275,13 @@ static void set_uint8(Object *obj, Visitor *v, const > char *name, void *opaque, > visit_type_uint8(v, name, ptr, errp); > } > > -void qdev_propinfo_set_default_value_int(ObjectProperty *op, > +void object_propinfo_set_default_value_int(ObjectProperty *op, > const Property *prop) > { > object_property_set_default_int(op, prop->defval.i); > } > > -void qdev_propinfo_set_default_value_uint(ObjectProperty *op, > +void object_propinfo_set_default_value_uint(ObjectProperty *op, > const Property *prop) > { > object_property_set_default_uint(op, prop->defval.u); > @@ -291,7 +291,7 @@ const PropertyInfo qdev_prop_uint8 = { > .name = "uint8", > .get = get_uint8, > .set = set_uint8, > - .set_default_value = qdev_propinfo_set_default_value_uint, > + .set_default_value = object_propinfo_set_default_value_uint, > }; > > /* --- 16bit integer --- */ > @@ -318,7 +318,7 @@ const PropertyInfo qdev_prop_uint16 = { > .name = "uint16", > .get = get_uint16, > .set = set_uint16, > - .set_default_value = qdev_propinfo_set_default_value_uint, > + .set_default_value = object_propinfo_set_default_value_uint, > }; > > /* --- 32bit integer --- */ > @@ -341,7 +341,7 @@ static void set_uint32(Object *obj, Visitor *v, const > char *name, > visit_type_uint32(v, name, ptr, errp); > } > > -void qdev_propinfo_get_int32(Object *obj, Visitor *v, const char *name, > +void object_propinfo_get_int32(Object *obj, Visitor *v, const char *name, > void *opaque, Error **errp) > { > Property *prop = opaque; > @@ -363,14 +363,14 @@ const PropertyInfo qdev_prop_uint32 = { > .name = "uint32", > .get = get_uint32, > .set = set_uint32, > - .set_default_value = qdev_propinfo_set_default_value_uint, > + .set_default_value = object_propinfo_set_default_value_uint, > }; > > const PropertyInfo qdev_prop_int32 = { > .name = "int32", > - .get = qdev_propinfo_get_int32, > + .get = object_propinfo_get_int32, > .set = set_int32, > - .set_default_value = qdev_propinfo_set_default_value_int, > + .set_default_value = object_propinfo_set_default_value_int, > }; > > /* --- 64bit integer --- */ > @@ -415,14 +415,14 @@ const PropertyInfo qdev_prop_uint64 = { > .name = "uint64", > .get = get_uint64, > .set = set_uint64, > - .set_default_value = qdev_propinfo_set_default_value_uint, > + .set_default_value = object_propinfo_set_default_value_uint, > }; > > const PropertyInfo qdev_prop_int64 = { > .name = "int64", > .get = get_int64, > .set = set_int64, > - .set_default_value = qdev_propinfo_set_default_value_int, > + .set_default_value = object_propinfo_set_default_value_int, > }; > > /* --- string --- */ > @@ -474,14 +474,14 @@ const PropertyInfo qdev_prop_on_off_auto = { > .name = "OnOffAuto", > .description = "on/off/auto", > .enum_table = &OnOffAuto_lookup, > - .get = qdev_propinfo_get_enum, > - .set = qdev_propinfo_set_enum, > - .set_default_value = qdev_propinfo_set_default_value_enum, > + .get = object_propinfo_get_enum, > + .set = object_propinfo_set_enum, > + .set_default_value = object_propinfo_set_default_value_enum, > }; > > /* --- 32bit unsigned int 'size' type --- */ > > -void qdev_propinfo_get_size32(Object *obj, Visitor *v, const char *name, > +void object_propinfo_get_size32(Object *obj, Visitor *v, const char *name, > void *opaque, Error **errp) > { > Property *prop = opaque; > @@ -515,9 +515,9 @@ static void set_size32(Object *obj, Visitor *v, const > char *name, void *opaque, > > const PropertyInfo qdev_prop_size32 = { > .name = "size", > - .get = qdev_propinfo_get_size32, > + .get = object_propinfo_get_size32, > .set = set_size32, > - .set_default_value = qdev_propinfo_set_default_value_uint, > + .set_default_value = object_propinfo_set_default_value_uint, > }; > > /* --- UUID --- */ > @@ -686,7 +686,7 @@ const PropertyInfo qdev_prop_arraylen = { > .name = "uint32", > .get = get_uint32, > .set = set_prop_arraylen, > - .set_default_value = qdev_propinfo_set_default_value_uint, > + .set_default_value = object_propinfo_set_default_value_uint, > }; > > /* --- public helpers --- */ > @@ -885,7 +885,7 @@ const PropertyInfo qdev_prop_size = { > .name = "size", > .get = get_size, > .set = set_size, > - .set_default_value = qdev_propinfo_set_default_value_uint, > + .set_default_value = object_propinfo_set_default_value_uint, > }; > > /* --- object link property --- */ > -- > 2.28.0 > > > -- Marc-André Lureau <div dir="ltr"><div dir="ltr"> </div> <div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Fri, Oct 30, 2020 at 2:13 AM Eduardo Habkost <<a href="mailto:ehabkost@redhat.com">ehabkost@redhat.com</a>> wrote: </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">These functions will be moved to be part of QOM, so rename them. Signed-off-by: Eduardo Habkost <<a href="mailto:ehabkost@redhat.com" target="_blank">ehabkost@redhat.com</a>> </blockquote><div> </div><div><div>Reviewed-by: Marc-André Lureau <<a href="mailto:marcandre.lureau@redhat.com" target="_blank">marcandre.lureau@redhat.com</a>></div><div> </div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"> --- Cc: Paolo Bonzini <<a href="mailto:pbonzini@redhat.com" target="_blank">pbonzini@redhat.com</a>> Cc: "Daniel P. Berrangé" <<a href="mailto:berrange@redhat.com" target="_blank">berrange@redhat.com</a>> Cc: Eduardo Habkost <<a href="mailto:ehabkost@redhat.com" target="_blank">ehabkost@redhat.com</a>> Cc: <a href="mailto:qemu-devel@nongnu.org" target="_blank">qemu-devel@nongnu.org</a> --- hw/core/qdev-prop-internal.h | 28 +++++++++---------- hw/core/qdev-properties-system.c | 48 ++++++++++++++++---------------- hw/core/qdev-properties.c | 48 ++++++++++++++++---------------- 3 files changed, 62 insertions(+), 62 deletions(-) diff --git a/hw/core/qdev-prop-internal.h b/hw/core/qdev-prop-internal.h index c8006a21c7..41ec9e8942 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 -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 object_propinfo_get_enum(Object *obj, Visitor *v, const char *name, + void *opaque, Error **errp); +void object_propinfo_set_enum(Object *obj, Visitor *v, const char *name, + void *opaque, Error **errp); -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 object_propinfo_set_default_value_enum(ObjectProperty *op, + const Property *prop); +void object_propinfo_set_default_value_int(ObjectProperty *op, + const Property *prop); +void object_propinfo_set_default_value_uint(ObjectProperty *op, + const Property *prop); -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 object_propinfo_get_int32(Object *obj, Visitor *v, const char *name, + void *opaque, Error **errp); +void object_propinfo_get_size32(Object *obj, Visitor *v, const char *name, + void *opaque, Error **errp); /** * object_property_add_static: Add a static property to an object instance diff --git a/hw/core/qdev-properties-system.c b/hw/core/qdev-properties-system.c index 60a45f5620..d9355053d2 100644 --- a/hw/core/qdev-properties-system.c +++ b/hw/core/qdev-properties-system.c @@ -535,9 +535,9 @@ QEMU_BUILD_BUG_ON(sizeof(LostTickPolicy) != sizeof(int)); const PropertyInfo qdev_prop_losttickpolicy = { .name = "LostTickPolicy", .enum_table = &LostTickPolicy_lookup, - .get = qdev_propinfo_get_enum, - .set = qdev_propinfo_set_enum, - .set_default_value = qdev_propinfo_set_default_value_enum, + .get = object_propinfo_get_enum, + .set = object_propinfo_set_enum, + .set_default_value = object_propinfo_set_default_value_enum, }; /* --- blocksize --- */ @@ -566,9 +566,9 @@ const PropertyInfo qdev_prop_blocksize = { .name = "size", .description = "A power of two between " MIN_BLOCK_SIZE_STR " and " MAX_BLOCK_SIZE_STR, - .get = qdev_propinfo_get_size32, + .get = object_propinfo_get_size32, .set = set_blocksize, - .set_default_value = qdev_propinfo_set_default_value_uint, + .set_default_value = object_propinfo_set_default_value_uint, }; /* --- Block device error handling policy --- */ @@ -580,9 +580,9 @@ const PropertyInfo qdev_prop_blockdev_on_error = { .description = "Error handling policy, " "report/ignore/enospc/stop/auto", .enum_table = &BlockdevOnError_lookup, - .get = qdev_propinfo_get_enum, - .set = qdev_propinfo_set_enum, - .set_default_value = qdev_propinfo_set_default_value_enum, + .get = object_propinfo_get_enum, + .set = object_propinfo_set_enum, + .set_default_value = object_propinfo_set_default_value_enum, }; /* --- BIOS CHS translation */ @@ -594,9 +594,9 @@ const PropertyInfo qdev_prop_bios_chs_trans = { .description = "Logical CHS translation algorithm, " "auto/none/lba/large/rechs", .enum_table = &BiosAtaTranslation_lookup, - .get = qdev_propinfo_get_enum, - .set = qdev_propinfo_set_enum, - .set_default_value = qdev_propinfo_set_default_value_enum, + .get = object_propinfo_get_enum, + .set = object_propinfo_set_enum, + .set_default_value = object_propinfo_set_default_value_enum, }; /* --- FDC default drive types */ @@ -606,9 +606,9 @@ const PropertyInfo qdev_prop_fdc_drive_type = { .description = "FDC drive type, " "144/288/120/none/auto", .enum_table = &FloppyDriveType_lookup, - .get = qdev_propinfo_get_enum, - .set = qdev_propinfo_set_enum, - .set_default_value = qdev_propinfo_set_default_value_enum, + .get = object_propinfo_get_enum, + .set = object_propinfo_set_enum, + .set_default_value = object_propinfo_set_default_value_enum, }; /* --- MultiFDCompression --- */ @@ -618,9 +618,9 @@ const PropertyInfo qdev_prop_multifd_compression = { .description = "multifd_compression values, " "none/zlib/zstd", .enum_table = &MultiFDCompression_lookup, - .get = qdev_propinfo_get_enum, - .set = qdev_propinfo_set_enum, - .set_default_value = qdev_propinfo_set_default_value_enum, + .get = object_propinfo_get_enum, + .set = object_propinfo_set_enum, + .set_default_value = object_propinfo_set_default_value_enum, }; /* --- Reserved Region --- */ @@ -764,9 +764,9 @@ const PropertyInfo qdev_prop_pci_devfn = { .name = "int32", .description = "Slot and optional function number, example: 06.0 or 06", .print = print_pci_devfn, - .get = qdev_propinfo_get_int32, + .get = object_propinfo_get_int32, .set = set_pci_devfn, - .set_default_value = qdev_propinfo_set_default_value_int, + .set_default_value = object_propinfo_set_default_value_int, }; /* --- pci host address --- */ @@ -879,9 +879,9 @@ const PropertyInfo qdev_prop_off_auto_pcibar = { .name = "OffAutoPCIBAR", .description = "off/auto/bar0/bar1/bar2/bar3/bar4/bar5", .enum_table = &OffAutoPCIBAR_lookup, - .get = qdev_propinfo_get_enum, - .set = qdev_propinfo_set_enum, - .set_default_value = qdev_propinfo_set_default_value_enum, + .get = object_propinfo_get_enum, + .set = object_propinfo_set_enum, + .set_default_value = object_propinfo_set_default_value_enum, }; /* --- PCIELinkSpeed 2_5/5/8/16 -- */ @@ -951,7 +951,7 @@ const PropertyInfo qdev_prop_pcie_link_speed = { .enum_table = &PCIELinkSpeed_lookup, .get = get_prop_pcielinkspeed, .set = set_prop_pcielinkspeed, - .set_default_value = qdev_propinfo_set_default_value_enum, + .set_default_value = object_propinfo_set_default_value_enum, }; /* --- PCIELinkWidth 1/2/4/8/12/16/32 -- */ @@ -1039,5 +1039,5 @@ const PropertyInfo qdev_prop_pcie_link_width = { .enum_table = &PCIELinkWidth_lookup, .get = get_prop_pcielinkwidth, .set = set_prop_pcielinkwidth, - .set_default_value = qdev_propinfo_set_default_value_enum, + .set_default_value = object_propinfo_set_default_value_enum, }; diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c index 5189626c09..e4aba2b237 100644 --- a/hw/core/qdev-properties.c +++ b/hw/core/qdev-properties.c @@ -93,7 +93,7 @@ static ObjectPropertyAccessor *static_prop_setter(const PropertyInfo *info) return info->set ? static_prop_set : NULL; } -void qdev_propinfo_get_enum(Object *obj, Visitor *v, const char *name, +void object_propinfo_get_enum(Object *obj, Visitor *v, const char *name, void *opaque, Error **errp) { Property *prop = opaque; @@ -102,7 +102,7 @@ void qdev_propinfo_get_enum(Object *obj, Visitor *v, const char *name, visit_type_enum(v, prop->name, ptr, prop->info->enum_table, errp); } -void qdev_propinfo_set_enum(Object *obj, Visitor *v, const char *name, +void object_propinfo_set_enum(Object *obj, Visitor *v, const char *name, void *opaque, Error **errp) { Property *prop = opaque; @@ -111,7 +111,7 @@ void qdev_propinfo_set_enum(Object *obj, Visitor *v, const char *name, visit_type_enum(v, prop->name, ptr, prop->info->enum_table, errp); } -void qdev_propinfo_set_default_value_enum(ObjectProperty *op, +void object_propinfo_set_default_value_enum(ObjectProperty *op, const Property *prop) { object_property_set_default_str(op, @@ -120,9 +120,9 @@ void qdev_propinfo_set_default_value_enum(ObjectProperty *op, const PropertyInfo qdev_prop_enum = { .name = "enum", - .get = qdev_propinfo_get_enum, - .set = qdev_propinfo_set_enum, - .set_default_value = qdev_propinfo_set_default_value_enum, + .get = object_propinfo_get_enum, + .set = object_propinfo_set_enum, + .set_default_value = object_propinfo_set_default_value_enum, }; /* Bit */ @@ -275,13 +275,13 @@ static void set_uint8(Object *obj, Visitor *v, const char *name, void *opaque, visit_type_uint8(v, name, ptr, errp); } -void qdev_propinfo_set_default_value_int(ObjectProperty *op, +void object_propinfo_set_default_value_int(ObjectProperty *op, const Property *prop) { object_property_set_default_int(op, prop->defval.i); } -void qdev_propinfo_set_default_value_uint(ObjectProperty *op, +void object_propinfo_set_default_value_uint(ObjectProperty *op, const Property *prop) { object_property_set_default_uint(op, prop->defval.u); @@ -291,7 +291,7 @@ const PropertyInfo qdev_prop_uint8 = { .name = "uint8", .get = get_uint8, .set = set_uint8, - .set_default_value = qdev_propinfo_set_default_value_uint, + .set_default_value = object_propinfo_set_default_value_uint, }; /* --- 16bit integer --- */ @@ -318,7 +318,7 @@ const PropertyInfo qdev_prop_uint16 = { .name = "uint16", .get = get_uint16, .set = set_uint16, - .set_default_value = qdev_propinfo_set_default_value_uint, + .set_default_value = object_propinfo_set_default_value_uint, }; /* --- 32bit integer --- */ @@ -341,7 +341,7 @@ static void set_uint32(Object *obj, Visitor *v, const char *name, visit_type_uint32(v, name, ptr, errp); } -void qdev_propinfo_get_int32(Object *obj, Visitor *v, const char *name, +void object_propinfo_get_int32(Object *obj, Visitor *v, const char *name, void *opaque, Error **errp) { Property *prop = opaque; @@ -363,14 +363,14 @@ const PropertyInfo qdev_prop_uint32 = { .name = "uint32", .get = get_uint32, .set = set_uint32, - .set_default_value = qdev_propinfo_set_default_value_uint, + .set_default_value = object_propinfo_set_default_value_uint, }; const PropertyInfo qdev_prop_int32 = { .name = "int32", - .get = qdev_propinfo_get_int32, + .get = object_propinfo_get_int32, .set = set_int32, - .set_default_value = qdev_propinfo_set_default_value_int, + .set_default_value = object_propinfo_set_default_value_int, }; /* --- 64bit integer --- */ @@ -415,14 +415,14 @@ const PropertyInfo qdev_prop_uint64 = { .name = "uint64", .get = get_uint64, .set = set_uint64, - .set_default_value = qdev_propinfo_set_default_value_uint, + .set_default_value = object_propinfo_set_default_value_uint, }; const PropertyInfo qdev_prop_int64 = { .name = "int64", .get = get_int64, .set = set_int64, - .set_default_value = qdev_propinfo_set_default_value_int, + .set_default_value = object_propinfo_set_default_value_int, }; /* --- string --- */ @@ -474,14 +474,14 @@ const PropertyInfo qdev_prop_on_off_auto = { .name = "OnOffAuto", .description = "on/off/auto", .enum_table = &OnOffAuto_lookup, - .get = qdev_propinfo_get_enum, - .set = qdev_propinfo_set_enum, - .set_default_value = qdev_propinfo_set_default_value_enum, + .get = object_propinfo_get_enum, + .set = object_propinfo_set_enum, + .set_default_value = object_propinfo_set_default_value_enum, }; /* --- 32bit unsigned int 'size' type --- */ -void qdev_propinfo_get_size32(Object *obj, Visitor *v, const char *name, +void object_propinfo_get_size32(Object *obj, Visitor *v, const char *name, void *opaque, Error **errp) { Property *prop = opaque; @@ -515,9 +515,9 @@ static void set_size32(Object *obj, Visitor *v, const char *name, void *opaque, const PropertyInfo qdev_prop_size32 = { .name = "size", - .get = qdev_propinfo_get_size32, + .get = object_propinfo_get_size32, .set = set_size32, - .set_default_value = qdev_propinfo_set_default_value_uint, + .set_default_value = object_propinfo_set_default_value_uint, }; /* --- UUID --- */ @@ -686,7 +686,7 @@ const PropertyInfo qdev_prop_arraylen = { .name = "uint32", .get = get_uint32, .set = set_prop_arraylen, - .set_default_value = qdev_propinfo_set_default_value_uint, + .set_default_value = object_propinfo_set_default_value_uint, }; /* --- public helpers --- */ @@ -885,7 +885,7 @@ const PropertyInfo qdev_prop_size = { .name = "size", .get = get_size, .set = set_size, - .set_default_value = qdev_propinfo_set_default_value_uint, + .set_default_value = object_propinfo_set_default_value_uint, }; /* --- object link property --- */ -- 2.28.0 </blockquote></div> -- <div dir="ltr" class="gmail_signature">Marc-André Lureau </div></div>

diff --git a/hw/core/qdev-prop-internal.h b/hw/core/qdev-prop-internal.h index c8006a21c7..41ec9e8942 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 -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 object_propinfo_get_enum(Object *obj, Visitor *v, const char *name, + void *opaque, Error **errp); +void object_propinfo_set_enum(Object *obj, Visitor *v, const char *name, + void *opaque, Error **errp); -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 object_propinfo_set_default_value_enum(ObjectProperty *op, + const Property *prop); +void object_propinfo_set_default_value_int(ObjectProperty *op, + const Property *prop); +void object_propinfo_set_default_value_uint(ObjectProperty *op, + const Property *prop); -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 object_propinfo_get_int32(Object *obj, Visitor *v, const char *name, + void *opaque, Error **errp); +void object_propinfo_get_size32(Object *obj, Visitor *v, const char *name, + void *opaque, Error **errp); /** * object_property_add_static: Add a static property to an object instance diff --git a/hw/core/qdev-properties-system.c b/hw/core/qdev-properties-system.c index 60a45f5620..d9355053d2 100644 --- a/hw/core/qdev-properties-system.c +++ b/hw/core/qdev-properties-system.c @@ -535,9 +535,9 @@ QEMU_BUILD_BUG_ON(sizeof(LostTickPolicy) != sizeof(int)); const PropertyInfo qdev_prop_losttickpolicy = { .name = "LostTickPolicy", .enum_table = &LostTickPolicy_lookup, - .get = qdev_propinfo_get_enum, - .set = qdev_propinfo_set_enum, - .set_default_value = qdev_propinfo_set_default_value_enum, + .get = object_propinfo_get_enum, + .set = object_propinfo_set_enum, + .set_default_value = object_propinfo_set_default_value_enum, }; /* --- blocksize --- */ @@ -566,9 +566,9 @@ const PropertyInfo qdev_prop_blocksize = { .name = "size", .description = "A power of two between " MIN_BLOCK_SIZE_STR " and " MAX_BLOCK_SIZE_STR, - .get = qdev_propinfo_get_size32, + .get = object_propinfo_get_size32, .set = set_blocksize, - .set_default_value = qdev_propinfo_set_default_value_uint, + .set_default_value = object_propinfo_set_default_value_uint, }; /* --- Block device error handling policy --- */ @@ -580,9 +580,9 @@ const PropertyInfo qdev_prop_blockdev_on_error = { .description = "Error handling policy, " "report/ignore/enospc/stop/auto", .enum_table = &BlockdevOnError_lookup, - .get = qdev_propinfo_get_enum, - .set = qdev_propinfo_set_enum, - .set_default_value = qdev_propinfo_set_default_value_enum, + .get = object_propinfo_get_enum, + .set = object_propinfo_set_enum, + .set_default_value = object_propinfo_set_default_value_enum, }; /* --- BIOS CHS translation */ @@ -594,9 +594,9 @@ const PropertyInfo qdev_prop_bios_chs_trans = { .description = "Logical CHS translation algorithm, " "auto/none/lba/large/rechs", .enum_table = &BiosAtaTranslation_lookup, - .get = qdev_propinfo_get_enum, - .set = qdev_propinfo_set_enum, - .set_default_value = qdev_propinfo_set_default_value_enum, + .get = object_propinfo_get_enum, + .set = object_propinfo_set_enum, + .set_default_value = object_propinfo_set_default_value_enum, }; /* --- FDC default drive types */ @@ -606,9 +606,9 @@ const PropertyInfo qdev_prop_fdc_drive_type = { .description = "FDC drive type, " "144/288/120/none/auto", .enum_table = &FloppyDriveType_lookup, - .get = qdev_propinfo_get_enum, - .set = qdev_propinfo_set_enum, - .set_default_value = qdev_propinfo_set_default_value_enum, + .get = object_propinfo_get_enum, + .set = object_propinfo_set_enum, + .set_default_value = object_propinfo_set_default_value_enum, }; /* --- MultiFDCompression --- */ @@ -618,9 +618,9 @@ const PropertyInfo qdev_prop_multifd_compression = { .description = "multifd_compression values, " "none/zlib/zstd", .enum_table = &MultiFDCompression_lookup, - .get = qdev_propinfo_get_enum, - .set = qdev_propinfo_set_enum, - .set_default_value = qdev_propinfo_set_default_value_enum, + .get = object_propinfo_get_enum, + .set = object_propinfo_set_enum, + .set_default_value = object_propinfo_set_default_value_enum, }; /* --- Reserved Region --- */ @@ -764,9 +764,9 @@ const PropertyInfo qdev_prop_pci_devfn = { .name = "int32", .description = "Slot and optional function number, example: 06.0 or 06", .print = print_pci_devfn, - .get = qdev_propinfo_get_int32, + .get = object_propinfo_get_int32, .set = set_pci_devfn, - .set_default_value = qdev_propinfo_set_default_value_int, + .set_default_value = object_propinfo_set_default_value_int, }; /* --- pci host address --- */ @@ -879,9 +879,9 @@ const PropertyInfo qdev_prop_off_auto_pcibar = { .name = "OffAutoPCIBAR", .description = "off/auto/bar0/bar1/bar2/bar3/bar4/bar5", .enum_table = &OffAutoPCIBAR_lookup, - .get = qdev_propinfo_get_enum, - .set = qdev_propinfo_set_enum, - .set_default_value = qdev_propinfo_set_default_value_enum, + .get = object_propinfo_get_enum, + .set = object_propinfo_set_enum, + .set_default_value = object_propinfo_set_default_value_enum, }; /* --- PCIELinkSpeed 2_5/5/8/16 -- */ @@ -951,7 +951,7 @@ const PropertyInfo qdev_prop_pcie_link_speed = { .enum_table = &PCIELinkSpeed_lookup, .get = get_prop_pcielinkspeed, .set = set_prop_pcielinkspeed, - .set_default_value = qdev_propinfo_set_default_value_enum, + .set_default_value = object_propinfo_set_default_value_enum, }; /* --- PCIELinkWidth 1/2/4/8/12/16/32 -- */ @@ -1039,5 +1039,5 @@ const PropertyInfo qdev_prop_pcie_link_width = { .enum_table = &PCIELinkWidth_lookup, .get = get_prop_pcielinkwidth, .set = set_prop_pcielinkwidth, - .set_default_value = qdev_propinfo_set_default_value_enum, + .set_default_value = object_propinfo_set_default_value_enum, }; diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c index 5189626c09..e4aba2b237 100644 --- a/hw/core/qdev-properties.c +++ b/hw/core/qdev-properties.c @@ -93,7 +93,7 @@ static ObjectPropertyAccessor *static_prop_setter(const PropertyInfo *info) return info->set ? static_prop_set : NULL; } -void qdev_propinfo_get_enum(Object *obj, Visitor *v, const char *name, +void object_propinfo_get_enum(Object *obj, Visitor *v, const char *name, void *opaque, Error **errp) { Property *prop = opaque; @@ -102,7 +102,7 @@ void qdev_propinfo_get_enum(Object *obj, Visitor *v, const char *name, visit_type_enum(v, prop->name, ptr, prop->info->enum_table, errp); } -void qdev_propinfo_set_enum(Object *obj, Visitor *v, const char *name, +void object_propinfo_set_enum(Object *obj, Visitor *v, const char *name, void *opaque, Error **errp) { Property *prop = opaque; @@ -111,7 +111,7 @@ void qdev_propinfo_set_enum(Object *obj, Visitor *v, const char *name, visit_type_enum(v, prop->name, ptr, prop->info->enum_table, errp); } -void qdev_propinfo_set_default_value_enum(ObjectProperty *op, +void object_propinfo_set_default_value_enum(ObjectProperty *op, const Property *prop) { object_property_set_default_str(op, @@ -120,9 +120,9 @@ void qdev_propinfo_set_default_value_enum(ObjectProperty *op, const PropertyInfo qdev_prop_enum = { .name = "enum", - .get = qdev_propinfo_get_enum, - .set = qdev_propinfo_set_enum, - .set_default_value = qdev_propinfo_set_default_value_enum, + .get = object_propinfo_get_enum, + .set = object_propinfo_set_enum, + .set_default_value = object_propinfo_set_default_value_enum, }; /* Bit */ @@ -275,13 +275,13 @@ static void set_uint8(Object *obj, Visitor *v, const char *name, void *opaque, visit_type_uint8(v, name, ptr, errp); } -void qdev_propinfo_set_default_value_int(ObjectProperty *op, +void object_propinfo_set_default_value_int(ObjectProperty *op, const Property *prop) { object_property_set_default_int(op, prop->defval.i); } -void qdev_propinfo_set_default_value_uint(ObjectProperty *op, +void object_propinfo_set_default_value_uint(ObjectProperty *op, const Property *prop) { object_property_set_default_uint(op, prop->defval.u); @@ -291,7 +291,7 @@ const PropertyInfo qdev_prop_uint8 = { .name = "uint8", .get = get_uint8, .set = set_uint8, - .set_default_value = qdev_propinfo_set_default_value_uint, + .set_default_value = object_propinfo_set_default_value_uint, }; /* --- 16bit integer --- */ @@ -318,7 +318,7 @@ const PropertyInfo qdev_prop_uint16 = { .name = "uint16", .get = get_uint16, .set = set_uint16, - .set_default_value = qdev_propinfo_set_default_value_uint, + .set_default_value = object_propinfo_set_default_value_uint, }; /* --- 32bit integer --- */ @@ -341,7 +341,7 @@ static void set_uint32(Object *obj, Visitor *v, const char *name, visit_type_uint32(v, name, ptr, errp); } -void qdev_propinfo_get_int32(Object *obj, Visitor *v, const char *name, +void object_propinfo_get_int32(Object *obj, Visitor *v, const char *name, void *opaque, Error **errp) { Property *prop = opaque; @@ -363,14 +363,14 @@ const PropertyInfo qdev_prop_uint32 = { .name = "uint32", .get = get_uint32, .set = set_uint32, - .set_default_value = qdev_propinfo_set_default_value_uint, + .set_default_value = object_propinfo_set_default_value_uint, }; const PropertyInfo qdev_prop_int32 = { .name = "int32", - .get = qdev_propinfo_get_int32, + .get = object_propinfo_get_int32, .set = set_int32, - .set_default_value = qdev_propinfo_set_default_value_int, + .set_default_value = object_propinfo_set_default_value_int, }; /* --- 64bit integer --- */ @@ -415,14 +415,14 @@ const PropertyInfo qdev_prop_uint64 = { .name = "uint64", .get = get_uint64, .set = set_uint64, - .set_default_value = qdev_propinfo_set_default_value_uint, + .set_default_value = object_propinfo_set_default_value_uint, }; const PropertyInfo qdev_prop_int64 = { .name = "int64", .get = get_int64, .set = set_int64, - .set_default_value = qdev_propinfo_set_default_value_int, + .set_default_value = object_propinfo_set_default_value_int, }; /* --- string --- */ @@ -474,14 +474,14 @@ const PropertyInfo qdev_prop_on_off_auto = { .name = "OnOffAuto", .description = "on/off/auto", .enum_table = &OnOffAuto_lookup, - .get = qdev_propinfo_get_enum, - .set = qdev_propinfo_set_enum, - .set_default_value = qdev_propinfo_set_default_value_enum, + .get = object_propinfo_get_enum, + .set = object_propinfo_set_enum, + .set_default_value = object_propinfo_set_default_value_enum, }; /* --- 32bit unsigned int 'size' type --- */ -void qdev_propinfo_get_size32(Object *obj, Visitor *v, const char *name, +void object_propinfo_get_size32(Object *obj, Visitor *v, const char *name, void *opaque, Error **errp) { Property *prop = opaque; @@ -515,9 +515,9 @@ static void set_size32(Object *obj, Visitor *v, const char *name, void *opaque, const PropertyInfo qdev_prop_size32 = { .name = "size", - .get = qdev_propinfo_get_size32, + .get = object_propinfo_get_size32, .set = set_size32, - .set_default_value = qdev_propinfo_set_default_value_uint, + .set_default_value = object_propinfo_set_default_value_uint, }; /* --- UUID --- */ @@ -686,7 +686,7 @@ const PropertyInfo qdev_prop_arraylen = { .name = "uint32", .get = get_uint32, .set = set_prop_arraylen, - .set_default_value = qdev_propinfo_set_default_value_uint, + .set_default_value = object_propinfo_set_default_value_uint, }; /* --- public helpers --- */ @@ -885,7 +885,7 @@ const PropertyInfo qdev_prop_size = { .name = "size", .get = get_size, .set = set_size, - .set_default_value = qdev_propinfo_set_default_value_uint, + .set_default_value = object_propinfo_set_default_value_uint, }; /* --- object link property --- */

[24/36] qdev: Rename qdev_propinfo_* to object_propinfo_*

Commit Message

Comments

Patch