falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

qom: remove object_delete 

This is now unused.  Document the initial reference count of an object
and when it will be freed/finalized.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Paolo Bonzini 2013-01-25 14:12:39 +01:00 committed by Anthony Liguori
parent 5c099537a6
commit b76facc35b
2 changed files with 10 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
include/qom/object.h
View File

@ -553,9 +553,9 @@ struct InterfaceClass
* object_new: * object_new:
* @typename: The name of the type of the object to instantiate. * @typename: The name of the type of the object to instantiate.
* *
* This function will initialize a new object using heap allocated memory. This * This function will initialize a new object using heap allocated memory.
* function should be paired with object_delete() to free the resources * The returned object has a reference count of 1, and will be freed when
* associated with the object. * the last reference is dropped.
* *
* Returns: The newly allocated and instantiated object. * Returns: The newly allocated and instantiated object.
*/ */
@ -565,30 +565,22 @@ Object *object_new(const char *typename);
* object_new_with_type: * object_new_with_type:
* @type: The type of the object to instantiate. * @type: The type of the object to instantiate.
* *
* This function will initialize a new object using heap allocated memory. This * This function will initialize a new object using heap allocated memory.
* function should be paired with object_delete() to free the resources * The returned object has a reference count of 1, and will be freed when
* associated with the object. * the last reference is dropped.
* *
* Returns: The newly allocated and instantiated object. * Returns: The newly allocated and instantiated object.
*/ */
Object *object_new_with_type(Type type); Object *object_new_with_type(Type type);
/**
* object_delete:
* @obj: The object to free.
*
* Finalize an object and then free the memory associated with it. This should
* be paired with object_new() to free the resources associated with an object.
*/
void object_delete(Object *obj);
/** /**
* object_initialize_with_type: * object_initialize_with_type:
* @obj: A pointer to the memory to be used for the object. * @obj: A pointer to the memory to be used for the object.
* @type: The type of the object to instantiate. * @type: The type of the object to instantiate.
* *
* This function will initialize an object. The memory for the object should * This function will initialize an object. The memory for the object should
* have already been allocated. * have already been allocated. The returned object has a reference count of 1,
* and will be finalized when the last reference is dropped.
*/ */
void object_initialize_with_type(void *data, Type type); void object_initialize_with_type(void *data, Type type);
@ -598,7 +590,8 @@ void object_initialize_with_type(void *data, Type type);
* @typename: The name of the type of the object to instantiate. * @typename: The name of the type of the object to instantiate.
* *
* This function will initialize an object. The memory for the object should * This function will initialize an object. The memory for the object should
* have already been allocated. * have already been allocated. The returned object has a reference count of 1,
* and will be finalized when the last reference is dropped.
*/ */
void object_initialize(void *obj, const char *typename); void object_initialize(void *obj, const char *typename);

7
qom/object.c
View File

@ -417,13 +417,6 @@ Object *object_new(const char *typename)
return object_new_with_type(ti); return object_new_with_type(ti);
} }
void object_delete(Object *obj)
{
object_unparent(obj);
g_assert(obj->ref == 1);
object_unref(obj);
}
Object *object_dynamic_cast(Object *obj, const char *typename) Object *object_dynamic_cast(Object *obj, const char *typename)
{ {
if (obj && object_class_dynamic_cast(object_get_class(obj), typename)) { if (obj && object_class_dynamic_cast(object_get_class(obj), typename)) {