[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 09/10] qom: Clean up assertions to display values on
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PULL 09/10] qom: Clean up assertions to display values on failure |
Date: |
Wed, 18 Nov 2015 21:39:37 +0100 |
Instead of using g_assert() for integer comparisons, use
g_assert_cmpint() so that we can see the respective values.
While at it, fix one stray indentation.
Reviewed-by: Daniel P. Berrange <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>
---
qom/object.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/qom/object.c b/qom/object.c
index 19e7561..8c5c34e 100644
--- a/qom/object.c
+++ b/qom/object.c
@@ -265,7 +265,7 @@ static void type_initialize(TypeImpl *ti)
GSList *e;
int i;
- g_assert(parent->class_size <= ti->class_size);
+ g_assert_cmpint(parent->class_size, <=, ti->class_size);
memcpy(ti->class, parent->class, parent->class_size);
ti->class->interfaces = NULL;
@@ -347,9 +347,9 @@ void object_initialize_with_type(void *data, size_t size,
TypeImpl *type)
g_assert(type != NULL);
type_initialize(type);
- g_assert(type->instance_size >= sizeof(Object));
+ g_assert_cmpint(type->instance_size, >=, sizeof(Object));
g_assert(type->abstract == false);
- g_assert(size >= type->instance_size);
+ g_assert_cmpint(size, >=, type->instance_size);
memset(obj, 0, type->instance_size);
obj->class = type->class;
@@ -450,7 +450,7 @@ static void object_finalize(void *data)
object_property_del_all(obj);
object_deinit(obj, ti);
- g_assert(obj->ref == 0);
+ g_assert_cmpint(obj->ref, ==, 0);
if (obj->free) {
obj->free(obj);
}
@@ -872,7 +872,7 @@ void object_ref(Object *obj)
if (!obj) {
return;
}
- atomic_inc(&obj->ref);
+ atomic_inc(&obj->ref);
}
void object_unref(Object *obj)
@@ -880,7 +880,7 @@ void object_unref(Object *obj)
if (!obj) {
return;
}
- g_assert(obj->ref > 0);
+ g_assert_cmpint(obj->ref, >, 0);
/* parent always holds a reference to its children */
if (atomic_fetch_dec(&obj->ref) == 1) {
--
2.6.2
[Qemu-devel] [PULL 06/10] net: Convert net filter code to use object property iterators, Andreas Färber, 2015/11/18
[Qemu-devel] [PULL 08/10] qom: Replace object property list with GHashTable, Andreas Färber, 2015/11/18
[Qemu-devel] [PULL 05/10] ppc: Convert spapr code to use object property iterators, Andreas Färber, 2015/11/18
[Qemu-devel] [PULL 10/10] MAINTAINERS: Add check-qom-{interface, proplist} to QOM, Andreas Färber, 2015/11/18
[Qemu-devel] [PULL 09/10] qom: Clean up assertions to display values on failure,
Andreas Färber <=
[Qemu-devel] [PULL 07/10] qom: Add a test case for complex property finalization, Andreas Färber, 2015/11/18
Re: [Qemu-devel] [PULL for-2.5 00/10] QOM devices patch queue 2015-11-18, Peter Maydell, 2015/11/19