{"id":808729,"url":"http://patchwork.ozlabs.org/api/patches/808729/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170901153758.8628-5-armbru@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","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":"<20170901153758.8628-5-armbru@redhat.com>","list_archive_url":null,"date":"2017-09-01T15:37:15","name":"[PULL,v2,04/47] qdict: Add qdict_put_null() helper, and put it to use","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"c55773dc14f2059a71f078c7275d29fb39f63f71","submitter":{"id":2645,"url":"http://patchwork.ozlabs.org/api/people/2645/?format=json","name":"Markus Armbruster","email":"armbru@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170901153758.8628-5-armbru@redhat.com/mbox/","series":[{"id":1049,"url":"http://patchwork.ozlabs.org/api/series/1049/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=1049","date":"2017-09-01T15:37:14","name":"[PULL,v2,01/47] qapi: Fix error handling code on alternate conflict","version":2,"mbox":"http://patchwork.ozlabs.org/series/1049/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/808729/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/808729/checks/","tags":{},"related":[],"headers":{"Return-Path":"","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=)","ext-mx07.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx07.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=armbru@redhat.com"],"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 3xkNlZ4RhLz9t3P\n\tfor ;\n\tSat, 2 Sep 2017 01:42:02 +1000 (AEST)","from localhost ([::1]:46394 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dno52-0000ww-Md\n\tfor incoming@patchwork.ozlabs.org; Fri, 01 Sep 2017 11:42:00 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:51401)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dno1J-0006aq-Df\n\tfor qemu-devel@nongnu.org; Fri, 01 Sep 2017 11:38:10 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dno1E-0001ce-PN\n\tfor qemu-devel@nongnu.org; Fri, 01 Sep 2017 11:38:09 -0400","from mx1.redhat.com ([209.132.183.28]:60188)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dno1E-0001c7-Di\n\tfor qemu-devel@nongnu.org; Fri, 01 Sep 2017 11:38:04 -0400","from smtp.corp.redhat.com\n\t(int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id 532F4C047B74\n\tfor ; Fri, 1 Sep 2017 15:38:03 +0000 (UTC)","from blackfin.pond.sub.org (ovpn-116-75.ams2.redhat.com\n\t[10.36.116.75])\n\tby smtp.corp.redhat.com (Postfix) with ESMTPS id C436D9568E;\n\tFri, 1 Sep 2017 15:37:59 +0000 (UTC)","by blackfin.pond.sub.org (Postfix, from userid 1000)\n\tid 4EB411138666; Fri, 1 Sep 2017 17:37:58 +0200 (CEST)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 532F4C047B74","From":"Markus Armbruster ","To":"qemu-devel@nongnu.org","Date":"Fri, 1 Sep 2017 17:37:15 +0200","Message-Id":"<20170901153758.8628-5-armbru@redhat.com>","In-Reply-To":"<20170901153758.8628-1-armbru@redhat.com>","References":"<20170901153758.8628-1-armbru@redhat.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.11","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.31]);\n\tFri, 01 Sep 2017 15:38:03 +0000 (UTC)","Content-Transfer-Encoding":"quoted-printable","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"[Qemu-devel] [PULL v2 04/47] qdict: Add qdict_put_null() helper,\n\tand put it to use","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"=?utf-8?q?Marc-Andr=C3=A9_Lureau?= ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"From: Marc-André Lureau \n\nSigned-off-by: Marc-André Lureau \nReviewed-by: Markus Armbruster \nMessage-Id: <20170825105913.4060-2-marcandre.lureau@redhat.com>\n[Update to qobject.cocci squashed in, commit message tweaked]\nSigned-off-by: Markus Armbruster \n---\n include/qapi/qmp/qdict.h | 4 +++-\n scripts/coccinelle/qobject.cocci | 3 +++\n target/i386/cpu.c | 4 ++--\n 3 files changed, 8 insertions(+), 3 deletions(-)","diff":"diff --git a/include/qapi/qmp/qdict.h b/include/qapi/qmp/qdict.h\nindex 363e431106..6588c7f0c8 100644\n--- a/include/qapi/qmp/qdict.h\n+++ b/include/qapi/qmp/qdict.h\n@@ -53,13 +53,15 @@ void qdict_destroy_obj(QObject *obj);\n #define qdict_put(qdict, key, obj) \\\n qdict_put_obj(qdict, key, QOBJECT(obj))\n \n-/* Helpers for int, bool, and string */\n+/* Helpers for int, bool, null, and string */\n #define qdict_put_int(qdict, key, value) \\\n qdict_put(qdict, key, qnum_from_int(value))\n #define qdict_put_bool(qdict, key, value) \\\n qdict_put(qdict, key, qbool_from_bool(value))\n #define qdict_put_str(qdict, key, value) \\\n qdict_put(qdict, key, qstring_from_str(value))\n+#define qdict_put_null(qdict, key) \\\n+ qdict_put(qdict, key, qnull())\n \n /* High level helpers */\n double qdict_get_double(const QDict *qdict, const char *key);\ndiff --git a/scripts/coccinelle/qobject.cocci b/scripts/coccinelle/qobject.cocci\nindex c518caf7b1..1120eb1a42 100644\n--- a/scripts/coccinelle/qobject.cocci\n+++ b/scripts/coccinelle/qobject.cocci\n@@ -20,6 +20,9 @@ expression Obj, Key, E;\n |\n - qdict_put(Obj, Key, qstring_from_str(E));\n + qdict_put_str(Obj, Key, E);\n+|\n+- qdict_put(Obj, Key, qnull());\n++ qdict_put_null(Obj, Key);\n )\n \n // Use QList macros where they make sense\ndiff --git a/target/i386/cpu.c b/target/i386/cpu.c\nindex ddc45abd70..bec2009a9c 100644\n--- a/target/i386/cpu.c\n+++ b/target/i386/cpu.c\n@@ -2454,7 +2454,7 @@ static QDict *x86_cpu_static_props(void)\n \n d = qdict_new();\n for (i = 0; props[i]; i++) {\n- qdict_put(d, props[i], qnull());\n+ qdict_put_null(d, props[i]);\n }\n \n for (w = 0; w < FEATURE_WORDS; w++) {\n@@ -2464,7 +2464,7 @@ static QDict *x86_cpu_static_props(void)\n if (!fi->feat_names[bit]) {\n continue;\n }\n- qdict_put(d, fi->feat_names[bit], qnull());\n+ qdict_put_null(d, fi->feat_names[bit]);\n }\n }\n \n","prefixes":["PULL","v2","04/47"]}