{"id":808739,"url":"http://patchwork.ozlabs.org/api/patches/808739/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170901153758.8628-16-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-16-armbru@redhat.com>","list_archive_url":null,"date":"2017-09-01T15:37:26","name":"[PULL,v2,15/47] qlit: Tighten QLit list vs QList comparison","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"ccbde9c5865328f6f655ce01cc09ae76ba69fe9e","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-16-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/808739/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/808739/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-mx08.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx08.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 3xkNt62Zhnz9t3P\n\tfor ;\n\tSat, 2 Sep 2017 01:47:42 +1000 (AEST)","from localhost ([::1]:46526 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dnoAW-0000HI-Bz\n\tfor incoming@patchwork.ozlabs.org; Fri, 01 Sep 2017 11:47:40 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:51684)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dno1S-0006i2-Dc\n\tfor qemu-devel@nongnu.org; Fri, 01 Sep 2017 11:38:25 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dno1M-0001ja-Jf\n\tfor qemu-devel@nongnu.org; Fri, 01 Sep 2017 11:38:18 -0400","from mx1.redhat.com ([209.132.183.28]:51018)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dno1M-0001iT-Be\n\tfor qemu-devel@nongnu.org; Fri, 01 Sep 2017 11:38:12 -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 49BEEC056793\n\tfor ; Fri, 1 Sep 2017 15:38:11 +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 1278A81FB6;\n\tFri, 1 Sep 2017 15:38:08 +0000 (UTC)","by blackfin.pond.sub.org (Postfix, from userid 1000)\n\tid 6EF20113853A; Fri, 1 Sep 2017 17:37:58 +0200 (CEST)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 49BEEC056793","From":"Markus Armbruster ","To":"qemu-devel@nongnu.org","Date":"Fri, 1 Sep 2017 17:37:26 +0200","Message-Id":"<20170901153758.8628-16-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.32]);\n\tFri, 01 Sep 2017 15:38:11 +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 15/47] qlit: Tighten QLit list vs QList\n\tcomparison","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\nWe check that all members of the QLit list are also in the QList. We\nneglect to check the other direction. Fix that.\n\nWhile there, use QLIST_FOREACH_ENTRY() to simplify the code and break\nthe loop on the first mismatch.\n\nSigned-off-by: Marc-André Lureau \nMessage-Id: <20170825105913.4060-13-marcandre.lureau@redhat.com>\n[Commit message improved]\nSigned-off-by: Markus Armbruster \n---\n qobject/qlit.c | 53 +++++++++++++++++++----------------------------------\n tests/check-qlit.c | 3 +++\n 2 files changed, 22 insertions(+), 34 deletions(-)","diff":"diff --git a/qobject/qlit.c b/qobject/qlit.c\nindex dc0015f76c..3c4882c784 100644\n--- a/qobject/qlit.c\n+++ b/qobject/qlit.c\n@@ -18,29 +18,6 @@\n #include \"qapi/qmp/qlit.h\"\n #include \"qapi/qmp/types.h\"\n \n-typedef struct QListCompareHelper {\n- int index;\n- QLitObject *objs;\n- bool result;\n-} QListCompareHelper;\n-\n-static void compare_helper(QObject *obj, void *opaque)\n-{\n- QListCompareHelper *helper = opaque;\n-\n- if (!helper->result) {\n- return;\n- }\n-\n- if (helper->objs[helper->index].type == QTYPE_NONE) {\n- helper->result = false;\n- return;\n- }\n-\n- helper->result =\n- qlit_equal_qobject(&helper->objs[helper->index++], obj);\n-}\n-\n static bool qlit_equal_qdict(const QLitObject *lhs, const QDict *qdict)\n {\n int i;\n@@ -62,6 +39,23 @@ static bool qlit_equal_qdict(const QLitObject *lhs, const QDict *qdict)\n return true;\n }\n \n+static bool qlit_equal_qlist(const QLitObject *lhs, const QList *qlist)\n+{\n+ QListEntry *e;\n+ int i = 0;\n+\n+ QLIST_FOREACH_ENTRY(qlist, e) {\n+ QObject *obj = qlist_entry_obj(e);\n+\n+ if (!qlit_equal_qobject(&lhs->value.qlist[i], obj)) {\n+ return false;\n+ }\n+ i++;\n+ }\n+\n+ return !e && lhs->value.qlist[i].type == QTYPE_NONE;\n+}\n+\n bool qlit_equal_qobject(const QLitObject *lhs, const QObject *rhs)\n {\n if (!rhs || lhs->type != qobject_type(rhs)) {\n@@ -78,17 +72,8 @@ bool qlit_equal_qobject(const QLitObject *lhs, const QObject *rhs)\n qstring_get_str(qobject_to_qstring(rhs))) == 0);\n case QTYPE_QDICT:\n return qlit_equal_qdict(lhs, qobject_to_qdict(rhs));\n- case QTYPE_QLIST: {\n- QListCompareHelper helper;\n-\n- helper.index = 0;\n- helper.objs = lhs->value.qlist;\n- helper.result = true;\n-\n- qlist_iter(qobject_to_qlist(rhs), compare_helper, &helper);\n-\n- return helper.result;\n- }\n+ case QTYPE_QLIST:\n+ return qlit_equal_qlist(lhs, qobject_to_qlist(rhs));\n case QTYPE_QNULL:\n return true;\n default:\ndiff --git a/tests/check-qlit.c b/tests/check-qlit.c\nindex d2ecc200d3..c59ec1ab88 100644\n--- a/tests/check-qlit.c\n+++ b/tests/check-qlit.c\n@@ -58,6 +58,9 @@ static void qlit_equal_qobject_test(void)\n \n g_assert(!qlit_equal_qobject(&qlit_foo, qobj));\n \n+ qdict_put(qobject_to_qdict(qobj), \"bee\", qlist_new());\n+ g_assert(!qlit_equal_qobject(&qlit, qobj));\n+\n qobject_decref(qobj);\n }\n \n","prefixes":["PULL","v2","15/47"]}