From cb3e7f08aeaab0ab13e629ce8496dca150a449ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Date: Thu, 19 Apr 2018 17:01:43 +0200 Subject: qobject: Replace qobject_incref/QINCREF qobject_decref/QDECREF MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Now that we can safely call QOBJECT() on QObject * as well as its subtypes, we can have macros qobject_ref() / qobject_unref() that work everywhere instead of having to use QINCREF() / QDECREF() for QObject and qobject_incref() / qobject_decref() for its subtypes. The replacement is mechanical, except I broke a long line, and added a cast in monitor_qmp_cleanup_req_queue_locked(). Unlike qobject_decref(), qobject_unref() doesn't accept void *. Note that the new macros evaluate their argument exactly once, thus no need to shout them. Signed-off-by: Marc-André Lureau Reviewed-by: Eric Blake Message-Id: <20180419150145.24795-4-marcandre.lureau@redhat.com> Reviewed-by: Markus Armbruster [Rebased, semantic conflict resolved, commit message improved] Signed-off-by: Markus Armbruster --- qom/object.c | 16 ++++++++-------- qom/object_interfaces.c | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'qom') diff --git a/qom/object.c b/qom/object.c index 4677951..76a89af 100644 --- a/qom/object.c +++ b/qom/object.c @@ -1129,7 +1129,7 @@ void object_property_set_str(Object *obj, const char *value, QString *qstr = qstring_from_str(value); object_property_set_qobject(obj, QOBJECT(qstr), name, errp); - QDECREF(qstr); + qobject_unref(qstr); } char *object_property_get_str(Object *obj, const char *name, @@ -1147,7 +1147,7 @@ char *object_property_get_str(Object *obj, const char *name, error_setg(errp, QERR_INVALID_PARAMETER_TYPE, name, "string"); } - qobject_decref(ret); + qobject_unref(ret); return retval; } @@ -1187,7 +1187,7 @@ void object_property_set_bool(Object *obj, bool value, QBool *qbool = qbool_from_bool(value); object_property_set_qobject(obj, QOBJECT(qbool), name, errp); - QDECREF(qbool); + qobject_unref(qbool); } bool object_property_get_bool(Object *obj, const char *name, @@ -1208,7 +1208,7 @@ bool object_property_get_bool(Object *obj, const char *name, retval = qbool_get_bool(qbool); } - qobject_decref(ret); + qobject_unref(ret); return retval; } @@ -1218,7 +1218,7 @@ void object_property_set_int(Object *obj, int64_t value, QNum *qnum = qnum_from_int(value); object_property_set_qobject(obj, QOBJECT(qnum), name, errp); - QDECREF(qnum); + qobject_unref(qnum); } int64_t object_property_get_int(Object *obj, const char *name, @@ -1238,7 +1238,7 @@ int64_t object_property_get_int(Object *obj, const char *name, retval = -1; } - qobject_decref(ret); + qobject_unref(ret); return retval; } @@ -1248,7 +1248,7 @@ void object_property_set_uint(Object *obj, uint64_t value, QNum *qnum = qnum_from_uint(value); object_property_set_qobject(obj, QOBJECT(qnum), name, errp); - QDECREF(qnum); + qobject_unref(qnum); } uint64_t object_property_get_uint(Object *obj, const char *name, @@ -1267,7 +1267,7 @@ uint64_t object_property_get_uint(Object *obj, const char *name, retval = 0; } - qobject_decref(ret); + qobject_unref(ret); return retval; } diff --git a/qom/object_interfaces.c b/qom/object_interfaces.c index 2f76e1f..980ffc2 100644 --- a/qom/object_interfaces.c +++ b/qom/object_interfaces.c @@ -140,7 +140,7 @@ Object *user_creatable_add_opts(QemuOpts *opts, Error **errp) qemu_opts_set_id(opts, (char *) id); qemu_opt_set(opts, "qom-type", type, &error_abort); g_free(type); - QDECREF(pdict); + qobject_unref(pdict); return obj; } -- cgit v1.1