On Fri, Oct 30, 2020 at 2:13 AM Eduardo Habkost <ehabk...@redhat.com> wrote:
> These functions will be moved to be part of QOM, so rename them.
>
> Signed-off-by: Eduardo Habkost <ehabk...@redhat.com>
>
Reviewed-by: Marc-André Lureau <marcandre.lur...@redhat.com>
> ---
> Cc: Paolo Bonzini <pbonz...@redhat.com>
> Cc: "Daniel P. Berrangé" <berra...@redhat.com>
> Cc: Eduardo Habkost <ehabk...@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
