diff options
| author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2018-04-19 17:01:43 +0200 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2018-05-04 08:27:53 +0200 |
| commit | cb3e7f08aeaab0ab13e629ce8496dca150a449ba (patch) | |
| tree | 189830b93bea625aac19f86f26dc4b04cd99f5a3 /scripts | |
| parent | 3d3eacaeccaab718ea0e2ddaa578bfae9e311c59 (diff) | |
| download | qemu-cb3e7f08aeaab0ab13e629ce8496dca150a449ba.zip qemu-cb3e7f08aeaab0ab13e629ce8496dca150a449ba.tar.gz qemu-cb3e7f08aeaab0ab13e629ce8496dca150a449ba.tar.bz2 | |
qobject: Replace qobject_incref/QINCREF qobject_decref/QDECREF
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 <marcandre.lureau@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <20180419150145.24795-4-marcandre.lureau@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
[Rebased, semantic conflict resolved, commit message improved]
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/coccinelle/qobject.cocci | 8 | ||||
| -rw-r--r-- | scripts/qapi/events.py | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/scripts/coccinelle/qobject.cocci b/scripts/coccinelle/qobject.cocci index 47bcafe..9fee9c0 100644 --- a/scripts/coccinelle/qobject.cocci +++ b/scripts/coccinelle/qobject.cocci @@ -3,11 +3,11 @@ expression Obj, Key, E; @@ ( -- qobject_incref(QOBJECT(E)); -+ QINCREF(E); +- qobject_ref(QOBJECT(E)); ++ qobject_ref(E); | -- qobject_decref(QOBJECT(E)); -+ QDECREF(E); +- qobject_unref(QOBJECT(E)); ++ qobject_unref(E); | - qdict_put_obj(Obj, Key, QOBJECT(E)); + qdict_put(Obj, Key, E); diff --git a/scripts/qapi/events.py b/scripts/qapi/events.py index 3dc523c..4426861 100644 --- a/scripts/qapi/events.py +++ b/scripts/qapi/events.py @@ -142,7 +142,7 @@ out: ''') ret += mcgen(''' error_propagate(errp, err); - QDECREF(qmp); + qobject_unref(qmp); } ''') return ret |