From nobody Tue Feb 10 12:40:08 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 1528352988417698.9109149510368; Wed, 6 Jun 2018 23:29:48 -0700 (PDT) Received: from localhost ([::1]:55928 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fQoQd-0003NI-Jc for importer@patchew.org; Thu, 07 Jun 2018 02:29:47 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51640) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fQoN9-0000mF-Ly for qemu-devel@nongnu.org; Thu, 07 Jun 2018 02:26:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fQoN7-0002ot-ND for qemu-devel@nongnu.org; Thu, 07 Jun 2018 02:26:11 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47578) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fQoN2-0002gt-7h; Thu, 07 Jun 2018 02:26:04 -0400 Received: from smtp.corp.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7F4ED307D842; 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 47DEE87664; Thu, 7 Jun 2018 06:26:03 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 0E4D811386D9; Thu, 7 Jun 2018 08:26:00 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Thu, 7 Jun 2018 08:25:54 +0200 Message-Id: <20180607062559.16127-15-armbru@redhat.com> In-Reply-To: <20180607062559.16127-1-armbru@redhat.com> References: <20180607062559.16127-1-armbru@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.27 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.48]); 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 14/19] block-qdict: Simplify qdict_is_list() some 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" Signed-off-by: Markus Armbruster --- qobject/block-qdict.c | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/qobject/block-qdict.c b/qobject/block-qdict.c index 35e9052816..f24bea30e1 100644 --- a/qobject/block-qdict.c +++ b/qobject/block-qdict.c @@ -317,27 +317,22 @@ static int qdict_is_list(QDict *maybe_list, Error **e= rrp) =20 for (ent =3D qdict_first(maybe_list); ent !=3D NULL; ent =3D qdict_next(maybe_list, ent)) { + int is_index =3D !qemu_strtoi64(ent->key, NULL, 10, &val); =20 - if (qemu_strtoi64(ent->key, NULL, 10, &val) =3D=3D 0) { - if (is_list =3D=3D -1) { - is_list =3D 1; - } else if (!is_list) { - error_setg(errp, - "Cannot mix list and non-list keys"); - return -1; - } + if (is_list =3D=3D -1) { + is_list =3D is_index; + } + + if (is_index !=3D is_list) { + error_setg(errp, "Cannot mix list and non-list keys"); + return -1; + } + + if (is_index) { len++; if (val > max) { max =3D val; } - } else { - if (is_list =3D=3D -1) { - is_list =3D 0; - } else if (is_list) { - error_setg(errp, - "Cannot mix list and non-list keys"); - return -1; - } } } =20 --=20 2.17.1