Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/806820/?format=api
{ "id": 806820, "url": "http://patchwork.ozlabs.org/api/patches/806820/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/1503965694-10794-16-git-send-email-mdroth@linux.vnet.ibm.com/", "project": { "id": 14, "url": "http://patchwork.ozlabs.org/api/projects/14/?format=api", "name": "QEMU Development", "link_name": "qemu-devel", "list_id": "qemu-devel.nongnu.org", "list_email": "qemu-devel@nongnu.org", "web_url": "", "scm_url": "", "webscm_url": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<1503965694-10794-16-git-send-email-mdroth@linux.vnet.ibm.com>", "list_archive_url": null, "date": "2017-08-29T00:13:50", "name": "[15/79] qobject: Drop useless QObject casts", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "b07c89084ebbee1d6fac63cfc4f3fcad6e296225", "submitter": { "id": 5549, "url": "http://patchwork.ozlabs.org/api/people/5549/?format=api", "name": "Michael Roth", "email": "mdroth@linux.vnet.ibm.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/qemu-devel/patch/1503965694-10794-16-git-send-email-mdroth@linux.vnet.ibm.com/mbox/", "series": [ { "id": 281, "url": "http://patchwork.ozlabs.org/api/series/281/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/list/?series=281", "date": "2017-08-29T00:13:45", "name": "Patch Round-up for stable 2.9.1, freeze on 2017-09-04", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/281/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/806820/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/806820/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>", "X-Original-To": "incoming@patchwork.ozlabs.org", "Delivered-To": "patchwork-incoming@bilbo.ozlabs.org", "Authentication-Results": "ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=<UNKNOWN>)", "Received": [ "from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xh8YG6z2Cz9s65\n\tfor <incoming@patchwork.ozlabs.org>;\n\tTue, 29 Aug 2017 10:25:22 +1000 (AEST)", "from localhost ([::1]:41923 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>)\n\tid 1dmULI-0000dk-Pp\n\tfor incoming@patchwork.ozlabs.org; Mon, 28 Aug 2017 20:25:20 -0400", "from eggs.gnu.org ([2001:4830:134:3::10]:47386)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from <mdroth@linux.vnet.ibm.com>) id 1dmUC7-0000r9-K3\n\tfor qemu-devel@nongnu.org; Mon, 28 Aug 2017 20:15:54 -0400", "from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from <mdroth@linux.vnet.ibm.com>) id 1dmUC4-000561-2I\n\tfor qemu-devel@nongnu.org; Mon, 28 Aug 2017 20:15:51 -0400", "from mx0b-001b2d01.pphosted.com ([148.163.158.5]:37138\n\thelo=mx0a-001b2d01.pphosted.com)\n\tby eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from <mdroth@linux.vnet.ibm.com>)\n\tid 1dmUC3-00055T-Ra\n\tfor qemu-devel@nongnu.org; Mon, 28 Aug 2017 20:15:47 -0400", "from pps.filterd (m0098416.ppops.net [127.0.0.1])\n\tby mx0b-001b2d01.pphosted.com (8.16.0.21/8.16.0.21) with SMTP id\n\tv7T0EWZq065802\n\tfor <qemu-devel@nongnu.org>; Mon, 28 Aug 2017 20:15:47 -0400", "from e38.co.us.ibm.com (e38.co.us.ibm.com [32.97.110.159])\n\tby mx0b-001b2d01.pphosted.com with ESMTP id 2cmq0jay4q-1\n\t(version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT)\n\tfor <qemu-devel@nongnu.org>; Mon, 28 Aug 2017 20:15:47 -0400", "from localhost\n\tby e38.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use\n\tOnly! Violators will be prosecuted\n\tfor <qemu-devel@nongnu.org> from <mdroth@linux.vnet.ibm.com>;\n\tMon, 28 Aug 2017 18:15:46 -0600", "from b03cxnp07028.gho.boulder.ibm.com (9.17.130.15)\n\tby e38.co.us.ibm.com (192.168.1.138) with IBM ESMTP SMTP Gateway:\n\tAuthorized Use Only! Violators will be prosecuted; \n\tMon, 28 Aug 2017 18:15:44 -0600", "from b03ledav002.gho.boulder.ibm.com\n\t(b03ledav002.gho.boulder.ibm.com [9.17.130.233])\n\tby b03cxnp07028.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with\n\tESMTP id v7T0Firi000408; Mon, 28 Aug 2017 17:15:44 -0700", "from b03ledav002.gho.boulder.ibm.com (unknown [127.0.0.1])\n\tby IMSVA (Postfix) with ESMTP id 333D813603A;\n\tMon, 28 Aug 2017 18:15:44 -0600 (MDT)", "from localhost (unknown [9.80.85.217])\n\tby b03ledav002.gho.boulder.ibm.com (Postfix) with ESMTP id\n\tCC15813603C; Mon, 28 Aug 2017 18:15:43 -0600 (MDT)" ], "From": "Michael Roth <mdroth@linux.vnet.ibm.com>", "To": "qemu-devel@nongnu.org", "Date": "Mon, 28 Aug 2017 19:13:50 -0500", "X-Mailer": "git-send-email 2.7.4", "In-Reply-To": "<1503965694-10794-1-git-send-email-mdroth@linux.vnet.ibm.com>", "References": "<1503965694-10794-1-git-send-email-mdroth@linux.vnet.ibm.com>", "X-TM-AS-GCONF": "00", "x-cbid": "17082900-0028-0000-0000-00000846DB1F", "X-IBM-SpamModules-Scores": "", "X-IBM-SpamModules-Versions": "BY=3.00007630; HX=3.00000241; KW=3.00000007;\n\tPH=3.00000004; SC=3.00000226; SDB=6.00909028; UDB=6.00455849;\n\tIPR=6.00689279; \n\tBA=6.00005557; NDR=6.00000001; ZLA=6.00000005; ZF=6.00000009;\n\tZB=6.00000000; \n\tZP=6.00000000; ZH=6.00000000; ZU=6.00000002; MB=3.00016909;\n\tXFM=3.00000015; UTC=2017-08-29 00:15:46", "X-IBM-AV-DETECTION": "SAVI=unused REMOTE=unused XFE=unused", "x-cbparentid": "17082900-0029-0000-0000-000037553106", "Message-Id": "<1503965694-10794-16-git-send-email-mdroth@linux.vnet.ibm.com>", "X-Proofpoint-Virus-Version": "vendor=fsecure engine=2.50.10432:, ,\n\tdefinitions=2017-08-28_13:, , signatures=0", "X-Proofpoint-Spam-Details": "rule=outbound_notspam policy=outbound score=0\n\tspamscore=0 suspectscore=1\n\tmalwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam\n\tadjust=0 reason=mlx scancount=1 engine=8.0.1-1707230000\n\tdefinitions=main-1708290001", "X-detected-operating-system": "by eggs.gnu.org: GNU/Linux 3.x [generic] [fuzzy]", "X-Received-From": "148.163.158.5", "Subject": "[Qemu-devel] [PATCH 15/79] qobject: Drop useless QObject casts", "X-BeenThere": "qemu-devel@nongnu.org", "X-Mailman-Version": "2.1.21", "Precedence": "list", "List-Id": "<qemu-devel.nongnu.org>", "List-Unsubscribe": "<https://lists.nongnu.org/mailman/options/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>", "List-Archive": "<http://lists.nongnu.org/archive/html/qemu-devel/>", "List-Post": "<mailto:qemu-devel@nongnu.org>", "List-Help": "<mailto:qemu-devel-request@nongnu.org?subject=help>", "List-Subscribe": "<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=subscribe>", "Cc": "qemu-stable@nongnu.org, Markus Armbruster <armbru@redhat.com>", "Errors-To": "qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org", "Sender": "\"Qemu-devel\"\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>" }, "content": "From: Eric Blake <eblake@redhat.com>\n\nWe have macros in place to make it less verbose to add a subtype\nof QObject to both QDict and QList. While we have made cleanups\nlike this in the past (see commit fcfcd8ffc, for example), having\nit be automated by Coccinelle makes it easier to maintain.\n\nPatch created mechanically via:\n spatch --sp-file scripts/coccinelle/qobject.cocci \\\n --macro-file scripts/cocci-macro-file.h --dir . --in-place\nthen I verified that no manual touchups were required.\n\nSigned-off-by: Eric Blake <eblake@redhat.com>\nReviewed-by: Stefan Hajnoczi <stefanha@redhat.com>\nReviewed-by: Alberto Garcia <berto@igalia.com>\nReviewed-by: Markus Armbruster <armbru@redhat.com>\nMessage-Id: <20170427215821.19397-5-eblake@redhat.com>\nSigned-off-by: Markus Armbruster <armbru@redhat.com>\n(cherry picked from commit de6e7951fe66053dfeaac1a237f7aceb9e079619)\nSigned-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>\n---\n block.c | 12 ++++--------\n block/blkdebug.c | 4 ++--\n block/blkverify.c | 7 +++----\n block/file-posix.c | 6 +++---\n block/file-win32.c | 4 ++--\n block/quorum.c | 16 ++++++----------\n tests/check-qdict.c | 20 ++++++++++----------\n tests/test-qmp-commands.c | 24 ++++++++++++------------\n 8 files changed, 42 insertions(+), 51 deletions(-)", "diff": "diff --git a/block.c b/block.c\nindex 46da908..f156348 100644\n--- a/block.c\n+++ b/block.c\n@@ -4674,11 +4674,9 @@ void bdrv_refresh_filename(BlockDriverState *bs)\n * contain a representation of the filename, therefore the following\n * suffices without querying the (exact_)filename of this BDS. */\n if (bs->file->bs->full_open_options) {\n- qdict_put_obj(opts, \"driver\",\n- QOBJECT(qstring_from_str(drv->format_name)));\n+ qdict_put(opts, \"driver\", qstring_from_str(drv->format_name));\n QINCREF(bs->file->bs->full_open_options);\n- qdict_put_obj(opts, \"file\",\n- QOBJECT(bs->file->bs->full_open_options));\n+ qdict_put(opts, \"file\", bs->file->bs->full_open_options);\n \n bs->full_open_options = opts;\n } else {\n@@ -4694,8 +4692,7 @@ void bdrv_refresh_filename(BlockDriverState *bs)\n \n opts = qdict_new();\n append_open_options(opts, bs);\n- qdict_put_obj(opts, \"driver\",\n- QOBJECT(qstring_from_str(drv->format_name)));\n+ qdict_put(opts, \"driver\", qstring_from_str(drv->format_name));\n \n if (bs->exact_filename[0]) {\n /* This may not work for all block protocol drivers (some may\n@@ -4705,8 +4702,7 @@ void bdrv_refresh_filename(BlockDriverState *bs)\n * needs some special format of the options QDict, it needs to\n * implement the driver-specific bdrv_refresh_filename() function.\n */\n- qdict_put_obj(opts, \"filename\",\n- QOBJECT(qstring_from_str(bs->exact_filename)));\n+ qdict_put(opts, \"filename\", qstring_from_str(bs->exact_filename));\n }\n \n bs->full_open_options = opts;\ndiff --git a/block/blkdebug.c b/block/blkdebug.c\nindex cc4a146..42b8d80 100644\n--- a/block/blkdebug.c\n+++ b/block/blkdebug.c\n@@ -693,10 +693,10 @@ static void blkdebug_refresh_filename(BlockDriverState *bs, QDict *options)\n }\n \n opts = qdict_new();\n- qdict_put_obj(opts, \"driver\", QOBJECT(qstring_from_str(\"blkdebug\")));\n+ qdict_put(opts, \"driver\", qstring_from_str(\"blkdebug\"));\n \n QINCREF(bs->file->bs->full_open_options);\n- qdict_put_obj(opts, \"image\", QOBJECT(bs->file->bs->full_open_options));\n+ qdict_put(opts, \"image\", bs->file->bs->full_open_options);\n \n for (e = qdict_first(options); e; e = qdict_next(options, e)) {\n if (strcmp(qdict_entry_key(e), \"x-image\")) {\ndiff --git a/block/blkverify.c b/block/blkverify.c\nindex af23281..cc29cd2 100644\n--- a/block/blkverify.c\n+++ b/block/blkverify.c\n@@ -288,13 +288,12 @@ static void blkverify_refresh_filename(BlockDriverState *bs, QDict *options)\n && s->test_file->bs->full_open_options)\n {\n QDict *opts = qdict_new();\n- qdict_put_obj(opts, \"driver\", QOBJECT(qstring_from_str(\"blkverify\")));\n+ qdict_put(opts, \"driver\", qstring_from_str(\"blkverify\"));\n \n QINCREF(bs->file->bs->full_open_options);\n- qdict_put_obj(opts, \"raw\", QOBJECT(bs->file->bs->full_open_options));\n+ qdict_put(opts, \"raw\", bs->file->bs->full_open_options);\n QINCREF(s->test_file->bs->full_open_options);\n- qdict_put_obj(opts, \"test\",\n- QOBJECT(s->test_file->bs->full_open_options));\n+ qdict_put(opts, \"test\", s->test_file->bs->full_open_options);\n \n bs->full_open_options = opts;\n }\ndiff --git a/block/file-posix.c b/block/file-posix.c\nindex 0c48968..5370ba0 100644\n--- a/block/file-posix.c\n+++ b/block/file-posix.c\n@@ -377,7 +377,7 @@ static void raw_parse_filename(const char *filename, QDict *options,\n * function call can be ignored. */\n strstart(filename, \"file:\", &filename);\n \n- qdict_put_obj(options, \"filename\", QOBJECT(qstring_from_str(filename)));\n+ qdict_put(options, \"filename\", qstring_from_str(filename));\n }\n \n static QemuOptsList raw_runtime_opts = {\n@@ -2150,7 +2150,7 @@ static void hdev_parse_filename(const char *filename, QDict *options,\n /* The prefix is optional, just as for \"file\". */\n strstart(filename, \"host_device:\", &filename);\n \n- qdict_put_obj(options, \"filename\", QOBJECT(qstring_from_str(filename)));\n+ qdict_put(options, \"filename\", qstring_from_str(filename));\n }\n \n static bool hdev_is_sg(BlockDriverState *bs)\n@@ -2449,7 +2449,7 @@ static void cdrom_parse_filename(const char *filename, QDict *options,\n /* The prefix is optional, just as for \"file\". */\n strstart(filename, \"host_cdrom:\", &filename);\n \n- qdict_put_obj(options, \"filename\", QOBJECT(qstring_from_str(filename)));\n+ qdict_put(options, \"filename\", qstring_from_str(filename));\n }\n #endif\n \ndiff --git a/block/file-win32.c b/block/file-win32.c\nindex 800fabd..57c4a78 100644\n--- a/block/file-win32.c\n+++ b/block/file-win32.c\n@@ -282,7 +282,7 @@ static void raw_parse_filename(const char *filename, QDict *options,\n * function call can be ignored. */\n strstart(filename, \"file:\", &filename);\n \n- qdict_put_obj(options, \"filename\", QOBJECT(qstring_from_str(filename)));\n+ qdict_put(options, \"filename\", qstring_from_str(filename));\n }\n \n static QemuOptsList raw_runtime_opts = {\n@@ -669,7 +669,7 @@ static void hdev_parse_filename(const char *filename, QDict *options,\n /* The prefix is optional, just as for \"file\". */\n strstart(filename, \"host_device:\", &filename);\n \n- qdict_put_obj(options, \"filename\", QOBJECT(qstring_from_str(filename)));\n+ qdict_put(options, \"filename\", qstring_from_str(filename));\n }\n \n static int hdev_open(BlockDriverState *bs, QDict *options, int flags,\ndiff --git a/block/quorum.c b/block/quorum.c\nindex 40205fb..f7949e2 100644\n--- a/block/quorum.c\n+++ b/block/quorum.c\n@@ -1096,19 +1096,15 @@ static void quorum_refresh_filename(BlockDriverState *bs, QDict *options)\n children = qlist_new();\n for (i = 0; i < s->num_children; i++) {\n QINCREF(s->children[i]->bs->full_open_options);\n- qlist_append_obj(children,\n- QOBJECT(s->children[i]->bs->full_open_options));\n+ qlist_append(children, s->children[i]->bs->full_open_options);\n }\n \n opts = qdict_new();\n- qdict_put_obj(opts, \"driver\", QOBJECT(qstring_from_str(\"quorum\")));\n- qdict_put_obj(opts, QUORUM_OPT_VOTE_THRESHOLD,\n- QOBJECT(qint_from_int(s->threshold)));\n- qdict_put_obj(opts, QUORUM_OPT_BLKVERIFY,\n- QOBJECT(qbool_from_bool(s->is_blkverify)));\n- qdict_put_obj(opts, QUORUM_OPT_REWRITE,\n- QOBJECT(qbool_from_bool(s->rewrite_corrupted)));\n- qdict_put_obj(opts, \"children\", QOBJECT(children));\n+ qdict_put(opts, \"driver\", qstring_from_str(\"quorum\"));\n+ qdict_put(opts, QUORUM_OPT_VOTE_THRESHOLD, qint_from_int(s->threshold));\n+ qdict_put(opts, QUORUM_OPT_BLKVERIFY, qbool_from_bool(s->is_blkverify));\n+ qdict_put(opts, QUORUM_OPT_REWRITE, qbool_from_bool(s->rewrite_corrupted));\n+ qdict_put(opts, \"children\", children);\n \n bs->full_open_options = opts;\n }\ndiff --git a/tests/check-qdict.c b/tests/check-qdict.c\nindex 81162ee..9cdc985 100644\n--- a/tests/check-qdict.c\n+++ b/tests/check-qdict.c\n@@ -47,7 +47,7 @@ static void qdict_put_obj_test(void)\n qdict = qdict_new();\n \n // key \"\" will have tdb hash 12345\n- qdict_put_obj(qdict, \"\", QOBJECT(qint_from_int(num)));\n+ qdict_put(qdict, \"\", qint_from_int(num));\n \n g_assert(qdict_size(qdict) == 1);\n ent = QLIST_FIRST(&qdict->table[12345 % QDICT_BUCKET_MAX]);\n@@ -66,8 +66,8 @@ static void qdict_destroy_simple_test(void)\n QDict *qdict;\n \n qdict = qdict_new();\n- qdict_put_obj(qdict, \"num\", QOBJECT(qint_from_int(0)));\n- qdict_put_obj(qdict, \"str\", QOBJECT(qstring_from_str(\"foo\")));\n+ qdict_put(qdict, \"num\", qint_from_int(0));\n+ qdict_put(qdict, \"str\", qstring_from_str(\"foo\"));\n \n QDECREF(qdict);\n }\n@@ -297,16 +297,16 @@ static void qdict_flatten_test(void)\n qdict_put(dict1, \"a\", qint_from_int(0));\n qdict_put(dict1, \"b\", qint_from_int(1));\n \n- qlist_append_obj(list1, QOBJECT(qint_from_int(23)));\n- qlist_append_obj(list1, QOBJECT(qint_from_int(66)));\n- qlist_append_obj(list1, QOBJECT(dict1));\n- qlist_append_obj(list2, QOBJECT(qint_from_int(42)));\n- qlist_append_obj(list2, QOBJECT(list1));\n+ qlist_append(list1, qint_from_int(23));\n+ qlist_append(list1, qint_from_int(66));\n+ qlist_append(list1, dict1);\n+ qlist_append(list2, qint_from_int(42));\n+ qlist_append(list2, list1);\n \n qdict_put(dict2, \"c\", qint_from_int(2));\n qdict_put(dict2, \"d\", qint_from_int(3));\n- qdict_put_obj(dict3, \"e\", QOBJECT(list2));\n- qdict_put_obj(dict3, \"f\", QOBJECT(dict2));\n+ qdict_put(dict3, \"e\", list2);\n+ qdict_put(dict3, \"f\", dict2);\n qdict_put(dict3, \"g\", qint_from_int(4));\n \n qdict_flatten(dict3);\ndiff --git a/tests/test-qmp-commands.c b/tests/test-qmp-commands.c\nindex 0f81a98..ac3fd03 100644\n--- a/tests/test-qmp-commands.c\n+++ b/tests/test-qmp-commands.c\n@@ -94,7 +94,7 @@ static void test_dispatch_cmd(void)\n QDict *req = qdict_new();\n QObject *resp;\n \n- qdict_put_obj(req, \"execute\", QOBJECT(qstring_from_str(\"user_def_cmd\")));\n+ qdict_put(req, \"execute\", qstring_from_str(\"user_def_cmd\"));\n \n resp = qmp_dispatch(&qmp_commands, QOBJECT(req));\n assert(resp != NULL);\n@@ -111,7 +111,7 @@ static void test_dispatch_cmd_failure(void)\n QDict *args = qdict_new();\n QObject *resp;\n \n- qdict_put_obj(req, \"execute\", QOBJECT(qstring_from_str(\"user_def_cmd2\")));\n+ qdict_put(req, \"execute\", qstring_from_str(\"user_def_cmd2\"));\n \n resp = qmp_dispatch(&qmp_commands, QOBJECT(req));\n assert(resp != NULL);\n@@ -125,7 +125,7 @@ static void test_dispatch_cmd_failure(void)\n qdict_put(args, \"a\", qint_from_int(66));\n qdict_put(req, \"arguments\", args);\n \n- qdict_put_obj(req, \"execute\", QOBJECT(qstring_from_str(\"user_def_cmd\")));\n+ qdict_put(req, \"execute\", qstring_from_str(\"user_def_cmd\"));\n \n resp = qmp_dispatch(&qmp_commands, QOBJECT(req));\n assert(resp != NULL);\n@@ -164,14 +164,14 @@ static void test_dispatch_cmd_io(void)\n QDict *ret_dict_dict2, *ret_dict_dict2_userdef;\n QInt *ret3;\n \n- qdict_put_obj(ud1a, \"integer\", QOBJECT(qint_from_int(42)));\n- qdict_put_obj(ud1a, \"string\", QOBJECT(qstring_from_str(\"hello\")));\n- qdict_put_obj(ud1b, \"integer\", QOBJECT(qint_from_int(422)));\n- qdict_put_obj(ud1b, \"string\", QOBJECT(qstring_from_str(\"hello2\")));\n- qdict_put_obj(args, \"ud1a\", QOBJECT(ud1a));\n- qdict_put_obj(args, \"ud1b\", QOBJECT(ud1b));\n- qdict_put_obj(req, \"arguments\", QOBJECT(args));\n- qdict_put_obj(req, \"execute\", QOBJECT(qstring_from_str(\"user_def_cmd2\")));\n+ qdict_put(ud1a, \"integer\", qint_from_int(42));\n+ qdict_put(ud1a, \"string\", qstring_from_str(\"hello\"));\n+ qdict_put(ud1b, \"integer\", qint_from_int(422));\n+ qdict_put(ud1b, \"string\", qstring_from_str(\"hello2\"));\n+ qdict_put(args, \"ud1a\", ud1a);\n+ qdict_put(args, \"ud1b\", ud1b);\n+ qdict_put(req, \"arguments\", args);\n+ qdict_put(req, \"execute\", qstring_from_str(\"user_def_cmd2\"));\n \n ret = qobject_to_qdict(test_qmp_dispatch(req));\n \n@@ -244,7 +244,7 @@ static void test_dealloc_partial(void)\n Visitor *v;\n \n ud2_dict = qdict_new();\n- qdict_put_obj(ud2_dict, \"string0\", QOBJECT(qstring_from_str(text)));\n+ qdict_put(ud2_dict, \"string0\", qstring_from_str(text));\n \n v = qobject_input_visitor_new(QOBJECT(ud2_dict));\n visit_type_UserDefTwo(v, NULL, &ud2, &err);\n", "prefixes": [ "15/79" ] }