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>
diff --git a/block/blkdebug.c b/block/blkdebug.c
index 5897124..689703d 100644
--- a/block/blkdebug.c
+++ b/block/blkdebug.c
@@ -845,12 +845,12 @@
opts = qdict_new();
qdict_put_str(opts, "driver", "blkdebug");
- QINCREF(bs->file->bs->full_open_options);
+ qobject_ref(bs->file->bs->full_open_options);
qdict_put(opts, "image", bs->file->bs->full_open_options);
for (e = qdict_first(options); e; e = qdict_next(options, e)) {
if (strcmp(qdict_entry_key(e), "x-image")) {
- qobject_incref(qdict_entry_value(e));
+ qobject_ref(qdict_entry_value(e));
qdict_put_obj(opts, qdict_entry_key(e), qdict_entry_value(e));
}
}
diff --git a/block/blkverify.c b/block/blkverify.c
index 331365b..3cffcb1 100644
--- a/block/blkverify.c
+++ b/block/blkverify.c
@@ -291,9 +291,9 @@
QDict *opts = qdict_new();
qdict_put_str(opts, "driver", "blkverify");
- QINCREF(bs->file->bs->full_open_options);
+ qobject_ref(bs->file->bs->full_open_options);
qdict_put(opts, "raw", bs->file->bs->full_open_options);
- QINCREF(s->test_file->bs->full_open_options);
+ qobject_ref(s->test_file->bs->full_open_options);
qdict_put(opts, "test", s->test_file->bs->full_open_options);
bs->full_open_options = opts;
diff --git a/block/crypto.c b/block/crypto.c
index bc6c7e3..7e7ad2d 100644
--- a/block/crypto.c
+++ b/block/crypto.c
@@ -305,7 +305,7 @@
ret = 0;
cleanup:
- QDECREF(cryptoopts);
+ qobject_unref(cryptoopts);
qapi_free_QCryptoBlockOpenOptions(open_opts);
return ret;
}
@@ -635,7 +635,7 @@
fail:
bdrv_unref(bs);
qapi_free_QCryptoBlockCreateOptions(create_opts);
- QDECREF(cryptoopts);
+ qobject_unref(cryptoopts);
return ret;
}
diff --git a/block/gluster.c b/block/gluster.c
index 4adc1a8..55be566 100644
--- a/block/gluster.c
+++ b/block/gluster.c
@@ -650,7 +650,7 @@
}
gsconf = NULL;
- QDECREF(backing_options);
+ qobject_unref(backing_options);
backing_options = NULL;
g_free(str);
str = NULL;
@@ -663,7 +663,7 @@
qapi_free_SocketAddress(gsconf);
qemu_opts_del(opts);
g_free(str);
- QDECREF(backing_options);
+ qobject_unref(backing_options);
errno = EINVAL;
return -errno;
}
diff --git a/block/iscsi.c b/block/iscsi.c
index f5aecfc..d19ae0e 100644
--- a/block/iscsi.c
+++ b/block/iscsi.c
@@ -2143,7 +2143,7 @@
} else {
ret = iscsi_open(bs, bs_options, 0, NULL);
}
- QDECREF(bs_options);
+ qobject_unref(bs_options);
if (ret != 0) {
goto out;
diff --git a/block/nbd.c b/block/nbd.c
index 1e2b3ba2..3e1693c 100644
--- a/block/nbd.c
+++ b/block/nbd.c
@@ -293,8 +293,8 @@
}
done:
- QDECREF(addr);
- qobject_decref(crumpled_addr);
+ qobject_unref(addr);
+ qobject_unref(crumpled_addr);
visit_free(iv);
return saddr;
}
diff --git a/block/nfs.c b/block/nfs.c
index 2577df4..66fddf1 100644
--- a/block/nfs.c
+++ b/block/nfs.c
@@ -567,7 +567,7 @@
v = qobject_input_visitor_new_keyval(crumpled);
visit_type_BlockdevOptionsNfs(v, NULL, &opts, &local_err);
visit_free(v);
- qobject_decref(crumpled);
+ qobject_unref(crumpled);
if (local_err) {
return NULL;
@@ -683,7 +683,7 @@
ret = 0;
out:
- QDECREF(options);
+ qobject_unref(options);
qapi_free_BlockdevCreateOptions(create_options);
return ret;
}
diff --git a/block/null.c b/block/null.c
index 806a863..700a2d0 100644
--- a/block/null.c
+++ b/block/null.c
@@ -244,7 +244,7 @@
static void null_refresh_filename(BlockDriverState *bs, QDict *opts)
{
- QINCREF(opts);
+ qobject_ref(opts);
qdict_del(opts, "filename");
if (!qdict_size(opts)) {
diff --git a/block/nvme.c b/block/nvme.c
index c4f3a7b..e192da9 100644
--- a/block/nvme.c
+++ b/block/nvme.c
@@ -1073,7 +1073,7 @@
static void nvme_refresh_filename(BlockDriverState *bs, QDict *opts)
{
- QINCREF(opts);
+ qobject_ref(opts);
qdict_del(opts, "filename");
if (!qdict_size(opts)) {
diff --git a/block/parallels.c b/block/parallels.c
index 799215e..045810d 100644
--- a/block/parallels.c
+++ b/block/parallels.c
@@ -651,7 +651,7 @@
qdict_put_str(qdict, "file", bs->node_name);
qobj = qdict_crumple(qdict, errp);
- QDECREF(qdict);
+ qobject_unref(qdict);
qdict = qobject_to(QDict, qobj);
if (qdict == NULL) {
ret = -EINVAL;
@@ -682,7 +682,7 @@
ret = 0;
done:
- QDECREF(qdict);
+ qobject_unref(qdict);
bdrv_unref(bs);
qapi_free_BlockdevCreateOptions(create_options);
return ret;
diff --git a/block/qapi.c b/block/qapi.c
index 04c6fc6..e12968f 100644
--- a/block/qapi.c
+++ b/block/qapi.c
@@ -773,7 +773,7 @@
visit_complete(v, &obj);
data = qdict_get(qobject_to(QDict, obj), "data");
dump_qobject(func_fprintf, f, 1, data);
- qobject_decref(obj);
+ qobject_unref(obj);
visit_free(v);
}
diff --git a/block/qcow.c b/block/qcow.c
index f928916..4b2f7db 100644
--- a/block/qcow.c
+++ b/block/qcow.c
@@ -315,7 +315,7 @@
goto fail;
}
- QDECREF(encryptopts);
+ qobject_unref(encryptopts);
qapi_free_QCryptoBlockOpenOptions(crypto_opts);
qemu_co_mutex_init(&s->lock);
return 0;
@@ -326,7 +326,7 @@
g_free(s->cluster_cache);
g_free(s->cluster_data);
qcrypto_block_free(s->crypto);
- QDECREF(encryptopts);
+ qobject_unref(encryptopts);
qapi_free_QCryptoBlockOpenOptions(crypto_opts);
return ret;
}
@@ -995,7 +995,7 @@
qdict_put_str(qdict, "file", bs->node_name);
qobj = qdict_crumple(qdict, errp);
- QDECREF(qdict);
+ qobject_unref(qdict);
qdict = qobject_to(QDict, qobj);
if (qdict == NULL) {
ret = -EINVAL;
@@ -1025,7 +1025,7 @@
ret = 0;
fail:
- QDECREF(qdict);
+ qobject_unref(qdict);
bdrv_unref(bs);
qapi_free_BlockdevCreateOptions(create_options);
return ret;
diff --git a/block/qcow2.c b/block/qcow2.c
index ef68772..2f36e63 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -1063,7 +1063,7 @@
ret = 0;
fail:
- QDECREF(encryptopts);
+ qobject_unref(encryptopts);
qemu_opts_del(opts);
opts = NULL;
return ret;
@@ -2183,7 +2183,7 @@
qemu_co_mutex_lock(&s->lock);
ret = qcow2_do_open(bs, options, flags, &local_err);
qemu_co_mutex_unlock(&s->lock);
- QDECREF(options);
+ qobject_unref(options);
if (local_err) {
error_propagate(errp, local_err);
error_prepend(errp, "Could not reopen qcow2 layer: ");
@@ -3139,7 +3139,7 @@
/* Now get the QAPI type BlockdevCreateOptions */
qobj = qdict_crumple(qdict, errp);
- QDECREF(qdict);
+ qobject_unref(qdict);
qdict = qobject_to(QDict, qobj);
if (qdict == NULL) {
ret = -EINVAL;
@@ -3168,7 +3168,7 @@
ret = 0;
finish:
- QDECREF(qdict);
+ qobject_unref(qdict);
bdrv_unref(bs);
qapi_free_BlockdevCreateOptions(create_options);
return ret;
diff --git a/block/qed.c b/block/qed.c
index 35ff505..1db8eaf 100644
--- a/block/qed.c
+++ b/block/qed.c
@@ -763,7 +763,7 @@
qdict_put_str(qdict, "file", bs->node_name);
qobj = qdict_crumple(qdict, errp);
- QDECREF(qdict);
+ qobject_unref(qdict);
qdict = qobject_to(QDict, qobj);
if (qdict == NULL) {
ret = -EINVAL;
@@ -789,7 +789,7 @@
ret = bdrv_qed_co_create(create_options, errp);
fail:
- QDECREF(qdict);
+ qobject_unref(qdict);
bdrv_unref(bs);
qapi_free_BlockdevCreateOptions(create_options);
return ret;
diff --git a/block/quorum.c b/block/quorum.c
index cfe484a..862cea3 100644
--- a/block/quorum.c
+++ b/block/quorum.c
@@ -1082,7 +1082,7 @@
children = qlist_new();
for (i = 0; i < s->num_children; i++) {
- QINCREF(s->children[i]->bs->full_open_options);
+ qobject_ref(s->children[i]->bs->full_open_options);
qlist_append(children, s->children[i]->bs->full_open_options);
}
diff --git a/block/rbd.c b/block/rbd.c
index c9359d0..a14b42f 100644
--- a/block/rbd.c
+++ b/block/rbd.c
@@ -226,7 +226,7 @@
done:
g_free(buf);
- QDECREF(keypairs);
+ qobject_unref(keypairs);
return;
}
@@ -275,17 +275,17 @@
key = qstring_get_str(name);
ret = rados_conf_set(cluster, key, qstring_get_str(value));
- QDECREF(value);
+ qobject_unref(value);
if (ret < 0) {
error_setg_errno(errp, -ret, "invalid conf option %s", key);
- QDECREF(name);
+ qobject_unref(name);
ret = -EINVAL;
break;
}
- QDECREF(name);
+ qobject_unref(name);
}
- QDECREF(keypairs);
+ qobject_unref(keypairs);
return ret;
}
@@ -449,7 +449,7 @@
}
exit:
- QDECREF(options);
+ qobject_unref(options);
qapi_free_BlockdevCreateOptions(create_options);
return ret;
}
@@ -664,7 +664,7 @@
v = qobject_input_visitor_new_keyval(crumpled);
visit_type_BlockdevOptionsRbd(v, NULL, &opts, &local_err);
visit_free(v);
- qobject_decref(crumpled);
+ qobject_unref(crumpled);
if (local_err) {
error_propagate(errp, local_err);
diff --git a/block/sheepdog.c b/block/sheepdog.c
index 387f59c..07529f4 100644
--- a/block/sheepdog.c
+++ b/block/sheepdog.c
@@ -567,8 +567,8 @@
done:
visit_free(iv);
- qobject_decref(crumpled_server);
- QDECREF(server);
+ qobject_unref(crumpled_server);
+ qobject_unref(server);
return saddr;
}
@@ -1883,7 +1883,7 @@
if (local_err) {
error_propagate(errp, local_err);
- qobject_decref(obj);
+ qobject_unref(obj);
return -EINVAL;
}
@@ -1901,7 +1901,7 @@
ret = sd_prealloc(bs, 0, size, errp);
fail:
bdrv_unref(bs);
- QDECREF(qdict);
+ qobject_unref(qdict);
return ret;
}
@@ -2226,7 +2226,7 @@
v = qobject_input_visitor_new_keyval(crumpled);
visit_type_BlockdevCreateOptions(v, NULL, &create_options, &local_err);
visit_free(v);
- qobject_decref(crumpled);
+ qobject_unref(crumpled);
if (local_err) {
error_propagate(errp, local_err);
@@ -2252,7 +2252,7 @@
ret = sd_co_create(create_options, errp);
fail:
qapi_free_BlockdevCreateOptions(create_options);
- QDECREF(qdict);
+ qobject_unref(qdict);
return ret;
}
diff --git a/block/snapshot.c b/block/snapshot.c
index eacc1f1..2953d96 100644
--- a/block/snapshot.c
+++ b/block/snapshot.c
@@ -214,7 +214,7 @@
bdrv_ref(file);
qdict_extract_subqdict(options, &file_options, "file.");
- QDECREF(file_options);
+ qobject_unref(file_options);
qdict_put_str(options, "file", bdrv_get_node_name(file));
drv->bdrv_close(bs);
@@ -223,7 +223,7 @@
ret = bdrv_snapshot_goto(file, snapshot_id, errp);
open_ret = drv->bdrv_open(bs, options, bs->open_flags, &local_err);
- QDECREF(options);
+ qobject_unref(options);
if (open_ret < 0) {
bdrv_unref(file);
bs->drv = NULL;
diff --git a/block/ssh.c b/block/ssh.c
index ab3acf0..412a1bf 100644
--- a/block/ssh.c
+++ b/block/ssh.c
@@ -638,7 +638,7 @@
v = qobject_input_visitor_new(crumpled);
visit_type_BlockdevOptionsSsh(v, NULL, &result, &local_err);
visit_free(v);
- qobject_decref(crumpled);
+ qobject_unref(crumpled);
if (local_err) {
error_propagate(errp, local_err);
@@ -917,7 +917,7 @@
ret = ssh_co_create(create_options, errp);
out:
- QDECREF(uri_options);
+ qobject_unref(uri_options);
qapi_free_BlockdevCreateOptions(create_options);
return ret;
}
diff --git a/block/vdi.c b/block/vdi.c
index 4a2d1ff..96a22b8 100644
--- a/block/vdi.c
+++ b/block/vdi.c
@@ -951,7 +951,7 @@
/* Create the vdi image (format layer) */
ret = vdi_co_do_create(create_options, block_size, errp);
done:
- QDECREF(qdict);
+ qobject_unref(qdict);
qapi_free_BlockdevCreateOptions(create_options);
bdrv_unref(bs_file);
return ret;
diff --git a/block/vhdx.c b/block/vhdx.c
index 6ac0424..c3a4220 100644
--- a/block/vhdx.c
+++ b/block/vhdx.c
@@ -2003,7 +2003,7 @@
qdict_put_str(qdict, "file", bs->node_name);
qobj = qdict_crumple(qdict, errp);
- QDECREF(qdict);
+ qobject_unref(qdict);
qdict = qobject_to(QDict, qobj);
if (qdict == NULL) {
ret = -EINVAL;
@@ -2049,7 +2049,7 @@
ret = vhdx_co_create(create_options, errp);
fail:
- QDECREF(qdict);
+ qobject_unref(qdict);
bdrv_unref(bs);
qapi_free_BlockdevCreateOptions(create_options);
return ret;
diff --git a/block/vpc.c b/block/vpc.c
index 44f99a4..0ebfcd3 100644
--- a/block/vpc.c
+++ b/block/vpc.c
@@ -1119,7 +1119,7 @@
qdict_put_str(qdict, "file", bs->node_name);
qobj = qdict_crumple(qdict, errp);
- QDECREF(qdict);
+ qobject_unref(qdict);
qdict = qobject_to(QDict, qobj);
if (qdict == NULL) {
ret = -EINVAL;
@@ -1157,7 +1157,7 @@
ret = vpc_co_create(create_options, errp);
fail:
- QDECREF(qdict);
+ qobject_unref(qdict);
bdrv_unref(bs);
qapi_free_BlockdevCreateOptions(create_options);
return ret;
diff --git a/block/vvfat.c b/block/vvfat.c
index 1569783..662dca0 100644
--- a/block/vvfat.c
+++ b/block/vvfat.c
@@ -3179,7 +3179,7 @@
qdict_put_str(options, "write-target.driver", "qcow");
s->qcow = bdrv_open_child(s->qcow_filename, options, "write-target", bs,
&child_vvfat_qcow, false, errp);
- QDECREF(options);
+ qobject_unref(options);
if (!s->qcow) {
ret = -EINVAL;
goto err;
diff --git a/block/vxhs.c b/block/vxhs.c
index 75cc6c8..55ae1a6 100644
--- a/block/vxhs.c
+++ b/block/vxhs.c
@@ -396,7 +396,7 @@
out:
g_free(of_vsa_addr);
- QDECREF(backing_options);
+ qobject_unref(backing_options);
qemu_opts_del(tcp_opts);
qemu_opts_del(opts);
g_free(cacert);
