[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH memory v2 2/9] qom: object: Ignore refs/unrefs of NU
From: |
Peter Crosthwaite |
Subject: |
[Qemu-devel] [PATCH memory v2 2/9] qom: object: Ignore refs/unrefs of NULL |
Date: |
Tue, 27 May 2014 02:00:39 -0700 |
Just do nothing if passed NULL for a ref or unref. This avoids
call sites that manage a combination of NULL or non-NULL pointers
having to add iffery around every ref and unref.
Signed-off-by: Peter Crosthwaite <address@hidden>
---
qom/object.c | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/qom/object.c b/qom/object.c
index e42b254..ec5adf4 100644
--- a/qom/object.c
+++ b/qom/object.c
@@ -714,11 +714,17 @@ GSList *object_class_get_list(const char *implements_type,
void object_ref(Object *obj)
{
+ if (!obj) {
+ return;
+ }
atomic_inc(&obj->ref);
}
void object_unref(Object *obj)
{
+ if (!obj) {
+ return;
+ }
g_assert(obj->ref > 0);
/* parent always holds a reference to its children */
@@ -1119,13 +1125,9 @@ static void object_set_link_property(Object *obj,
Visitor *v, void *opaque,
return;
}
- if (new_target) {
- object_ref(new_target);
- }
+ object_ref(new_target);
*child = new_target;
- if (old_target != NULL) {
- object_unref(old_target);
- }
+ object_unref(old_target);
}
static void object_release_link_property(Object *obj, const char *name,
--
1.9.3.1.ga73a6ad
- [Qemu-devel] [PATCH memory v2 0/9] Memory Region QOMification, Peter Crosthwaite, 2014/05/27
- [Qemu-devel] [PATCH memory v2 1/9] memory: Simplify mr_add_subregion() if-else, Peter Crosthwaite, 2014/05/27
- [Qemu-devel] [PATCH memory v2 2/9] qom: object: Ignore refs/unrefs of NULL,
Peter Crosthwaite <=
- [Qemu-devel] [PATCH memory v2 3/9] qom: Publish object_resolve_link, Peter Crosthwaite, 2014/05/27
- [Qemu-devel] [PATCH memory v2 4/9] memory: Coreify subregion add functionality, Peter Crosthwaite, 2014/05/27
- [Qemu-devel] [PATCH memory v2 5/9] memory: MemoryRegion: factor out memory region re-adder, Peter Crosthwaite, 2014/05/27
- [Qemu-devel] [PATCH memory v2 6/9] memory: MemoryRegion: QOMify, Peter Crosthwaite, 2014/05/27
- [Qemu-devel] [PATCH memory v2 7/9] memory: MemoryRegion: Add container and addr props, Peter Crosthwaite, 2014/05/27
- [Qemu-devel] [PATCH memory v2 8/9] memory: MemoryRegion: Add may-overlap and priority props, Peter Crosthwaite, 2014/05/27
- [Qemu-devel] [PATCH memory v2 9/9] memory: MemoryRegion: Add size property, Peter Crosthwaite, 2014/05/27