{"id":808735,"url":"http://patchwork.ozlabs.org/api/patches/808735/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170901153758.8628-6-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-6-armbru@redhat.com>","list_archive_url":null,"date":"2017-09-01T15:37:16","name":"[PULL,v2,05/47] qlit: move qlit from check-qjson to qobject/","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"8b9cb4ae93f80f01397f87592102ae1600570a8b","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-6-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/808735/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/808735/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-mx04.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx04.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 3xkNpn1w4Bz9t2d\n\tfor ;\n\tSat, 2 Sep 2017 01:44:49 +1000 (AEST)","from localhost ([::1]:46506 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dno7j-0004ym-9a\n\tfor incoming@patchwork.ozlabs.org; Fri, 01 Sep 2017 11:44:47 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:51412)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dno1J-0006b7-Ls\n\tfor qemu-devel@nongnu.org; Fri, 01 Sep 2017 11:38:11 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dno1I-0001e7-5a\n\tfor qemu-devel@nongnu.org; Fri, 01 Sep 2017 11:38:09 -0400","from mx1.redhat.com ([209.132.183.28]:33900)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dno1H-0001df-Rj\n\tfor qemu-devel@nongnu.org; Fri, 01 Sep 2017 11:38:08 -0400","from smtp.corp.redhat.com\n\t(int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12])\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 C6D5E7EA9F\n\tfor ; Fri, 1 Sep 2017 15:38:06 +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 47F7D81FB5;\n\tFri, 1 Sep 2017 15:38:01 +0000 (UTC)","by blackfin.pond.sub.org (Postfix, from userid 1000)\n\tid 51B331138667; Fri, 1 Sep 2017 17:37:58 +0200 (CEST)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com C6D5E7EA9F","From":"Markus Armbruster ","To":"qemu-devel@nongnu.org","Date":"Fri, 1 Sep 2017 17:37:16 +0200","Message-Id":"<20170901153758.8628-6-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.12","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.28]);\n\tFri, 01 Sep 2017 15:38:06 +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 05/47] qlit: move qlit from check-qjson to\n\tqobject/","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\nFix code style issues while at it, to please checkpatch.\n\nSigned-off-by: Marc-André Lureau \nReviewed-by: Markus Armbruster \nMessage-Id: <20170825105913.4060-3-marcandre.lureau@redhat.com>\nSigned-off-by: Markus Armbruster \n---\n include/qapi/qmp/qlit.h | 49 +++++++++++++++++++++++++\n qobject/Makefile.objs | 2 +-\n qobject/qlit.c | 89 +++++++++++++++++++++++++++++++++++++++++++++\n tests/check-qjson.c | 96 +------------------------------------------------\n 4 files changed, 140 insertions(+), 96 deletions(-)\n create mode 100644 include/qapi/qmp/qlit.h\n create mode 100644 qobject/qlit.c","diff":"diff --git a/include/qapi/qmp/qlit.h b/include/qapi/qmp/qlit.h\nnew file mode 100644\nindex 0000000000..280db5064a\n--- /dev/null\n+++ b/include/qapi/qmp/qlit.h\n@@ -0,0 +1,49 @@\n+/*\n+ * Copyright IBM, Corp. 2009\n+ * Copyright (c) 2013, 2015, 2017 Red Hat Inc.\n+ *\n+ * Authors:\n+ * Anthony Liguori \n+ * Markus Armbruster \n+ * Marc-André Lureau \n+ *\n+ * This work is licensed under the terms of the GNU LGPL, version 2.1 or later.\n+ * See the COPYING.LIB file in the top-level directory.\n+ *\n+ */\n+#ifndef QLIT_H\n+#define QLIT_H\n+\n+#include \"qapi-types.h\"\n+#include \"qobject.h\"\n+\n+typedef struct LiteralQDictEntry LiteralQDictEntry;\n+typedef struct LiteralQObject LiteralQObject;\n+\n+struct LiteralQObject {\n+ int type;\n+ union {\n+ int64_t qnum;\n+ const char *qstr;\n+ LiteralQDictEntry *qdict;\n+ LiteralQObject *qlist;\n+ } value;\n+};\n+\n+struct LiteralQDictEntry {\n+ const char *key;\n+ LiteralQObject value;\n+};\n+\n+#define QLIT_QNUM(val) \\\n+ (LiteralQObject){.type = QTYPE_QNUM, .value.qnum = (val)}\n+#define QLIT_QSTR(val) \\\n+ (LiteralQObject){.type = QTYPE_QSTRING, .value.qstr = (val)}\n+#define QLIT_QDICT(val) \\\n+ (LiteralQObject){.type = QTYPE_QDICT, .value.qdict = (val)}\n+#define QLIT_QLIST(val) \\\n+ (LiteralQObject){.type = QTYPE_QLIST, .value.qlist = (val)}\n+\n+int compare_litqobj_to_qobj(LiteralQObject *lhs, QObject *rhs);\n+\n+#endif /* QLIT_H */\ndiff --git a/qobject/Makefile.objs b/qobject/Makefile.objs\nindex fc8885c9a4..002d25873a 100644\n--- a/qobject/Makefile.objs\n+++ b/qobject/Makefile.objs\n@@ -1,2 +1,2 @@\n-util-obj-y = qnull.o qnum.o qstring.o qdict.o qlist.o qbool.o\n+util-obj-y = qnull.o qnum.o qstring.o qdict.o qlist.o qbool.o qlit.o\n util-obj-y += qjson.o qobject.o json-lexer.o json-streamer.o json-parser.o\ndiff --git a/qobject/qlit.c b/qobject/qlit.c\nnew file mode 100644\nindex 0000000000..5917c3584e\n--- /dev/null\n+++ b/qobject/qlit.c\n@@ -0,0 +1,89 @@\n+/*\n+ * QLit literal qobject\n+ *\n+ * Copyright IBM, Corp. 2009\n+ * Copyright (c) 2013, 2015, 2017 Red Hat Inc.\n+ *\n+ * Authors:\n+ * Anthony Liguori \n+ * Markus Armbruster \n+ * Marc-André Lureau \n+ *\n+ * This work is licensed under the terms of the GNU LGPL, version 2.1 or later.\n+ * See the COPYING.LIB file in the top-level directory.\n+ */\n+\n+#include \"qemu/osdep.h\"\n+\n+#include \"qapi/qmp/qlit.h\"\n+#include \"qapi/qmp/types.h\"\n+\n+typedef struct QListCompareHelper {\n+ int index;\n+ LiteralQObject *objs;\n+ int result;\n+} QListCompareHelper;\n+\n+static void compare_helper(QObject *obj, void *opaque)\n+{\n+ QListCompareHelper *helper = opaque;\n+\n+ if (helper->result == 0) {\n+ return;\n+ }\n+\n+ if (helper->objs[helper->index].type == QTYPE_NONE) {\n+ helper->result = 0;\n+ return;\n+ }\n+\n+ helper->result =\n+ compare_litqobj_to_qobj(&helper->objs[helper->index++], obj);\n+}\n+\n+int compare_litqobj_to_qobj(LiteralQObject *lhs, QObject *rhs)\n+{\n+ int64_t val;\n+\n+ if (!rhs || lhs->type != qobject_type(rhs)) {\n+ return 0;\n+ }\n+\n+ switch (lhs->type) {\n+ case QTYPE_QNUM:\n+ g_assert(qnum_get_try_int(qobject_to_qnum(rhs), &val));\n+ return lhs->value.qnum == val;\n+ case QTYPE_QSTRING:\n+ return (strcmp(lhs->value.qstr,\n+ qstring_get_str(qobject_to_qstring(rhs))) == 0);\n+ case QTYPE_QDICT: {\n+ int i;\n+\n+ for (i = 0; lhs->value.qdict[i].key; i++) {\n+ QObject *obj = qdict_get(qobject_to_qdict(rhs),\n+ lhs->value.qdict[i].key);\n+\n+ if (!compare_litqobj_to_qobj(&lhs->value.qdict[i].value, obj)) {\n+ return 0;\n+ }\n+ }\n+\n+ return 1;\n+ }\n+ case QTYPE_QLIST: {\n+ QListCompareHelper helper;\n+\n+ helper.index = 0;\n+ helper.objs = lhs->value.qlist;\n+ helper.result = 1;\n+\n+ qlist_iter(qobject_to_qlist(rhs), compare_helper, &helper);\n+\n+ return helper.result;\n+ }\n+ default:\n+ break;\n+ }\n+\n+ return 0;\n+}\ndiff --git a/tests/check-qjson.c b/tests/check-qjson.c\nindex a3a97b0d99..525f79e60b 100644\n--- a/tests/check-qjson.c\n+++ b/tests/check-qjson.c\n@@ -16,6 +16,7 @@\n #include \"qapi/error.h\"\n #include \"qapi/qmp/types.h\"\n #include \"qapi/qmp/qjson.h\"\n+#include \"qapi/qmp/qlit.h\"\n #include \"qemu-common.h\"\n \n static void escaped_string(void)\n@@ -1059,101 +1060,6 @@ static void keyword_literal(void)\n QDECREF(null);\n }\n \n-typedef struct LiteralQDictEntry LiteralQDictEntry;\n-typedef struct LiteralQObject LiteralQObject;\n-\n-struct LiteralQObject\n-{\n- int type;\n- union {\n- int64_t qnum;\n- const char *qstr;\n- LiteralQDictEntry *qdict;\n- LiteralQObject *qlist;\n- } value;\n-};\n-\n-struct LiteralQDictEntry\n-{\n- const char *key;\n- LiteralQObject value;\n-};\n-\n-#define QLIT_QNUM(val) (LiteralQObject){.type = QTYPE_QNUM, .value.qnum = (val)}\n-#define QLIT_QSTR(val) (LiteralQObject){.type = QTYPE_QSTRING, .value.qstr = (val)}\n-#define QLIT_QDICT(val) (LiteralQObject){.type = QTYPE_QDICT, .value.qdict = (val)}\n-#define QLIT_QLIST(val) (LiteralQObject){.type = QTYPE_QLIST, .value.qlist = (val)}\n-\n-typedef struct QListCompareHelper\n-{\n- int index;\n- LiteralQObject *objs;\n- int result;\n-} QListCompareHelper;\n-\n-static int compare_litqobj_to_qobj(LiteralQObject *lhs, QObject *rhs);\n-\n-static void compare_helper(QObject *obj, void *opaque)\n-{\n- QListCompareHelper *helper = opaque;\n-\n- if (helper->result == 0) {\n- return;\n- }\n-\n- if (helper->objs[helper->index].type == QTYPE_NONE) {\n- helper->result = 0;\n- return;\n- }\n-\n- helper->result = compare_litqobj_to_qobj(&helper->objs[helper->index++], obj);\n-}\n-\n-static int compare_litqobj_to_qobj(LiteralQObject *lhs, QObject *rhs)\n-{\n- int64_t val;\n-\n- if (!rhs || lhs->type != qobject_type(rhs)) {\n- return 0;\n- }\n-\n- switch (lhs->type) {\n- case QTYPE_QNUM:\n- g_assert(qnum_get_try_int(qobject_to_qnum(rhs), &val));\n- return lhs->value.qnum == val;\n- case QTYPE_QSTRING:\n- return (strcmp(lhs->value.qstr, qstring_get_str(qobject_to_qstring(rhs))) == 0);\n- case QTYPE_QDICT: {\n- int i;\n-\n- for (i = 0; lhs->value.qdict[i].key; i++) {\n- QObject *obj = qdict_get(qobject_to_qdict(rhs), lhs->value.qdict[i].key);\n-\n- if (!compare_litqobj_to_qobj(&lhs->value.qdict[i].value, obj)) {\n- return 0;\n- }\n- }\n-\n- return 1;\n- }\n- case QTYPE_QLIST: {\n- QListCompareHelper helper;\n-\n- helper.index = 0;\n- helper.objs = lhs->value.qlist;\n- helper.result = 1;\n- \n- qlist_iter(qobject_to_qlist(rhs), compare_helper, &helper);\n-\n- return helper.result;\n- }\n- default:\n- break;\n- }\n-\n- return 0;\n-}\n-\n static void simple_dict(void)\n {\n int i;\n","prefixes":["PULL","v2","05/47"]}