mii/qemu
1
0
Fork 0
mirror of https://github.com/mii443/qemu.git synced 2025-08-22 15:15:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

qobject: Replace qobject_incref/QINCREF qobject_decref/QDECREF

Browse Source 
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>
This commit is contained in:
Marc-André Lureau
2018-04-19 17:01:43 +02:00
committed by Markus Armbruster
parent 3d3eacaecc
commit cb3e7f08ae
94 changed files with 609 additions and 613 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
qemu-io.c
View File

@ -86,7 +86,7 @@ static int openfile(char *name, int flags, bool writethrough, bool force_share,
if (qemuio_blk) {
error_report("file open already, try 'help close'");
QDECREF(opts);
qobject_unref(opts);
return 1;
}
@ -97,7 +97,7 @@ static int openfile(char *name, int flags, bool writethrough, bool force_share,
if (qdict_haskey(opts, BDRV_OPT_FORCE_SHARE)
&& !qdict_get_bool(opts, BDRV_OPT_FORCE_SHARE)) {
error_report("-U conflicts with image options");
QDECREF(opts);
qobject_unref(opts);
return 1;
}
qdict_put_bool(opts, BDRV_OPT_FORCE_SHARE, true);
@ -243,7 +243,7 @@ static int open_f(BlockBackend *blk, int argc, char **argv)
} else if (optind == argc) {
openfile(NULL, flags, writethrough, force_share, opts);
} else {
QDECREF(opts);
qobject_unref(opts);
qemuio_command_usage(&open_cmd);
}
return 0;