mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qom: make object_ref/unref use a void * instead of Object *.

Browse Source 
The object_ref/unref methods are intended for use with any subclass of
the base Object. Using "Object *" in the signature is not adding any
meaningful level of type safety, since callers simply use "OBJECT(ptr)"
and this expands to an unchecked cast "(Object *)".

By using "void *" we enable the object_unref() method to be used to
provide support for g_autoptr() with any subclass.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20200723181410.3145233-2-berrange@redhat.com>
Message-Id: <20200831210740.126168-2-ehabkost@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
Daniel P. Berrangé 2020-08-31 17:07:23 -04:00 committed by Eduardo Habkost
parent acbef3cc0c
commit c5a61e5a3c
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/qom/object.h
View File

@ -1035,7 +1035,7 @@ GSList *object_class_get_list_sorted(const char *implements_type,
* as its reference count is greater than zero. * as its reference count is greater than zero.
* Returns: @obj * Returns: @obj
*/ */
Object *object_ref(Object *obj); Object *object_ref(void *obj);
/** /**
* object_unref: * object_unref:
@ -1044,7 +1044,7 @@ Object *object_ref(Object *obj);
* Decrease the reference count of a object. A object cannot be freed as long * Decrease the reference count of a object. A object cannot be freed as long
* as its reference count is greater than zero. * as its reference count is greater than zero.
*/ */
void object_unref(Object *obj); void object_unref(void *obj);
/** /**
* object_property_try_add: * object_property_try_add:

6
qom/object.c
View File

@ -1124,8 +1124,9 @@ GSList *object_class_get_list_sorted(const char *implements_type,
object_class_cmp); object_class_cmp);
} }
Object *object_ref(Object *obj) Object *object_ref(void *objptr)
{ {
Object *obj = OBJECT(objptr);
if (!obj) { if (!obj) {
return NULL; return NULL;
} }
@ -1133,8 +1134,9 @@ Object *object_ref(Object *obj)
return obj; return obj;
} }
void object_unref(Object *obj) void object_unref(void *objptr)
{ {
Object *obj = OBJECT(objptr);
if (!obj) { if (!obj) {
return; return;
} }