At present, ObjectPropertyFlags is used to select accessors and such flags won't be stored in ObjectProperty itself. So it's not proper to extend this ObjectPropertyFlags for "deprecated" or "internal" flags. Therefore, rename ObjectPropertyFlags to ObjectPropertyAccessorFlags, and then the original name ObjectPropertyFlags can be used for other cases. Signed-off-by: Zhao Liu <zhao1.liu@intel.com> --- include/qom/object.h | 28 ++++++++++++++-------------- qom/object.c | 16 ++++++++-------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/include/qom/object.h b/include/qom/object.h index 26df6137b911..3f807a03f5aa 100644 --- a/include/qom/object.h +++ b/include/qom/object.h @@ -1846,14 +1846,14 @@ typedef enum { OBJ_PROP_FLAG_WRITE = 1 << 1, /* Automatically add a getter and a setter to the property */ OBJ_PROP_FLAG_READWRITE = (OBJ_PROP_FLAG_READ | OBJ_PROP_FLAG_WRITE), -} ObjectPropertyFlags; +} ObjectPropertyAccessorFlags; /** * object_property_add_uint8_ptr: * @obj: the object to add a property to * @name: the name of the property * @v: pointer to value - * @flags: bitwise-or'd ObjectPropertyFlags + * @flags: bitwise-or'd ObjectPropertyAccessorFlags * * Add an integer property in memory. This function will add a * property of type 'uint8'. @@ -1861,20 +1861,20 @@ typedef enum { * Returns: The newly added property on success, or %NULL on failure. */ ObjectProperty *object_property_add_uint8_ptr(Object *obj, const char *name, - const uint8_t *v, - ObjectPropertyFlags flags); + const uint8_t *v, + ObjectPropertyAccessorFlags flags); ObjectProperty *object_class_property_add_uint8_ptr(ObjectClass *klass, const char *name, const uint8_t *v, - ObjectPropertyFlags flags); + ObjectPropertyAccessorFlags flags); /** * object_property_add_uint16_ptr: * @obj: the object to add a property to * @name: the name of the property * @v: pointer to value - * @flags: bitwise-or'd ObjectPropertyFlags + * @flags: bitwise-or'd ObjectPropertyAccessorFlags * * Add an integer property in memory. This function will add a * property of type 'uint16'. @@ -1883,19 +1883,19 @@ ObjectProperty *object_class_property_add_uint8_ptr(ObjectClass *klass, */ ObjectProperty *object_property_add_uint16_ptr(Object *obj, const char *name, const uint16_t *v, - ObjectPropertyFlags flags); + ObjectPropertyAccessorFlags flags); ObjectProperty *object_class_property_add_uint16_ptr(ObjectClass *klass, const char *name, const uint16_t *v, - ObjectPropertyFlags flags); + ObjectPropertyAccessorFlags flags); /** * object_property_add_uint32_ptr: * @obj: the object to add a property to * @name: the name of the property * @v: pointer to value - * @flags: bitwise-or'd ObjectPropertyFlags + * @flags: bitwise-or'd ObjectPropertyAccessorFlags * * Add an integer property in memory. This function will add a * property of type 'uint32'. @@ -1904,19 +1904,19 @@ ObjectProperty *object_class_property_add_uint16_ptr(ObjectClass *klass, */ ObjectProperty *object_property_add_uint32_ptr(Object *obj, const char *name, const uint32_t *v, - ObjectPropertyFlags flags); + ObjectPropertyAccessorFlags flags); ObjectProperty *object_class_property_add_uint32_ptr(ObjectClass *klass, const char *name, const uint32_t *v, - ObjectPropertyFlags flags); + ObjectPropertyAccessorFlags flags); /** * object_property_add_uint64_ptr: * @obj: the object to add a property to * @name: the name of the property * @v: pointer to value - * @flags: bitwise-or'd ObjectPropertyFlags + * @flags: bitwise-or'd ObjectPropertyAccessorFlags * * Add an integer property in memory. This function will add a * property of type 'uint64'. @@ -1925,12 +1925,12 @@ ObjectProperty *object_class_property_add_uint32_ptr(ObjectClass *klass, */ ObjectProperty *object_property_add_uint64_ptr(Object *obj, const char *name, const uint64_t *v, - ObjectPropertyFlags flags); + ObjectPropertyAccessorFlags flags); ObjectProperty *object_class_property_add_uint64_ptr(ObjectClass *klass, const char *name, const uint64_t *v, - ObjectPropertyFlags flags); + ObjectPropertyAccessorFlags flags); /** * object_property_add_alias: diff --git a/qom/object.c b/qom/object.c index 4f32c1aba7d7..85d31bb64b36 100644 --- a/qom/object.c +++ b/qom/object.c @@ -2636,7 +2636,7 @@ static void property_set_uint64_ptr(Object *obj, Visitor *v, const char *name, ObjectProperty * object_property_add_uint8_ptr(Object *obj, const char *name, const uint8_t *v, - ObjectPropertyFlags flags) + ObjectPropertyAccessorFlags flags) { ObjectPropertyAccessor *getter = NULL; ObjectPropertyAccessor *setter = NULL; @@ -2656,7 +2656,7 @@ object_property_add_uint8_ptr(Object *obj, const char *name, ObjectProperty * object_class_property_add_uint8_ptr(ObjectClass *klass, const char *name, const uint8_t *v, - ObjectPropertyFlags flags) + ObjectPropertyAccessorFlags flags) { ObjectPropertyAccessor *getter = NULL; ObjectPropertyAccessor *setter = NULL; @@ -2676,7 +2676,7 @@ object_class_property_add_uint8_ptr(ObjectClass *klass, const char *name, ObjectProperty * object_property_add_uint16_ptr(Object *obj, const char *name, const uint16_t *v, - ObjectPropertyFlags flags) + ObjectPropertyAccessorFlags flags) { ObjectPropertyAccessor *getter = NULL; ObjectPropertyAccessor *setter = NULL; @@ -2696,7 +2696,7 @@ object_property_add_uint16_ptr(Object *obj, const char *name, ObjectProperty * object_class_property_add_uint16_ptr(ObjectClass *klass, const char *name, const uint16_t *v, - ObjectPropertyFlags flags) + ObjectPropertyAccessorFlags flags) { ObjectPropertyAccessor *getter = NULL; ObjectPropertyAccessor *setter = NULL; @@ -2716,7 +2716,7 @@ object_class_property_add_uint16_ptr(ObjectClass *klass, const char *name, ObjectProperty * object_property_add_uint32_ptr(Object *obj, const char *name, const uint32_t *v, - ObjectPropertyFlags flags) + ObjectPropertyAccessorFlags flags) { ObjectPropertyAccessor *getter = NULL; ObjectPropertyAccessor *setter = NULL; @@ -2736,7 +2736,7 @@ object_property_add_uint32_ptr(Object *obj, const char *name, ObjectProperty * object_class_property_add_uint32_ptr(ObjectClass *klass, const char *name, const uint32_t *v, - ObjectPropertyFlags flags) + ObjectPropertyAccessorFlags flags) { ObjectPropertyAccessor *getter = NULL; ObjectPropertyAccessor *setter = NULL; @@ -2756,7 +2756,7 @@ object_class_property_add_uint32_ptr(ObjectClass *klass, const char *name, ObjectProperty * object_property_add_uint64_ptr(Object *obj, const char *name, const uint64_t *v, - ObjectPropertyFlags flags) + ObjectPropertyAccessorFlags flags) { ObjectPropertyAccessor *getter = NULL; ObjectPropertyAccessor *setter = NULL; @@ -2776,7 +2776,7 @@ object_property_add_uint64_ptr(Object *obj, const char *name, ObjectProperty * object_class_property_add_uint64_ptr(ObjectClass *klass, const char *name, const uint64_t *v, - ObjectPropertyFlags flags) + ObjectPropertyAccessorFlags flags) { ObjectPropertyAccessor *getter = NULL; ObjectPropertyAccessor *setter = NULL; -- 2.34.1