[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 05/15] qdev: Avoid using prop->name unnecessarily
From: |
Eduardo Habkost |
Subject: |
[PULL 05/15] qdev: Avoid using prop->name unnecessarily |
Date: |
Wed, 23 Dec 2020 16:27:25 -0500 |
We already get the property name as argument to the property
getter and setters, we don't need to use prop->name. This will
make it easier to remove the Property.name field in the future.
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: Stefan Berger <stefanb@linux.ibm.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Message-Id: <20201211220529.2290218-20-ehabkost@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
hw/core/qdev-properties-system.c | 14 +++++++-------
hw/core/qdev-properties.c | 4 ++--
backends/tpm/tpm_util.c | 2 +-
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/hw/core/qdev-properties-system.c b/hw/core/qdev-properties-system.c
index 9cf9bcb39d..42529c3b65 100644
--- a/hw/core/qdev-properties-system.c
+++ b/hw/core/qdev-properties-system.c
@@ -141,7 +141,7 @@ static void set_drive_helper(Object *obj, Visitor *v, const
char *name,
}
if (!blk) {
error_setg(errp, "Property '%s.%s' can't find value '%s'",
- object_get_typename(OBJECT(dev)), prop->name, str);
+ object_get_typename(OBJECT(dev)), name, str);
goto fail;
}
if (blk_attach_dev(blk, dev) < 0) {
@@ -262,10 +262,10 @@ static void set_chr(Object *obj, Visitor *v, const char
*name, void *opaque,
s = qemu_chr_find(str);
if (s == NULL) {
error_setg(errp, "Property '%s.%s' can't find value '%s'",
- object_get_typename(obj), prop->name, str);
+ object_get_typename(obj), name, str);
} else if (!qemu_chr_fe_init(be, s, errp)) {
error_prepend(errp, "Property '%s.%s' can't take value '%s': ",
- object_get_typename(obj), prop->name, str);
+ object_get_typename(obj), name, str);
}
g_free(str);
}
@@ -966,7 +966,7 @@ static void get_prop_pcielinkspeed(Object *obj, Visitor *v,
const char *name,
abort();
}
- visit_type_enum(v, prop->name, &speed, prop->info->enum_table, errp);
+ visit_type_enum(v, name, &speed, prop->info->enum_table, errp);
}
static void set_prop_pcielinkspeed(Object *obj, Visitor *v, const char *name,
@@ -982,7 +982,7 @@ static void set_prop_pcielinkspeed(Object *obj, Visitor *v,
const char *name,
return;
}
- if (!visit_type_enum(v, prop->name, &speed, prop->info->enum_table,
+ if (!visit_type_enum(v, name, &speed, prop->info->enum_table,
errp)) {
return;
}
@@ -1051,7 +1051,7 @@ static void get_prop_pcielinkwidth(Object *obj, Visitor
*v, const char *name,
abort();
}
- visit_type_enum(v, prop->name, &width, prop->info->enum_table, errp);
+ visit_type_enum(v, name, &width, prop->info->enum_table, errp);
}
static void set_prop_pcielinkwidth(Object *obj, Visitor *v, const char *name,
@@ -1067,7 +1067,7 @@ static void set_prop_pcielinkwidth(Object *obj, Visitor
*v, const char *name,
return;
}
- if (!visit_type_enum(v, prop->name, &width, prop->info->enum_table,
+ if (!visit_type_enum(v, name, &width, prop->info->enum_table,
errp)) {
return;
}
diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c
index 7495798a66..50734a1cd4 100644
--- a/hw/core/qdev-properties.c
+++ b/hw/core/qdev-properties.c
@@ -50,7 +50,7 @@ void qdev_propinfo_get_enum(Object *obj, Visitor *v, const
char *name,
Property *prop = opaque;
int *ptr = qdev_get_prop_ptr(obj, prop);
- visit_type_enum(v, prop->name, ptr, prop->info->enum_table, errp);
+ visit_type_enum(v, name, ptr, prop->info->enum_table, errp);
}
void qdev_propinfo_set_enum(Object *obj, Visitor *v, const char *name,
@@ -65,7 +65,7 @@ void qdev_propinfo_set_enum(Object *obj, Visitor *v, const
char *name,
return;
}
- visit_type_enum(v, prop->name, ptr, prop->info->enum_table, errp);
+ visit_type_enum(v, name, ptr, prop->info->enum_table, errp);
}
void qdev_propinfo_set_default_value_enum(ObjectProperty *op,
diff --git a/backends/tpm/tpm_util.c b/backends/tpm/tpm_util.c
index 3973105658..a5d997e7dc 100644
--- a/backends/tpm/tpm_util.c
+++ b/backends/tpm/tpm_util.c
@@ -63,7 +63,7 @@ static void set_tpm(Object *obj, Visitor *v, const char
*name, void *opaque,
s = qemu_find_tpm_be(str);
if (s == NULL) {
error_setg(errp, "Property '%s.%s' can't find value '%s'",
- object_get_typename(obj), prop->name, str);
+ object_get_typename(obj), name, str);
} else if (tpm_backend_init(s, TPM_IF(obj), errp) == 0) {
*be = s; /* weak reference, avoid cyclic ref */
}
--
2.28.0
- [PULL 00/15] Machine queue, 2020-12-23, Eduardo Habkost, 2020/12/23
- [PULL 03/15] sparc: Use DEFINE_PROP for nwindows property, Eduardo Habkost, 2020/12/23
- [PULL 01/15] qdev: Move softmmu properties to qdev-properties-system.h, Eduardo Habkost, 2020/12/23
- [PULL 02/15] qdev: Reuse DEFINE_PROP in all DEFINE_PROP_* macros, Eduardo Habkost, 2020/12/23
- [PULL 04/15] qdev: Get just property name at error_set_from_qdev_prop_error(), Eduardo Habkost, 2020/12/23
- [PULL 05/15] qdev: Avoid using prop->name unnecessarily,
Eduardo Habkost <=
- [PULL 06/15] qdev: Add name parameter to qdev_class_add_property(), Eduardo Habkost, 2020/12/23
- [PULL 07/15] qdev: Add name argument to PropertyInfo.create method, Eduardo Habkost, 2020/12/23
- [PULL 08/15] qdev: Wrap getters and setters in separate helpers, Eduardo Habkost, 2020/12/23
- [PULL 09/15] qdev: Move dev->realized check to qdev_property_set(), Eduardo Habkost, 2020/12/23
- [PULL 11/15] qdev: Make qdev_class_add_property() more flexible, Eduardo Habkost, 2020/12/23
- [PULL 10/15] qdev: Make PropertyInfo.create return ObjectProperty*, Eduardo Habkost, 2020/12/23
- [PULL 12/15] qdev: Move qdev_prop_tpm declaration to tpm_prop.h, Eduardo Habkost, 2020/12/23
- [PULL 13/15] qdev: Rename qdev_get_prop_ptr() to object_field_prop_ptr(), Eduardo Habkost, 2020/12/23
- [PULL 14/15] qdev: Avoid unnecessary DeviceState* variable at set_prop_arraylen(), Eduardo Habkost, 2020/12/23
- [PULL 15/15] bugfix: hostmem: Free host_nodes list right after visited, Eduardo Habkost, 2020/12/23