[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 14/15] qdev: Avoid unnecessary DeviceState* variable at set_prop_a
From: |
Eduardo Habkost |
Subject: |
[PULL 14/15] qdev: Avoid unnecessary DeviceState* variable at set_prop_arraylen() |
Date: |
Wed, 23 Dec 2020 16:27:34 -0500 |
We're just doing pointer math with the device pointer, we can
simply use obj instead.
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Message-Id: <20201211220529.2290218-32-ehabkost@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
hw/core/qdev-properties.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c
index f3bbf05465..50f40949f5 100644
--- a/hw/core/qdev-properties.c
+++ b/hw/core/qdev-properties.c
@@ -559,10 +559,9 @@ static void set_prop_arraylen(Object *obj, Visitor *v,
const char *name,
* array-length field in the device struct, we have to create the
* array itself and dynamically add the corresponding properties.
*/
- DeviceState *dev = DEVICE(obj);
Property *prop = opaque;
uint32_t *alenptr = object_field_prop_ptr(obj, prop);
- void **arrayptr = (void *)dev + prop->arrayoffset;
+ void **arrayptr = (void *)obj + prop->arrayoffset;
void *eltptr;
const char *arrayname;
int i;
@@ -602,7 +601,7 @@ static void set_prop_arraylen(Object *obj, Visitor *v,
const char *name,
* they get the right answer despite the array element not actually
* being inside the device struct.
*/
- arrayprop->prop.offset = eltptr - (void *)dev;
+ arrayprop->prop.offset = eltptr - (void *)obj;
assert(object_field_prop_ptr(obj, &arrayprop->prop) == eltptr);
object_property_add(obj, propname,
arrayprop->prop.info->name,
--
2.28.0
- [PULL 04/15] qdev: Get just property name at error_set_from_qdev_prop_error(), (continued)
- [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, 2020/12/23
- [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 <=
- [PULL 15/15] bugfix: hostmem: Free host_nodes list right after visited, Eduardo Habkost, 2020/12/23