On Fri, Oct 30, 2020 at 2:19 AM Eduardo Habkost <ehabk...@redhat.com> wrote:
> The basic property types in qdev-properties.c are not going to be
> qdev-specific anymore. Rename the variables to prop_info_*.
>
> 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: Peter Maydell <peter.mayd...@linaro.org>
> Cc: Yoshinori Sato <ys...@users.sourceforge.jp>
> Cc: Dmitry Fleytman <dmitry.fleyt...@gmail.com>
> Cc: Jason Wang <jasow...@redhat.com>
> Cc: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk>
> Cc: Artyom Tarasenko <atar4q...@gmail.com>
> Cc: qemu-devel@nongnu.org
> Cc: qemu-...@nongnu.org
> ---
> include/hw/qdev-properties.h | 68 ++++++++++++++++++------------------
> hw/core/qdev-properties.c | 38 ++++++++++----------
> hw/intc/arm_gicv3_common.c | 2 +-
> hw/intc/rx_icu.c | 4 +--
> hw/misc/arm_sysctl.c | 4 +--
> hw/net/e1000e.c | 6 ++--
> target/arm/cpu.c | 2 +-
> target/sparc/cpu.c | 2 +-
> 8 files changed, 63 insertions(+), 63 deletions(-)
>
> diff --git a/include/hw/qdev-properties.h b/include/hw/qdev-properties.h
> index 2b00a1bcf6..7a08946448 100644
> --- a/include/hw/qdev-properties.h
> +++ b/include/hw/qdev-properties.h
> @@ -6,23 +6,23 @@
>
> /*** qdev-properties.c ***/
>
> -extern const PropertyInfo qdev_prop_bit;
> -extern const PropertyInfo qdev_prop_bit64;
> -extern const PropertyInfo qdev_prop_bool;
> -extern const PropertyInfo qdev_prop_enum;
> -extern const PropertyInfo qdev_prop_uint8;
> -extern const PropertyInfo qdev_prop_uint16;
> -extern const PropertyInfo qdev_prop_uint32;
> -extern const PropertyInfo qdev_prop_int32;
> -extern const PropertyInfo qdev_prop_uint64;
> -extern const PropertyInfo qdev_prop_int64;
> -extern const PropertyInfo qdev_prop_size;
> -extern const PropertyInfo qdev_prop_string;
> -extern const PropertyInfo qdev_prop_on_off_auto;
> -extern const PropertyInfo qdev_prop_size32;
> -extern const PropertyInfo qdev_prop_uuid;
> -extern const PropertyInfo qdev_prop_arraylen;
> -extern const PropertyInfo qdev_prop_link;
> +extern const PropertyInfo prop_info_bit;
> +extern const PropertyInfo prop_info_bit64;
> +extern const PropertyInfo prop_info_bool;
> +extern const PropertyInfo prop_info_enum;
> +extern const PropertyInfo prop_info_uint8;
> +extern const PropertyInfo prop_info_uint16;
> +extern const PropertyInfo prop_info_uint32;
> +extern const PropertyInfo prop_info_int32;
> +extern const PropertyInfo prop_info_uint64;
> +extern const PropertyInfo prop_info_int64;
> +extern const PropertyInfo prop_info_size;
> +extern const PropertyInfo prop_info_string;
> +extern const PropertyInfo prop_info_on_off_auto;
> +extern const PropertyInfo prop_info_size32;
> +extern const PropertyInfo prop_info_uuid;
> +extern const PropertyInfo prop_info_arraylen;
> +extern const PropertyInfo prop_info_link;
>
> #define DEFINE_PROP(_name, _state, _field, _prop, _type, ...) { \
> .name = (_name), \
> @@ -41,7 +41,7 @@ extern const PropertyInfo qdev_prop_link;
> DEFINE_PROP(_name, _state, _field, _prop, _type)
>
> #define DEFINE_PROP_BIT(_name, _state, _field, _bit, _defval) \
> - DEFINE_PROP(_name, _state, _field, qdev_prop_bit, uint32_t, \
> + DEFINE_PROP(_name, _state, _field, prop_info_bit, uint32_t, \
> .bitnr = (_bit), \
> .set_default = true, \
> .defval.u = (bool)_defval)
> @@ -55,13 +55,13 @@ extern const PropertyInfo qdev_prop_link;
> DEFINE_PROP(_name, _state, _field, _prop, _type)
>
> #define DEFINE_PROP_BIT64(_name, _state, _field, _bit, _defval) \
> - DEFINE_PROP(_name, _state, _field, qdev_prop_bit64, uint64_t, \
> + DEFINE_PROP(_name, _state, _field, prop_info_bit64, uint64_t, \
> .bitnr = (_bit), \
> .set_default = true, \
> .defval.u = (bool)_defval)
>
> #define DEFINE_PROP_BOOL(_name, _state, _field, _defval) \
> - DEFINE_PROP(_name, _state, _field, qdev_prop_bool, bool, \
> + DEFINE_PROP(_name, _state, _field, prop_info_bool, bool, \
> .set_default = true, \
> .defval.u = (bool)_defval)
>
> @@ -94,7 +94,7 @@ extern const PropertyInfo qdev_prop_link;
> #define DEFINE_PROP_ARRAY(_name, _state, _field, \
> _arrayfield, _arrayprop, _arraytype) \
> DEFINE_PROP((PROP_ARRAY_LEN_PREFIX _name), \
> - _state, _field, qdev_prop_arraylen, uint32_t, \
> + _state, _field, prop_info_arraylen, uint32_t, \
> .set_default = true, \
> .defval.u = 0, \
> .arrayinfo = &(_arrayprop), \
> @@ -102,34 +102,34 @@ extern const PropertyInfo qdev_prop_link;
> .arrayoffset = offsetof(_state, _arrayfield))
>
> #define DEFINE_PROP_LINK(_name, _state, _field, _type, _ptr_type) \
> - DEFINE_PROP(_name, _state, _field, qdev_prop_link, _ptr_type, \
> + DEFINE_PROP(_name, _state, _field, prop_info_link, _ptr_type, \
> .link_type = _type)
>
> #define DEFINE_PROP_UINT8(_n, _s, _f, _d) \
> - DEFINE_PROP_UNSIGNED(_n, _s, _f, _d, qdev_prop_uint8, uint8_t)
> + DEFINE_PROP_UNSIGNED(_n, _s, _f, _d, prop_info_uint8, uint8_t)
> #define DEFINE_PROP_UINT16(_n, _s, _f, _d) \
> - DEFINE_PROP_UNSIGNED(_n, _s, _f, _d, qdev_prop_uint16, uint16_t)
> + DEFINE_PROP_UNSIGNED(_n, _s, _f, _d, prop_info_uint16, uint16_t)
> #define DEFINE_PROP_UINT32(_n, _s, _f, _d) \
> - DEFINE_PROP_UNSIGNED(_n, _s, _f, _d, qdev_prop_uint32, uint32_t)
> + DEFINE_PROP_UNSIGNED(_n, _s, _f, _d, prop_info_uint32, uint32_t)
> #define DEFINE_PROP_INT32(_n, _s, _f, _d) \
> - DEFINE_PROP_SIGNED(_n, _s, _f, _d, qdev_prop_int32, int32_t)
> + DEFINE_PROP_SIGNED(_n, _s, _f, _d, prop_info_int32, int32_t)
> #define DEFINE_PROP_UINT64(_n, _s, _f, _d) \
> - DEFINE_PROP_UNSIGNED(_n, _s, _f, _d, qdev_prop_uint64, uint64_t)
> + DEFINE_PROP_UNSIGNED(_n, _s, _f, _d, prop_info_uint64, uint64_t)
> #define DEFINE_PROP_INT64(_n, _s, _f, _d) \
> - DEFINE_PROP_SIGNED(_n, _s, _f, _d, qdev_prop_int64, int64_t)
> + DEFINE_PROP_SIGNED(_n, _s, _f, _d, prop_info_int64, int64_t)
> #define DEFINE_PROP_SIZE(_n, _s, _f, _d) \
> - DEFINE_PROP_UNSIGNED(_n, _s, _f, _d, qdev_prop_size, uint64_t)
> + DEFINE_PROP_UNSIGNED(_n, _s, _f, _d, prop_info_size, uint64_t)
> #define DEFINE_PROP_STRING(_n, _s, _f) \
> - DEFINE_PROP(_n, _s, _f, qdev_prop_string, char*)
> + DEFINE_PROP(_n, _s, _f, prop_info_string, char*)
> #define DEFINE_PROP_ON_OFF_AUTO(_n, _s, _f, _d) \
> - DEFINE_PROP_SIGNED(_n, _s, _f, _d, qdev_prop_on_off_auto, OnOffAuto)
> + DEFINE_PROP_SIGNED(_n, _s, _f, _d, prop_info_on_off_auto, OnOffAuto)
> #define DEFINE_PROP_SIZE32(_n, _s, _f, _d) \
> - DEFINE_PROP_UNSIGNED(_n, _s, _f, _d, qdev_prop_size32, uint32_t)
> + DEFINE_PROP_UNSIGNED(_n, _s, _f, _d, prop_info_size32, uint32_t)
> #define DEFINE_PROP_UUID(_name, _state, _field) \
> - DEFINE_PROP(_name, _state, _field, qdev_prop_uuid, QemuUUID, \
> + DEFINE_PROP(_name, _state, _field, prop_info_uuid, QemuUUID, \
> .set_default = true)
> #define DEFINE_PROP_UUID_NODEFAULT(_name, _state, _field) \
> - DEFINE_PROP(_name, _state, _field, qdev_prop_uuid, QemuUUID)
> + DEFINE_PROP(_name, _state, _field, prop_info_uuid, QemuUUID)
>
> #define DEFINE_PROP_END_OF_LIST() \
> {}
> diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c
> index 1b27ba7236..59d65a7362 100644
> --- a/hw/core/qdev-properties.c
> +++ b/hw/core/qdev-properties.c
> @@ -76,7 +76,7 @@ void
> object_propinfo_set_default_value_enum(ObjectProperty *op,
> qapi_enum_lookup(prop->info->enum_table, prop->defval.i));
> }
>
> -const PropertyInfo qdev_prop_enum = {
> +const PropertyInfo prop_info_enum = {
> .name = "enum",
> .get = object_propinfo_get_enum,
> .set = object_propinfo_set_enum,
> @@ -87,7 +87,7 @@ const PropertyInfo qdev_prop_enum = {
>
> static uint32_t qdev_get_prop_mask(Property *prop)
> {
> - assert(prop->info == &qdev_prop_bit);
> + assert(prop->info == &prop_info_bit);
> return 0x1 << prop->bitnr;
> }
>
> @@ -129,7 +129,7 @@ static void set_default_value_bool(ObjectProperty *op,
> const Property *prop)
> object_property_set_default_bool(op, prop->defval.u);
> }
>
> -const PropertyInfo qdev_prop_bit = {
> +const PropertyInfo prop_info_bit = {
> .name = "bool",
> .description = "on/off",
> .get = prop_get_bit,
> @@ -141,7 +141,7 @@ const PropertyInfo qdev_prop_bit = {
>
> static uint64_t qdev_get_prop_mask64(Property *prop)
> {
> - assert(prop->info == &qdev_prop_bit64);
> + assert(prop->info == &prop_info_bit64);
> return 0x1ull << prop->bitnr;
> }
>
> @@ -178,7 +178,7 @@ static void prop_set_bit64(Object *obj, Visitor *v,
> const char *name,
> bit64_prop_set(obj, prop, value);
> }
>
> -const PropertyInfo qdev_prop_bit64 = {
> +const PropertyInfo prop_info_bit64 = {
> .name = "bool",
> .description = "on/off",
> .get = prop_get_bit64,
> @@ -206,7 +206,7 @@ static void set_bool(Object *obj, Visitor *v, const
> char *name, void *opaque,
> visit_type_bool(v, name, ptr, errp);
> }
>
> -const PropertyInfo qdev_prop_bool = {
> +const PropertyInfo prop_info_bool = {
> .name = "bool",
> .get = get_bool,
> .set = set_bool,
> @@ -245,7 +245,7 @@ void
> object_propinfo_set_default_value_uint(ObjectProperty *op,
> object_property_set_default_uint(op, prop->defval.u);
> }
>
> -const PropertyInfo qdev_prop_uint8 = {
> +const PropertyInfo prop_info_uint8 = {
> .name = "uint8",
> .get = get_uint8,
> .set = set_uint8,
> @@ -272,7 +272,7 @@ static void set_uint16(Object *obj, Visitor *v, const
> char *name,
> visit_type_uint16(v, name, ptr, errp);
> }
>
> -const PropertyInfo qdev_prop_uint16 = {
> +const PropertyInfo prop_info_uint16 = {
> .name = "uint16",
> .get = get_uint16,
> .set = set_uint16,
> @@ -317,14 +317,14 @@ static void set_int32(Object *obj, Visitor *v, const
> char *name, void *opaque,
> visit_type_int32(v, name, ptr, errp);
> }
>
> -const PropertyInfo qdev_prop_uint32 = {
> +const PropertyInfo prop_info_uint32 = {
> .name = "uint32",
> .get = get_uint32,
> .set = set_uint32,
> .set_default_value = object_propinfo_set_default_value_uint,
> };
>
> -const PropertyInfo qdev_prop_int32 = {
> +const PropertyInfo prop_info_int32 = {
> .name = "int32",
> .get = object_propinfo_get_int32,
> .set = set_int32,
> @@ -369,14 +369,14 @@ static void set_int64(Object *obj, Visitor *v, const
> char *name,
> visit_type_int64(v, name, ptr, errp);
> }
>
> -const PropertyInfo qdev_prop_uint64 = {
> +const PropertyInfo prop_info_uint64 = {
> .name = "uint64",
> .get = get_uint64,
> .set = set_uint64,
> .set_default_value = object_propinfo_set_default_value_uint,
> };
>
> -const PropertyInfo qdev_prop_int64 = {
> +const PropertyInfo prop_info_int64 = {
> .name = "int64",
> .get = get_int64,
> .set = set_int64,
> @@ -419,7 +419,7 @@ static void set_string(Object *obj, Visitor *v, const
> char *name,
> *ptr = str;
> }
>
> -const PropertyInfo qdev_prop_string = {
> +const PropertyInfo prop_info_string = {
> .name = "str",
> .release = release_string,
> .get = get_string,
> @@ -428,7 +428,7 @@ const PropertyInfo qdev_prop_string = {
>
> /* --- on/off/auto --- */
>
> -const PropertyInfo qdev_prop_on_off_auto = {
> +const PropertyInfo prop_info_on_off_auto = {
> .name = "OnOffAuto",
> .description = "on/off/auto",
> .enum_table = &OnOffAuto_lookup,
> @@ -471,7 +471,7 @@ static void set_size32(Object *obj, Visitor *v, const
> char *name, void *opaque,
> *ptr = value;
> }
>
> -const PropertyInfo qdev_prop_size32 = {
> +const PropertyInfo prop_info_size32 = {
> .name = "size",
> .get = object_propinfo_get_size32,
> .set = set_size32,
> @@ -519,7 +519,7 @@ static void set_default_uuid_auto(ObjectProperty *op,
> const Property *prop)
> object_property_set_default_str(op, UUID_VALUE_AUTO);
> }
>
> -const PropertyInfo qdev_prop_uuid = {
> +const PropertyInfo prop_info_uuid = {
> .name = "str",
> .description = "UUID (aka GUID) or \"" UUID_VALUE_AUTO
> "\" for random value (default)",
> @@ -640,7 +640,7 @@ static void set_prop_arraylen(Object *obj, Visitor *v,
> const char *name,
> }
> }
>
> -const PropertyInfo qdev_prop_arraylen = {
> +const PropertyInfo prop_info_arraylen = {
> .name = "uint32",
> .get = get_uint32,
> .set = set_prop_arraylen,
> @@ -839,7 +839,7 @@ static void set_size(Object *obj, Visitor *v, const
> char *name, void *opaque,
> visit_type_size(v, name, ptr, errp);
> }
>
> -const PropertyInfo qdev_prop_size = {
> +const PropertyInfo prop_info_size = {
> .name = "size",
> .get = get_size,
> .set = set_size,
> @@ -860,7 +860,7 @@ static ObjectProperty
> *create_link_property(ObjectClass *oc, Property *prop)
> OBJ_PROP_LINK_STRONG);
> }
>
> -const PropertyInfo qdev_prop_link = {
> +const PropertyInfo prop_info_link = {
> .name = "link",
> .create = create_link_property,
> };
> diff --git a/hw/intc/arm_gicv3_common.c b/hw/intc/arm_gicv3_common.c
> index 58ef65f589..6d06b4d4c5 100644
> --- a/hw/intc/arm_gicv3_common.c
> +++ b/hw/intc/arm_gicv3_common.c
> @@ -496,7 +496,7 @@ static Property arm_gicv3_common_properties[] = {
> DEFINE_PROP_UINT32("revision", GICv3State, revision, 3),
> DEFINE_PROP_BOOL("has-security-extensions", GICv3State,
> security_extn, 0),
> DEFINE_PROP_ARRAY("redist-region-count", GICv3State,
> nb_redist_regions,
> - redist_region_count, qdev_prop_uint32, uint32_t),
> + redist_region_count, prop_info_uint32, uint32_t),
> DEFINE_PROP_END_OF_LIST(),
> };
>
> diff --git a/hw/intc/rx_icu.c b/hw/intc/rx_icu.c
> index 94e17a9dea..823160d9a8 100644
> --- a/hw/intc/rx_icu.c
> +++ b/hw/intc/rx_icu.c
> @@ -365,9 +365,9 @@ static const VMStateDescription vmstate_rxicu = {
>
> static Property rxicu_properties[] = {
> DEFINE_PROP_ARRAY("ipr-map", RXICUState, nr_irqs, map,
> - qdev_prop_uint8, uint8_t),
> + prop_info_uint8, uint8_t),
> DEFINE_PROP_ARRAY("trigger-level", RXICUState, nr_sense, init_sense,
> - qdev_prop_uint8, uint8_t),
> + prop_info_uint8, uint8_t),
> DEFINE_PROP_END_OF_LIST(),
> };
>
> diff --git a/hw/misc/arm_sysctl.c b/hw/misc/arm_sysctl.c
> index 42d4693854..634f3d916f 100644
> --- a/hw/misc/arm_sysctl.c
> +++ b/hw/misc/arm_sysctl.c
> @@ -628,10 +628,10 @@ static Property arm_sysctl_properties[] = {
> DEFINE_PROP_UINT32("proc_id", arm_sysctl_state, proc_id, 0),
> /* Daughterboard power supply voltages (as reported via SYS_CFG) */
> DEFINE_PROP_ARRAY("db-voltage", arm_sysctl_state, db_num_vsensors,
> - db_voltage, qdev_prop_uint32, uint32_t),
> + db_voltage, prop_info_uint32, uint32_t),
> /* Daughterboard clock reset values (as reported via SYS_CFG) */
> DEFINE_PROP_ARRAY("db-clock", arm_sysctl_state, db_num_clocks,
> - db_clock_reset, qdev_prop_uint32, uint32_t),
> + db_clock_reset, prop_info_uint32, uint32_t),
> DEFINE_PROP_END_OF_LIST(),
> };
>
> diff --git a/hw/net/e1000e.c b/hw/net/e1000e.c
> index b6f1ae3c8f..7928939ae2 100644
> --- a/hw/net/e1000e.c
> +++ b/hw/net/e1000e.c
> @@ -686,15 +686,15 @@ static void e1000e_class_init(ObjectClass *class,
> void *data)
> dc->reset = e1000e_qdev_reset;
> dc->vmsd = &e1000e_vmstate;
>
> - e1000e_prop_disable_vnet = qdev_prop_uint8;
> + e1000e_prop_disable_vnet = prop_info_uint8;
> e1000e_prop_disable_vnet.description = "Do not use virtio headers, "
> "perform SW offloads emulation
> "
> "instead";
>
> - e1000e_prop_subsys_ven = qdev_prop_uint16;
> + e1000e_prop_subsys_ven = prop_info_uint16;
> e1000e_prop_subsys_ven.description = "PCI device Subsystem Vendor ID";
>
> - e1000e_prop_subsys = qdev_prop_uint16;
> + e1000e_prop_subsys = prop_info_uint16;
> e1000e_prop_subsys.description = "PCI device Subsystem ID";
>
> device_class_set_props(dc, e1000e_properties);
> diff --git a/target/arm/cpu.c b/target/arm/cpu.c
> index 07492e9f9a..cef92879b0 100644
> --- a/target/arm/cpu.c
> +++ b/target/arm/cpu.c
> @@ -1108,7 +1108,7 @@ static Property arm_cpu_has_mpu_property =
> static Property arm_cpu_pmsav7_dregion_property =
> DEFINE_PROP_UNSIGNED_NODEFAULT("pmsav7-dregion", ARMCPU,
> pmsav7_dregion,
> - qdev_prop_uint32, uint32_t);
> + prop_info_uint32, uint32_t);
>
> static bool arm_get_pmu(Object *obj, Error **errp)
> {
> diff --git a/target/sparc/cpu.c b/target/sparc/cpu.c
> index cf21efd85f..a03ec9b0e8 100644
> --- a/target/sparc/cpu.c
> +++ b/target/sparc/cpu.c
> @@ -839,7 +839,7 @@ static Property sparc_cpu_properties[] = {
> DEFINE_PROP_BIT("cmt", SPARCCPU, env.def.features, 12, false),
> DEFINE_PROP_BIT("gl", SPARCCPU, env.def.features, 13, false),
> DEFINE_PROP_UNSIGNED("iu-version", SPARCCPU, env.def.iu_version, 0,
> - qdev_prop_uint64, target_ulong),
> + prop_info_uint64, target_ulong),
> DEFINE_PROP_UINT32("fpu-version", SPARCCPU, env.def.fpu_version, 0),
> DEFINE_PROP_UINT32("mmu-version", SPARCCPU, env.def.mmu_version, 0),
> { .name = "nwindows", .info = &qdev_prop_nwindows },
> --
> 2.28.0
>
>
>
--
Marc-André Lureau
