From nobody Tue Feb 10 09:24:47 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1528353485008216.37434930979043; Wed, 6 Jun 2018 23:38:05 -0700 (PDT) Received: from localhost ([::1]:55975 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fQoYe-0003gA-9U for importer@patchew.org; Thu, 07 Jun 2018 02:38:04 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51726) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fQoNC-0000oN-1M for qemu-devel@nongnu.org; Thu, 07 Jun 2018 02:26:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fQoNA-0002s6-2u for qemu-devel@nongnu.org; Thu, 07 Jun 2018 02:26:14 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34792) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fQoN2-0002hP-Ig; Thu, 07 Jun 2018 02:26:04 -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 D22EF30841AB; Thu, 7 Jun 2018 06:26:03 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-48.ams2.redhat.com [10.36.116.48]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 49503177ED; Thu, 7 Jun 2018 06:26:03 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 0ADD211386D7; Thu, 7 Jun 2018 08:26:00 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Thu, 7 Jun 2018 08:25:53 +0200 Message-Id: <20180607062559.16127-14-armbru@redhat.com> In-Reply-To: <20180607062559.16127-1-armbru@redhat.com> References: <20180607062559.16127-1-armbru@redhat.com> 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.40]); Thu, 07 Jun 2018 06:26:03 +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] [RFC PATCH 13/19] block-qdict: Clean up qdict_crumple() a bit 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: kwolf@redhat.com, jcody@redhat.com, qemu-block@nongnu.org, mreitz@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" When you mix scalar and non-scalar keys, whether you get an "already set as scalar" or an "already set as dict" error depends on qdict iteration order. Neither message makes much sense. Replace by ""Cannot mix scalar and non-scalar keys". This is similar to the message we get for mixing list and non-list keys. I find qdict_crumple()'s first loop hard to understand. Rearrange it and add a comment. Signed-off-by: Markus Armbruster --- qobject/block-qdict.c | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/qobject/block-qdict.c b/qobject/block-qdict.c index a4e1c8d08f..35e9052816 100644 --- a/qobject/block-qdict.c +++ b/qobject/block-qdict.c @@ -403,7 +403,7 @@ static int qdict_is_list(QDict *maybe_list, Error **err= p) QObject *qdict_crumple(const QDict *src, Error **errp) { const QDictEntry *ent; - QDict *two_level, *multi_level =3D NULL; + QDict *two_level, *multi_level =3D NULL, *child_dict; QObject *dst =3D NULL, *child; size_t i; char *prefix =3D NULL; @@ -422,29 +422,29 @@ QObject *qdict_crumple(const QDict *src, Error **errp) } =20 qdict_split_flat_key(ent->key, &prefix, &suffix); - child =3D qdict_get(two_level, prefix); + child_dict =3D qobject_to(QDict, child); + + if (child) { + /* + * An existing child must be a dict and @ent must be a + * dict member (i.e. suffix not null), or else @ent + * clashes. + */ + if (!child_dict || !suffix) { + error_setg(errp, + "Cannot mix scalar and non-scalar keys"); + goto error; + } + } else if (suffix) { + child_dict =3D qdict_new(); + qdict_put(two_level, prefix, child_dict); + } else { + qdict_put_obj(two_level, prefix, qobject_ref(ent->value)); + } + if (suffix) { - QDict *child_dict =3D qobject_to(QDict, child); - if (!child_dict) { - if (child) { - error_setg(errp, "Key %s prefix is already set as a sc= alar", - prefix); - goto error; - } - - child_dict =3D qdict_new(); - qdict_put_obj(two_level, prefix, QOBJECT(child_dict)); - } - qdict_put_obj(child_dict, suffix, qobject_ref(ent->value)); - } else { - if (child) { - error_setg(errp, "Key %s prefix is already set as a dict", - prefix); - goto error; - } - qdict_put_obj(two_level, prefix, qobject_ref(ent->value)); } =20 g_free(prefix); --=20 2.17.1