{"id":808783,"url":"http://patchwork.ozlabs.org/api/patches/808783/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170901153758.8628-7-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-7-armbru@redhat.com>","list_archive_url":null,"date":"2017-09-01T15:37:17","name":"[PULL,v2,06/47] qlit: use QLit prefix consistently","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"bbd030fe87022a362cad61ea53764e9c5fbf474f","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-7-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/808783/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/808783/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=208.118.235.17; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","ext-mx06.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx06.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=armbru@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [208.118.235.17])\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 3xkPKz0nzzz9t2x\n\tfor ;\n\tSat, 2 Sep 2017 02:08:22 +1000 (AEST)","from localhost ([::1]:46755 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dnoUV-00030w-Cx\n\tfor incoming@patchwork.ozlabs.org; Fri, 01 Sep 2017 12:08:19 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:51603)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dno1P-0006g0-10\n\tfor qemu-devel@nongnu.org; Fri, 01 Sep 2017 11:38:24 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dno1J-0001gC-Ud\n\tfor qemu-devel@nongnu.org; Fri, 01 Sep 2017 11:38:15 -0400","from mx1.redhat.com ([209.132.183.28]:56164)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dno1J-0001er-KR\n\tfor qemu-devel@nongnu.org; Fri, 01 Sep 2017 11:38:09 -0400","from smtp.corp.redhat.com\n\t(int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14])\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 A2164285B5\n\tfor ; Fri, 1 Sep 2017 15:38:08 +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 46ACD60C2C;\n\tFri, 1 Sep 2017 15:38:01 +0000 (UTC)","by blackfin.pond.sub.org (Postfix, from userid 1000)\n\tid 549BA1138668; Fri, 1 Sep 2017 17:37:58 +0200 (CEST)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com A2164285B5","From":"Markus Armbruster ","To":"qemu-devel@nongnu.org","Date":"Fri, 1 Sep 2017 17:37:17 +0200","Message-Id":"<20170901153758.8628-7-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.14","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.30]);\n\tFri, 01 Sep 2017 15:38:08 +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 06/47] qlit: use QLit prefix consistently","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\nRename from LiteralQ to QLit.\n\nSigned-off-by: Marc-André Lureau \nReviewed-by: Markus Armbruster \nMessage-Id: <20170825105913.4060-4-marcandre.lureau@redhat.com>\nSigned-off-by: Markus Armbruster \n---\n include/qapi/qmp/qlit.h | 24 ++++++++++++------------\n qobject/qlit.c | 4 ++--\n tests/check-qjson.c | 40 ++++++++++++++++++++--------------------\n 3 files changed, 34 insertions(+), 34 deletions(-)","diff":"diff --git a/include/qapi/qmp/qlit.h b/include/qapi/qmp/qlit.h\nindex 280db5064a..a4ad91321b 100644\n--- a/include/qapi/qmp/qlit.h\n+++ b/include/qapi/qmp/qlit.h\n@@ -17,33 +17,33 @@\n #include \"qapi-types.h\"\n #include \"qobject.h\"\n \n-typedef struct LiteralQDictEntry LiteralQDictEntry;\n-typedef struct LiteralQObject LiteralQObject;\n+typedef struct QLitDictEntry QLitDictEntry;\n+typedef struct QLitObject QLitObject;\n \n-struct LiteralQObject {\n+struct QLitObject {\n int type;\n union {\n int64_t qnum;\n const char *qstr;\n- LiteralQDictEntry *qdict;\n- LiteralQObject *qlist;\n+ QLitDictEntry *qdict;\n+ QLitObject *qlist;\n } value;\n };\n \n-struct LiteralQDictEntry {\n+struct QLitDictEntry {\n const char *key;\n- LiteralQObject value;\n+ QLitObject value;\n };\n \n #define QLIT_QNUM(val) \\\n- (LiteralQObject){.type = QTYPE_QNUM, .value.qnum = (val)}\n+ (QLitObject){.type = QTYPE_QNUM, .value.qnum = (val)}\n #define QLIT_QSTR(val) \\\n- (LiteralQObject){.type = QTYPE_QSTRING, .value.qstr = (val)}\n+ (QLitObject){.type = QTYPE_QSTRING, .value.qstr = (val)}\n #define QLIT_QDICT(val) \\\n- (LiteralQObject){.type = QTYPE_QDICT, .value.qdict = (val)}\n+ (QLitObject){.type = QTYPE_QDICT, .value.qdict = (val)}\n #define QLIT_QLIST(val) \\\n- (LiteralQObject){.type = QTYPE_QLIST, .value.qlist = (val)}\n+ (QLitObject){.type = QTYPE_QLIST, .value.qlist = (val)}\n \n-int compare_litqobj_to_qobj(LiteralQObject *lhs, QObject *rhs);\n+int compare_litqobj_to_qobj(QLitObject *lhs, QObject *rhs);\n \n #endif /* QLIT_H */\ndiff --git a/qobject/qlit.c b/qobject/qlit.c\nindex 5917c3584e..262d64988d 100644\n--- a/qobject/qlit.c\n+++ b/qobject/qlit.c\n@@ -20,7 +20,7 @@\n \n typedef struct QListCompareHelper {\n int index;\n- LiteralQObject *objs;\n+ QLitObject *objs;\n int result;\n } QListCompareHelper;\n \n@@ -41,7 +41,7 @@ static void compare_helper(QObject *obj, void *opaque)\n compare_litqobj_to_qobj(&helper->objs[helper->index++], obj);\n }\n \n-int compare_litqobj_to_qobj(LiteralQObject *lhs, QObject *rhs)\n+int compare_litqobj_to_qobj(QLitObject *lhs, QObject *rhs)\n {\n int64_t val;\n \ndiff --git a/tests/check-qjson.c b/tests/check-qjson.c\nindex 525f79e60b..82b3681327 100644\n--- a/tests/check-qjson.c\n+++ b/tests/check-qjson.c\n@@ -1065,23 +1065,23 @@ static void simple_dict(void)\n int i;\n struct {\n const char *encoded;\n- LiteralQObject decoded;\n+ QLitObject decoded;\n } test_cases[] = {\n {\n .encoded = \"{\\\"foo\\\": 42, \\\"bar\\\": \\\"hello world\\\"}\",\n- .decoded = QLIT_QDICT(((LiteralQDictEntry[]){\n+ .decoded = QLIT_QDICT(((QLitDictEntry[]){\n { \"foo\", QLIT_QNUM(42) },\n { \"bar\", QLIT_QSTR(\"hello world\") },\n { }\n })),\n }, {\n .encoded = \"{}\",\n- .decoded = QLIT_QDICT(((LiteralQDictEntry[]){\n+ .decoded = QLIT_QDICT(((QLitDictEntry[]){\n { }\n })),\n }, {\n .encoded = \"{\\\"foo\\\": 43}\",\n- .decoded = QLIT_QDICT(((LiteralQDictEntry[]){\n+ .decoded = QLIT_QDICT(((QLitDictEntry[]){\n { \"foo\", QLIT_QNUM(43) },\n { }\n })),\n@@ -1163,11 +1163,11 @@ static void simple_list(void)\n int i;\n struct {\n const char *encoded;\n- LiteralQObject decoded;\n+ QLitObject decoded;\n } test_cases[] = {\n {\n .encoded = \"[43,42]\",\n- .decoded = QLIT_QLIST(((LiteralQObject[]){\n+ .decoded = QLIT_QLIST(((QLitObject[]){\n QLIT_QNUM(43),\n QLIT_QNUM(42),\n { }\n@@ -1175,21 +1175,21 @@ static void simple_list(void)\n },\n {\n .encoded = \"[43]\",\n- .decoded = QLIT_QLIST(((LiteralQObject[]){\n+ .decoded = QLIT_QLIST(((QLitObject[]){\n QLIT_QNUM(43),\n { }\n })),\n },\n {\n .encoded = \"[]\",\n- .decoded = QLIT_QLIST(((LiteralQObject[]){\n+ .decoded = QLIT_QLIST(((QLitObject[]){\n { }\n })),\n },\n {\n .encoded = \"[{}]\",\n- .decoded = QLIT_QLIST(((LiteralQObject[]){\n- QLIT_QDICT(((LiteralQDictEntry[]){\n+ .decoded = QLIT_QLIST(((QLitObject[]){\n+ QLIT_QDICT(((QLitDictEntry[]){\n {},\n })),\n {},\n@@ -1220,11 +1220,11 @@ static void simple_whitespace(void)\n int i;\n struct {\n const char *encoded;\n- LiteralQObject decoded;\n+ QLitObject decoded;\n } test_cases[] = {\n {\n .encoded = \" [ 43 , 42 ]\",\n- .decoded = QLIT_QLIST(((LiteralQObject[]){\n+ .decoded = QLIT_QLIST(((QLitObject[]){\n QLIT_QNUM(43),\n QLIT_QNUM(42),\n { }\n@@ -1232,12 +1232,12 @@ static void simple_whitespace(void)\n },\n {\n .encoded = \" [ 43 , { 'h' : 'b' }, [ ], 42 ]\",\n- .decoded = QLIT_QLIST(((LiteralQObject[]){\n+ .decoded = QLIT_QLIST(((QLitObject[]){\n QLIT_QNUM(43),\n- QLIT_QDICT(((LiteralQDictEntry[]){\n+ QLIT_QDICT(((QLitDictEntry[]){\n { \"h\", QLIT_QSTR(\"b\") },\n { }})),\n- QLIT_QLIST(((LiteralQObject[]){\n+ QLIT_QLIST(((QLitObject[]){\n { }})),\n QLIT_QNUM(42),\n { }\n@@ -1245,13 +1245,13 @@ static void simple_whitespace(void)\n },\n {\n .encoded = \" [ 43 , { 'h' : 'b' , 'a' : 32 }, [ ], 42 ]\",\n- .decoded = QLIT_QLIST(((LiteralQObject[]){\n+ .decoded = QLIT_QLIST(((QLitObject[]){\n QLIT_QNUM(43),\n- QLIT_QDICT(((LiteralQDictEntry[]){\n+ QLIT_QDICT(((QLitDictEntry[]){\n { \"h\", QLIT_QSTR(\"b\") },\n { \"a\", QLIT_QNUM(32) },\n { }})),\n- QLIT_QLIST(((LiteralQObject[]){\n+ QLIT_QLIST(((QLitObject[]){\n { }})),\n QLIT_QNUM(42),\n { }\n@@ -1282,10 +1282,10 @@ static void simple_varargs(void)\n {\n QObject *embedded_obj;\n QObject *obj;\n- LiteralQObject decoded = QLIT_QLIST(((LiteralQObject[]){\n+ QLitObject decoded = QLIT_QLIST(((QLitObject[]){\n QLIT_QNUM(1),\n QLIT_QNUM(2),\n- QLIT_QLIST(((LiteralQObject[]){\n+ QLIT_QLIST(((QLitObject[]){\n QLIT_QNUM(32),\n QLIT_QNUM(42),\n {}})),\n","prefixes":["PULL","v2","06/47"]}