david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qobject: Update coccinelle script to catch Q{INC, DEC}REF

Browse Source 
The recent commit b097efc0 used qobject_decref(QOBJECT(E)), even
though we already have QDECREF(E) for that purpose.  We can update
our coccinelle script to catch any future relapses; with that in
place, the rest of the patch is generated with:
 spatch --sp-file scripts/coccinelle/qobject.cocci \
        --macro-file scripts/cocci-macro-file.h --dir . --in-place

Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <20170624181008.25497-3-eblake@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
This commit is contained in:
Eric Blake 2017-06-24 12:10:08 -06:00 committed by Markus Armbruster
parent 187f47e947
commit 8a4613a0ab
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
monitor.c
View File

@ -3842,7 +3842,7 @@ static void handle_qmp_command(JSONMessageParser *parser, GQueue *tokens)
req_json = qobject_to_json(req); req_json = qobject_to_json(req);
trace_handle_qmp_command(mon, qstring_get_str(req_json)); trace_handle_qmp_command(mon, qstring_get_str(req_json));
qobject_decref(QOBJECT(req_json)); QDECREF(req_json);
rsp = qmp_dispatch(cur_mon->qmp.commands, req); rsp = qmp_dispatch(cur_mon->qmp.commands, req);

6
scripts/coccinelle/qobject.cocci
View File

@ -3,6 +3,12 @@
expression Obj, Key, E; expression Obj, Key, E;
@@ @@
( (
- qobject_incref(QOBJECT(E));
+ QINCREF(E);
|
- qobject_decref(QOBJECT(E));
+ QDECREF(E);
|
- qdict_put_obj(Obj, Key, QOBJECT(E)); - qdict_put_obj(Obj, Key, QOBJECT(E));
+ qdict_put(Obj, Key, E); + qdict_put(Obj, Key, E);
| |