commit 7dc847ebba953db90853d15f140c20eef74d4fb2
author Max Reitz <mreitz@redhat.com> Sat Feb 24 16:40:29 2018 +0100
committer Eric Blake <eblake@redhat.com> Mon Mar 19 14:58:36 2018 -0500
tree f17aad0438ed253a90674b74732917d449147f07
parent 1a56b1e2ab5e9d6d89386ca953b4afb419e15abe

qapi: Replace qobject_to_X(o) by qobject_to(X, o)

This patch was generated using the following Coccinelle script:

@@
expression Obj;
@@
(
- qobject_to_qnum(Obj)
+ qobject_to(QNum, Obj)
|
- qobject_to_qstring(Obj)
+ qobject_to(QString, Obj)
|
- qobject_to_qdict(Obj)
+ qobject_to(QDict, Obj)
|
- qobject_to_qlist(Obj)
+ qobject_to(QList, Obj)
|
- qobject_to_qbool(Obj)
+ qobject_to(QBool, Obj)
)

and a bit of manual fix-up for overly long lines and three places in
tests/check-qjson.c that Coccinelle did not find.

Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Alberto Garcia <berto@igalia.com>
Message-Id: <20180224154033.29559-4-mreitz@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
[eblake: swap order from qobject_to(o, X), rebase to master, also a fix
to latent false-positive compiler complaint about hw/i386/acpi-build.c]
Signed-off-by: Eric Blake <eblake@redhat.com>

util/keyval.c

diff --git a/util/keyval.c b/util/keyval.c
index 212ae90..1c7351a 100644
--- a/util/keyval.c
+++ b/util/keyval.c
@@ -221,7 +221,7 @@
             if (!next) {
                 return NULL;
             }
-            cur = qobject_to_qdict(next);
+            cur = qobject_to(QDict, next);
             assert(cur);
         }
 
@@ -314,7 +314,7 @@
             has_member = true;
         }
 
-        qdict = qobject_to_qdict(ent->value);
+        qdict = qobject_to(QDict, ent->value);
         if (!qdict) {
             continue;
         }