[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 06/15] qom: object: Ignore refs/unrefs of NULL
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 06/15] qom: object: Ignore refs/unrefs of NULL |
Date: |
Tue, 1 Jul 2014 10:34:56 +0200 |
From: Peter Crosthwaite <address@hidden>
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>
Signed-off-by: Paolo Bonzini <address@hidden>
---
qom/object.c | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/qom/object.c b/qom/object.c
index d5de8f6..0e8267b 100644
--- a/qom/object.c
+++ b/qom/object.c
@@ -711,11 +711,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 */
@@ -1160,13 +1166,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 Object *object_resolve_link_property(Object *parent, void *opaque,
const gchar *part)
--
1.8.3.1
- [Qemu-devel] [PULL for 2.1 00/15] MemoryRegion QOMification, Paolo Bonzini, 2014/07/01
- [Qemu-devel] [PULL 01/15] qom: add object_property_add_alias(), Paolo Bonzini, 2014/07/01
- [Qemu-devel] [PULL 03/15] qom: allow creating an alias of a child<> property, Paolo Bonzini, 2014/07/01
- [Qemu-devel] [PULL 05/15] qom: object: remove parent pointer when unparenting, Paolo Bonzini, 2014/07/01
- [Qemu-devel] [PULL 02/15] qom: add a generic mechanism to resolve paths, Paolo Bonzini, 2014/07/01
- [Qemu-devel] [PULL 06/15] qom: object: Ignore refs/unrefs of NULL,
Paolo Bonzini <=
- [Qemu-devel] [PULL 04/15] mc146818rtc: add "rtc-time" link to "/machine/rtc", Paolo Bonzini, 2014/07/01
- [Qemu-devel] [PULL 08/15] memory: MemoryRegion: use /machine as default owner, Paolo Bonzini, 2014/07/01
- [Qemu-devel] [PULL 09/15] memory: MemoryRegion: QOMify, Paolo Bonzini, 2014/07/01
- [Qemu-devel] [PULL 10/15] memory: MemoryRegion: replace owner field with QOM parent, Paolo Bonzini, 2014/07/01
- [Qemu-devel] [PULL 07/15] libqtest: escape strings in QMP commands, fix leak, Paolo Bonzini, 2014/07/01
- [Qemu-devel] [PULL 12/15] memory: MemoryRegion: Add may-overlap and priority props, Paolo Bonzini, 2014/07/01
- [Qemu-devel] [PULL 11/15] memory: MemoryRegion: Add container and addr props, Paolo Bonzini, 2014/07/01
- [Qemu-devel] [PULL 13/15] memory: MemoryRegion: Add size property, Paolo Bonzini, 2014/07/01
- [Qemu-devel] [PULL 14/15] memory: do not give a name to the internal exec.c regions, Paolo Bonzini, 2014/07/01
- [Qemu-devel] [PULL 15/15] qdev: correctly send DEVICE_DELETED for recursively-deleted devices, Paolo Bonzini, 2014/07/01