From patchwork Thu Aug 24 10:33:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= X-Patchwork-Id: 805435 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3xdLQN5Knvz9sNd for ; Thu, 24 Aug 2017 20:39:40 +1000 (AEST) Received: from localhost ([::1]:47652 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dkpY2-0002Z3-KH for incoming@patchwork.ozlabs.org; Thu, 24 Aug 2017 06:39:38 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58897) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dkpT7-0007F1-N8 for qemu-devel@nongnu.org; Thu, 24 Aug 2017 06:34:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dkpT6-00048y-IP for qemu-devel@nongnu.org; Thu, 24 Aug 2017 06:34:33 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38024) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dkpT6-00048e-9v for qemu-devel@nongnu.org; Thu, 24 Aug 2017 06:34:32 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 55D03C04B930 for ; Thu, 24 Aug 2017 10:34:31 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 55D03C04B930 Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=marcandre.lureau@redhat.com Received: from localhost (ovpn-112-52.ams2.redhat.com [10.36.112.52]) by smtp.corp.redhat.com (Postfix) with ESMTP id 18CF271C5A; Thu, 24 Aug 2017 10:34:28 +0000 (UTC) From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Date: Thu, 24 Aug 2017 12:33:47 +0200 Message-Id: <20170824103350.16400-12-marcandre.lureau@redhat.com> In-Reply-To: <20170824103350.16400-1-marcandre.lureau@redhat.com> References: <20170824103350.16400-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Thu, 24 Aug 2017 10:34:31 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 11/14] qlit: improve QLit dict vs qdict comparison X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , armbru@redhat.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Fail if the QLit dict doesn't match exactly the object dict. To do so, create a copy of the original qdict, and remove the checked elements. Verify that the dict is empty by the end of the comparison. Signed-off-by: Marc-André Lureau --- qobject/qlit.c | 42 ++++++++++++++++++++++++++++-------------- tests/check-qlit.c | 7 +++++++ 2 files changed, 35 insertions(+), 14 deletions(-) diff --git a/qobject/qlit.c b/qobject/qlit.c index 7e4bf92862..45ae0635c0 100644 --- a/qobject/qlit.c +++ b/qobject/qlit.c @@ -41,6 +41,32 @@ static void compare_helper(QObject *obj, void *opaque) qlit_equal_qobject(&helper->objs[helper->index++], obj); } +static bool qlit_equal_qdict(const QLitObject *lhs, const QDict *qdict) +{ + QDict *dict = qdict_clone_shallow(qdict); + bool success = false; + int i; + + for (i = 0; lhs->value.qdict[i].key; i++) { + QObject *obj = qdict_get(dict, lhs->value.qdict[i].key); + + if (!qlit_equal_qobject(&lhs->value.qdict[i].value, obj)) { + goto end; + } + qdict_del(dict, lhs->value.qdict[i].key); + } + + if (qdict_size(dict) != 0) { + goto end; + } + + success = true; + +end: + QDECREF(dict); + return success; +} + bool qlit_equal_qobject(const QLitObject *lhs, const QObject *rhs) { int64_t val; @@ -58,20 +84,8 @@ bool qlit_equal_qobject(const QLitObject *lhs, const QObject *rhs) case QTYPE_QSTRING: return (strcmp(lhs->value.qstr, qstring_get_str(qobject_to_qstring(rhs))) == 0); - case QTYPE_QDICT: { - int i; - - for (i = 0; lhs->value.qdict[i].key; i++) { - QObject *obj = qdict_get(qobject_to_qdict(rhs), - lhs->value.qdict[i].key); - - if (!qlit_equal_qobject(&lhs->value.qdict[i].value, obj)) { - return false; - } - } - - return true; - } + case QTYPE_QDICT: + return qlit_equal_qdict(lhs, qobject_to_qdict(rhs)); case QTYPE_QLIST: { QListCompareHelper helper; diff --git a/tests/check-qlit.c b/tests/check-qlit.c index 47fde92a46..5d9558dfd9 100644 --- a/tests/check-qlit.c +++ b/tests/check-qlit.c @@ -28,6 +28,11 @@ static QLitObject qlit = QLIT_QDICT(((QLitDictEntry[]) { { }, })); +static QLitObject qlit_foo = QLIT_QDICT(((QLitDictEntry[]) { + { "foo", QLIT_QNUM(42) }, + { }, +})); + static QObject *make_qobject(void) { QDict *qdict = qdict_new(); @@ -51,6 +56,8 @@ static void qlit_equal_qobject_test(void) g_assert(qlit_equal_qobject(&qlit, qobj)); + g_assert(!qlit_equal_qobject(&qlit_foo, qobj)); + qobject_decref(qobj); }