From 2b24bd311f6a7a416432078f9e76f772759c7ea2 Mon Sep 17 00:00:00 2001

From: Markus Armbruster <armbru@redhat.com>

Date: Mon, 18 Jun 2018 08:43:12 +0200

Subject: [PATCH 05/54] qobject: Modify qobject_ref() to return obj

MIME-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

RH-Author: Markus Armbruster <armbru@redhat.com>

Message-id: <20180618084330.30009-6-armbru@redhat.com>

Patchwork-id: 80738

O-Subject: [RHEL-7.6 qemu-kvm-rhev PATCH 05/23] qobject: Modify qobject_ref() to return obj

Bugzilla: 1557995

RH-Acked-by: Max Reitz <mreitz@redhat.com>

RH-Acked-by: Jeffrey Cody <jcody@redhat.com>

RH-Acked-by: Kevin Wolf <kwolf@redhat.com>

From: Marc-André Lureau <marcandre.lureau@redhat.com>

For convenience and clarity, make it possible to call qobject_ref() at

the time when the reference is associated with a variable, or

argument, by making qobject_ref() return the same pointer as given.

Use that to simplify the callers.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>

Reviewed-by: Eric Blake <eblake@redhat.com>

Message-Id: <20180419150145.24795-5-marcandre.lureau@redhat.com>

Reviewed-by: Markus Armbruster <armbru@redhat.com>

[Useless change to qobject_ref_impl() dropped, commit message improved

slightly]

Signed-off-by: Markus Armbruster <armbru@redhat.com>

(cherry picked from commit f5a74a5a50387c6f980b2e2f94f062487a1826da)

Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>

---

 block.c                       |  8 ++++----

 block/blkdebug.c              |  7 +++----

 block/blkverify.c             |  8 ++++----

 block/null.c                  |  3 +--

 block/nvme.c                  |  3 +--

 block/quorum.c                |  4 ++--

 include/qapi/qmp/qnull.h      |  3 +--

 include/qapi/qmp/qobject.h    |  9 ++++++++-

 monitor.c                     | 20 +++++++-------------

 qapi/qobject-input-visitor.c  |  6 ++----

 qapi/qobject-output-visitor.c |  7 +++----

 qobject/qdict.c               | 33 +++++++++++----------------------

 12 files changed, 47 insertions(+), 64 deletions(-)

diff --git a/block.c b/block.c

index 55a7984..676e57f 100644

--- a/block.c

+++ b/block.c

@@ -5134,8 +5134,8 @@ static bool append_open_options(QDict *d, BlockDriverState *bs)

             continue;

         }

-        qobject_ref(qdict_entry_value(entry));

-        qdict_put_obj(d, qdict_entry_key(entry), qdict_entry_value(entry));

+        qdict_put_obj(d, qdict_entry_key(entry),

+                      qobject_ref(qdict_entry_value(entry)));

         found_any = true;

     }

@@ -5207,8 +5207,8 @@ void bdrv_refresh_filename(BlockDriverState *bs)

          * suffices without querying the (exact_)filename of this BDS. */

         if (bs->file->bs->full_open_options) {

             qdict_put_str(opts, "driver", drv->format_name);

-            qobject_ref(bs->file->bs->full_open_options);

-            qdict_put(opts, "file", bs->file->bs->full_open_options);

+            qdict_put(opts, "file",

+                      qobject_ref(bs->file->bs->full_open_options));

             bs->full_open_options = opts;

         } else {

diff --git a/block/blkdebug.c b/block/blkdebug.c

index 689703d..053372c 100644

--- a/block/blkdebug.c

+++ b/block/blkdebug.c

@@ -845,13 +845,12 @@ static void blkdebug_refresh_filename(BlockDriverState *bs, QDict *options)

     opts = qdict_new();

     qdict_put_str(opts, "driver", "blkdebug");

-    qobject_ref(bs->file->bs->full_open_options);

-    qdict_put(opts, "image", bs->file->bs->full_open_options);

+    qdict_put(opts, "image", qobject_ref(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_ref(qdict_entry_value(e));

-            qdict_put_obj(opts, qdict_entry_key(e), qdict_entry_value(e));

+            qdict_put_obj(opts, qdict_entry_key(e),

+                          qobject_ref(qdict_entry_value(e)));

         }

     }

diff --git a/block/blkverify.c b/block/blkverify.c

index 3cffcb1..754cc9e 100644

--- a/block/blkverify.c

+++ b/block/blkverify.c

@@ -291,10 +291,10 @@ static void blkverify_refresh_filename(BlockDriverState *bs, QDict *options)

         QDict *opts = qdict_new();

         qdict_put_str(opts, "driver", "blkverify");

-        qobject_ref(bs->file->bs->full_open_options);

-        qdict_put(opts, "raw", bs->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);

+        qdict_put(opts, "raw",

+                  qobject_ref(bs->file->bs->full_open_options));

+        qdict_put(opts, "test",

+                  qobject_ref(s->test_file->bs->full_open_options));

         bs->full_open_options = opts;

     }

diff --git a/block/null.c b/block/null.c

index 700a2d0..3944550 100644

--- a/block/null.c

+++ b/block/null.c

@@ -244,7 +244,6 @@ static int coroutine_fn null_co_block_status(BlockDriverState *bs,

 static void null_refresh_filename(BlockDriverState *bs, QDict *opts)

 {

-    qobject_ref(opts);

     qdict_del(opts, "filename");

     if (!qdict_size(opts)) {

@@ -253,7 +252,7 @@ static void null_refresh_filename(BlockDriverState *bs, QDict *opts)

     }

     qdict_put_str(opts, "driver", bs->drv->format_name);

-    bs->full_open_options = opts;

+    bs->full_open_options = qobject_ref(opts);

 }

 static BlockDriver bdrv_null_co = {

diff --git a/block/nvme.c b/block/nvme.c

index e192da9..6f71122 100644

--- a/block/nvme.c

+++ b/block/nvme.c

@@ -1073,7 +1073,6 @@ static int nvme_reopen_prepare(BDRVReopenState *reopen_state,

 static void nvme_refresh_filename(BlockDriverState *bs, QDict *opts)

 {

-    qobject_ref(opts);

     qdict_del(opts, "filename");

     if (!qdict_size(opts)) {

@@ -1082,7 +1081,7 @@ static void nvme_refresh_filename(BlockDriverState *bs, QDict *opts)

     }

     qdict_put_str(opts, "driver", bs->drv->format_name);

-    bs->full_open_options = opts;

+    bs->full_open_options = qobject_ref(opts);

 }

 static void nvme_refresh_limits(BlockDriverState *bs, Error **errp)

diff --git a/block/quorum.c b/block/quorum.c

index 862cea3..a5051da 100644

--- a/block/quorum.c

+++ b/block/quorum.c

@@ -1082,8 +1082,8 @@ static void quorum_refresh_filename(BlockDriverState *bs, QDict *options)

     children = qlist_new();

     for (i = 0; i < s->num_children; i++) {

-        qobject_ref(s->children[i]->bs->full_open_options);

-        qlist_append(children, s->children[i]->bs->full_open_options);

+        qlist_append(children,

+                     qobject_ref(s->children[i]->bs->full_open_options));

     }

     opts = qdict_new();

diff --git a/include/qapi/qmp/qnull.h b/include/qapi/qmp/qnull.h

index 75b29c6..c142688 100644

--- a/include/qapi/qmp/qnull.h

+++ b/include/qapi/qmp/qnull.h

@@ -23,8 +23,7 @@ extern QNull qnull_;

 static inline QNull *qnull(void)

 {

-    qobject_ref(&qnull_);

-    return &qnull_;

+    return qobject_ref(&qnull_);

 }

 bool qnull_is_equal(const QObject *x, const QObject *y);

diff --git a/include/qapi/qmp/qobject.h b/include/qapi/qmp/qobject.h

index e20006f..fcfd549 100644

--- a/include/qapi/qmp/qobject.h

+++ b/include/qapi/qmp/qobject.h

@@ -103,8 +103,15 @@ static inline void qobject_unref_impl(QObject *obj)

 /**

  * qobject_ref(): Increment QObject's reference count

+ *

+ * Returns: the same @obj. The type of @obj will be propagated to the

+ * return type.

  */

-#define qobject_ref(obj) qobject_ref_impl(QOBJECT(obj))

+#define qobject_ref(obj) ({                     \

+    typeof(obj) _o = (obj);                     \

+    qobject_ref_impl(QOBJECT(_o));              \

+    _o;                                         \

+})

 /**

  * qobject_unref(): Decrement QObject's reference count, deallocate

diff --git a/monitor.c b/monitor.c

index 32f72f2..d948dbd 100644

--- a/monitor.c

+++ b/monitor.c

@@ -494,9 +494,8 @@ static void monitor_json_emitter(Monitor *mon, QObject *data)

          * caller won't free the data (which will be finally freed in

          * responder thread).

          */

-        qobject_ref(data);

         qemu_mutex_lock(&mon->qmp.qmp_queue_lock);

-        g_queue_push_tail(mon->qmp.qmp_responses, data);

+        g_queue_push_tail(mon->qmp.qmp_responses, qobject_ref(data));

         qemu_mutex_unlock(&mon->qmp.qmp_queue_lock);

         qemu_bh_schedule(mon_global.qmp_respond_bh);

     } else {

@@ -614,8 +613,7 @@ monitor_qapi_event_queue(QAPIEvent event, QDict *qdict, Error **errp)

              * replacing a prior stored event if any.

              */

             qobject_unref(evstate->qdict);

-            evstate->qdict = qdict;

-            qobject_ref(evstate->qdict);

+            evstate->qdict = qobject_ref(qdict);

         } else {

             /*

              * Last send was (at least) evconf->rate ns ago.

@@ -629,8 +627,7 @@ monitor_qapi_event_queue(QAPIEvent event, QDict *qdict, Error **errp)

             evstate = g_new(MonitorQAPIEventState, 1);

             evstate->event = event;

-            evstate->data = data;

-            qobject_ref(evstate->data);

+            evstate->data = qobject_ref(data);

             evstate->qdict = NULL;

             evstate->timer = timer_new_ns(event_clock_type,

                                           monitor_qapi_event_handler,

@@ -4066,9 +4063,7 @@ static void monitor_qmp_respond(Monitor *mon, QObject *rsp,

     if (rsp) {

         if (id) {

-            /* This is for the qdict below. */

-            qobject_ref(id);

-            qdict_put_obj(qobject_to(QDict, rsp), "id", id);

+            qdict_put_obj(qobject_to(QDict, rsp), "id", qobject_ref(id));

         }

         monitor_json_emitter(mon, rsp);

@@ -4208,15 +4203,14 @@ static void handle_qmp_command(JSONMessageParser *parser, GQueue *tokens)

         goto err;

     }

-    qobject_ref(id);

-    qdict_del(qdict, "id");

-

     req_obj = g_new0(QMPRequest, 1);

     req_obj->mon = mon;

-    req_obj->id = id;

+    req_obj->id = qobject_ref(id);

     req_obj->req = req;

     req_obj->need_resume = false;

+    qdict_del(qdict, "id");

+

     if (qmp_is_oob(qdict)) {

         /* Out-Of-Band (OOB) requests are executed directly in parser. */

         trace_monitor_qmp_cmd_out_of_band(qobject_get_try_str(req_obj->id)

diff --git a/qapi/qobject-input-visitor.c b/qapi/qobject-input-visitor.c

index 7a290c4..da57f4c 100644

--- a/qapi/qobject-input-visitor.c

+++ b/qapi/qobject-input-visitor.c

@@ -588,8 +588,7 @@ static void qobject_input_type_any(Visitor *v, const char *name, QObject **obj,

         return;

     }

-    qobject_ref(qobj);

-    *obj = qobj;

+    *obj = qobject_ref(qobj);

 }

 static void qobject_input_type_null(Visitor *v, const char *name,

@@ -677,8 +676,7 @@ static QObjectInputVisitor *qobject_input_visitor_base_new(QObject *obj)

     v->visitor.optional = qobject_input_optional;

     v->visitor.free = qobject_input_free;

-    v->root = obj;

-    qobject_ref(obj);

+    v->root = qobject_ref(obj);

     return v;

 }

diff --git a/qapi/qobject-output-visitor.c b/qapi/qobject-output-visitor.c

index 3a933b4..89ffd8a 100644

--- a/qapi/qobject-output-visitor.c

+++ b/qapi/qobject-output-visitor.c

@@ -188,8 +188,8 @@ static void qobject_output_type_any(Visitor *v, const char *name,

                                     QObject **obj, Error **errp)

 {

     QObjectOutputVisitor *qov = to_qov(v);

-    qobject_ref(*obj);

-    qobject_output_add_obj(qov, name, *obj);

+

+    qobject_output_add_obj(qov, name, qobject_ref(*obj));

 }

 static void qobject_output_type_null(Visitor *v, const char *name,

@@ -210,8 +210,7 @@ static void qobject_output_complete(Visitor *v, void *opaque)

     assert(qov->root && QSLIST_EMPTY(&qov->stack));

     assert(opaque == qov->result);

-    qobject_ref(qov->root);

-    *qov->result = qov->root;

+    *qov->result = qobject_ref(qov->root);

     qov->result = NULL;

 }

diff --git a/qobject/qdict.c b/qobject/qdict.c

index 2e9bd53..22800ee 100644

--- a/qobject/qdict.c

+++ b/qobject/qdict.c

@@ -373,8 +373,7 @@ QDict *qdict_clone_shallow(const QDict *src)

     for (i = 0; i < QDICT_BUCKET_MAX; i++) {

         QLIST_FOREACH(entry, &src->table[i], next) {

-            qobject_ref(entry->value);

-            qdict_put_obj(dest, entry->key, entry->value);

+            qdict_put_obj(dest, entry->key, qobject_ref(entry->value));

         }

     }

@@ -480,8 +479,7 @@ void qdict_copy_default(QDict *dst, QDict *src, const char *key)

     val = qdict_get(src, key);

     if (val) {

-        qobject_ref(val);

-        qdict_put_obj(dst, key, val);

+        qdict_put_obj(dst, key, qobject_ref(val));

     }

 }

@@ -526,8 +524,7 @@ static void qdict_flatten_qlist(QList *qlist, QDict *target, const char *prefix)

             qdict_flatten_qlist(qobject_to(QList, value), target, new_key);

         } else {

             /* All other types are moved to the target unchanged. */

-            qobject_ref(value);

-            qdict_put_obj(target, new_key, value);

+            qdict_put_obj(target, new_key, qobject_ref(value));

         }

         g_free(new_key);

@@ -566,8 +563,7 @@ static void qdict_flatten_qdict(QDict *qdict, QDict *target, const char *prefix)

             delete = true;

         } else if (prefix) {

             /* All other objects are moved to the target unchanged. */

-            qobject_ref(value);

-            qdict_put_obj(target, new_key, value);

+            qdict_put_obj(target, new_key, qobject_ref(value));

             delete = true;

         }

@@ -610,8 +606,7 @@ void qdict_extract_subqdict(QDict *src, QDict **dst, const char *start)

     while (entry != NULL) {

         next = qdict_next(src, entry);

         if (strstart(entry->key, start, &p)) {

-            qobject_ref(entry->value);

-            qdict_put_obj(*dst, p, entry->value);

+            qdict_put_obj(*dst, p, qobject_ref(entry->value));

             qdict_del(src, entry->key);

         }

         entry = next;

@@ -894,16 +889,14 @@ QObject *qdict_crumple(const QDict *src, Error **errp)

                 qdict_put_obj(two_level, prefix, QOBJECT(child_dict));

             }

-            qobject_ref(ent->value);

-            qdict_put_obj(child_dict, suffix, ent->value);

+            qdict_put_obj(child_dict, suffix, qobject_ref(ent->value));

         } else {

             if (child) {

                 error_setg(errp, "Key %s prefix is already set as a dict",

                            prefix);

                 goto error;

             }

-            qobject_ref(ent->value);

-            qdict_put_obj(two_level, prefix, ent->value);

+            qdict_put_obj(two_level, prefix, qobject_ref(ent->value));

         }

         g_free(prefix);

@@ -924,8 +917,7 @@ QObject *qdict_crumple(const QDict *src, Error **errp)

             qdict_put_obj(multi_level, ent->key, child);

         } else {

-            qobject_ref(ent->value);

-            qdict_put_obj(multi_level, ent->key, ent->value);

+            qdict_put_obj(multi_level, ent->key, qobject_ref(ent->value));

         }

     }

     qobject_unref(two_level);

@@ -951,8 +943,7 @@ QObject *qdict_crumple(const QDict *src, Error **errp)

                 goto error;

             }

-            qobject_ref(child);

-            qlist_append_obj(qobject_to(QList, dst), child);

+            qlist_append_obj(qobject_to(QList, dst), qobject_ref(child));

         }

         qobject_unref(multi_level);

         multi_level = NULL;

@@ -1055,8 +1046,7 @@ void qdict_join(QDict *dest, QDict *src, bool overwrite)

         next = qdict_next(src, entry);

         if (overwrite || !qdict_haskey(dest, entry->key)) {

-            qobject_ref(entry->value);

-            qdict_put_obj(dest, entry->key, entry->value);

+            qdict_put_obj(dest, entry->key, qobject_ref(entry->value));

             qdict_del(src, entry->key);

         }

@@ -1088,8 +1078,7 @@ bool qdict_rename_keys(QDict *qdict, const QDictRenames *renames, Error **errp)

             }

             qobj = qdict_get(qdict, renames->from);

-            qobject_ref(qobj);

-            qdict_put_obj(qdict, renames->to, qobj);

+            qdict_put_obj(qdict, renames->to, qobject_ref(qobj));

             qdict_del(qdict, renames->from);

         }

-- 

1.8.3.1