[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 31/53] qdev: Avoid unnecessary DeviceState* variable at set_pr
From: |
Eduardo Habkost |
Subject: |
[PATCH v3 31/53] qdev: Avoid unnecessary DeviceState* variable at set_prop_arraylen() |
Date: |
Thu, 12 Nov 2020 16:43:28 -0500 |
We're just doing pointer math with the device pointer, we can
simply use obj instead.
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@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-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 3d648b088d..9d25b49fc1 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
- [PATCH v3 21/53] qdev: Add name argument to PropertyInfo.create method, (continued)
- [PATCH v3 21/53] qdev: Add name argument to PropertyInfo.create method, Eduardo Habkost, 2020/11/12
- [PATCH v3 22/53] qdev: Wrap getters and setters in separate helpers, Eduardo Habkost, 2020/11/12
- [PATCH v3 23/53] qdev: Move dev->realized check to qdev_property_set(), Eduardo Habkost, 2020/11/12
- [PATCH v3 24/53] qdev: Make PropertyInfo.create return ObjectProperty*, Eduardo Habkost, 2020/11/12
- [PATCH v3 25/53] qdev: Make qdev_class_add_property() more flexible, Eduardo Habkost, 2020/11/12
- [PATCH v3 26/53] qdev: Separate generic and device-specific property registration, Eduardo Habkost, 2020/11/12
- [PATCH v3 27/53] qdev: Rename qdev_propinfo_* to field_prop_*, Eduardo Habkost, 2020/11/12
- [PATCH v3 28/53] qdev: Move qdev_prop_tpm declaration to tpm_prop.h, Eduardo Habkost, 2020/11/12
- [PATCH v3 29/53] qdev: Rename qdev_prop_* to prop_info_*, Eduardo Habkost, 2020/11/12
- [PATCH v3 30/53] qdev: Rename qdev_get_prop_ptr() to object_field_prop_ptr(), Eduardo Habkost, 2020/11/12
- [PATCH v3 31/53] qdev: Avoid unnecessary DeviceState* variable at set_prop_arraylen(),
Eduardo Habkost <=
- [PATCH v3 32/53] tests: Add unit test for qdev array properties, Eduardo Habkost, 2020/11/12
- [PATCH v3 33/53] qom: Add allow_set callback to ObjectProperty, Eduardo Habkost, 2020/11/12
- [PATCH v3 34/53] qdev: Make qdev_prop_allow_set() a ObjectProperty.allow_set callback, Eduardo Habkost, 2020/11/12
- [PATCH v3 36/53] qdev: Don't set .name_template for array elements, Eduardo Habkost, 2020/11/12
- [PATCH v3 35/53] qdev: Rename Property.name to Property.name_template, Eduardo Habkost, 2020/11/12
- [PATCH v3 37/53] qdev: Remove ArrayElementProperty.propname field, Eduardo Habkost, 2020/11/12
- [PATCH v3 38/53] qdev: Remove ArrayElementProperty.release field, Eduardo Habkost, 2020/11/12
- [PATCH v3 39/53] qdev: Get rid of ArrayElementProperty struct, Eduardo Habkost, 2020/11/12
- [PATCH v3 40/53] qdev: Rename array_element_release() to static_prop_release_dynamic_prop(), Eduardo Habkost, 2020/11/12
- [PATCH v3 41/53] qdev: Make object_property_add_field() copy the Property struct, Eduardo Habkost, 2020/11/12