From nobody Sun Feb 8 22:49:38 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1502118188499786.4569141504792; Mon, 7 Aug 2017 08:03:08 -0700 (PDT) Received: from localhost ([::1]:37774 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dejYh-0005NL-90 for importer@patchew.org; Mon, 07 Aug 2017 11:03:07 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48927) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dejJ1-0007K1-RH for qemu-devel@nongnu.org; Mon, 07 Aug 2017 10:47:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dejIl-0003s6-Pm for qemu-devel@nongnu.org; Mon, 07 Aug 2017 10:46:55 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56090) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dejIT-0003Xg-PU; Mon, 07 Aug 2017 10:46:21 -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 B0A26356C9; Mon, 7 Aug 2017 14:46:20 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-254.ams2.redhat.com [10.36.116.254]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B09956A307; Mon, 7 Aug 2017 14:46:01 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 0F770113864F; Mon, 7 Aug 2017 16:46:00 +0200 (CEST) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com B0A26356C9 Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=armbru@redhat.com From: Markus Armbruster To: qemu-devel@nongnu.org Date: Mon, 7 Aug 2017 16:45:06 +0200 Message-Id: <1502117160-24655-3-git-send-email-armbru@redhat.com> In-Reply-To: <1502117160-24655-1-git-send-email-armbru@redhat.com> References: <1502117160-24655-1-git-send-email-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.30]); Mon, 07 Aug 2017 14:46:20 +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 02/56] qdict: New helpers to put and get unsigned integers 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, famz@redhat.com, qemu-block@nongnu.org, quintela@redhat.com, jcody@redhat.com, dgilbert@redhat.com, mreitz@redhat.com, marcandre.lureau@redhat.com, pbonzini@redhat.com, jsnow@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 --- include/qapi/qmp/qdict.h | 5 +++++ qobject/qdict.c | 43 ++++++++++++++++++++++++++++++++++++------- 2 files changed, 41 insertions(+), 7 deletions(-) diff --git a/include/qapi/qmp/qdict.h b/include/qapi/qmp/qdict.h index 363e431..3b52481 100644 --- a/include/qapi/qmp/qdict.h +++ b/include/qapi/qmp/qdict.h @@ -56,6 +56,8 @@ void qdict_destroy_obj(QObject *obj); /* Helpers for int, bool, and string */ #define qdict_put_int(qdict, key, value) \ qdict_put(qdict, key, qnum_from_int(value)) +#define qdict_put_uint(qdict, key, value) \ + qdict_put(qdict, key, qnum_from_uint(value)) #define qdict_put_bool(qdict, key, value) \ qdict_put(qdict, key, qbool_from_bool(value)) #define qdict_put_str(qdict, key, value) \ @@ -64,12 +66,15 @@ void qdict_destroy_obj(QObject *obj); /* High level helpers */ double qdict_get_double(const QDict *qdict, const char *key); int64_t qdict_get_int(const QDict *qdict, const char *key); +uint64_t qdict_get_uint(const QDict *qdict, const char *key); bool qdict_get_bool(const QDict *qdict, const char *key); QList *qdict_get_qlist(const QDict *qdict, const char *key); QDict *qdict_get_qdict(const QDict *qdict, const char *key); const char *qdict_get_str(const QDict *qdict, const char *key); int64_t qdict_get_try_int(const QDict *qdict, const char *key, int64_t def_value); +uint64_t qdict_get_try_uint(const QDict *qdict, const char *key, + uint64_t def_value); bool qdict_get_try_bool(const QDict *qdict, const char *key, bool def_valu= e); const char *qdict_get_try_str(const QDict *qdict, const char *key); =20 diff --git a/qobject/qdict.c b/qobject/qdict.c index d795079..be919b9 100644 --- a/qobject/qdict.c +++ b/qobject/qdict.c @@ -189,10 +189,9 @@ double qdict_get_double(const QDict *qdict, const char= *key) } =20 /** - * qdict_get_int(): Get an integer mapped by @key + * qdict_get_int(): Get a signed integer mapped by @key * - * This function assumes that @key exists and it stores a - * QNum representable as int. + * @qdict must map @key to an integer QNum that fits into int64_t. * * Return integer mapped by @key. */ @@ -202,6 +201,18 @@ int64_t qdict_get_int(const QDict *qdict, const char *= key) } =20 /** + * qdict_get_uint(): Get an unsigned integer mapped by 'key' + * + * @qdict must map @key to an integer QNum that fits into uint64_t. + * + * Return integer mapped by 'key'. + */ +uint64_t qdict_get_uint(const QDict *qdict, const char *key) +{ + return qnum_get_uint(qobject_to_qnum(qdict_get(qdict, key))); +} + +/** * qdict_get_bool(): Get a bool mapped by @key * * This function assumes that @key exists and it stores a @@ -245,11 +256,10 @@ const char *qdict_get_str(const QDict *qdict, const c= har *key) } =20 /** - * qdict_get_try_int(): Try to get integer mapped by @key + * qdict_get_try_int(): Try to get signed integer mapped by @key * - * Return integer mapped by @key, if it is not present in the - * dictionary or if the stored object is not a QNum representing an - * integer, @def_value will be returned. + * If @qdict maps @key to an integer QNum that fits into int64_t, + * return it. Else return @def_value. */ int64_t qdict_get_try_int(const QDict *qdict, const char *key, int64_t def_value) @@ -265,6 +275,25 @@ int64_t qdict_get_try_int(const QDict *qdict, const ch= ar *key, } =20 /** + * qdict_get_try_uint(): Try to get unsigned integer mapped by 'key' + * + * If @qdict maps @key to an integer QNum that fits into uint64_t, + * return it. Else return @def_value. + */ +uint64_t qdict_get_try_uint(const QDict *qdict, const char *key, + uint64_t def_value) +{ + QNum *qnum =3D qobject_to_qnum(qdict_get(qdict, key)); + uint64_t val; + + if (!qnum || !qnum_get_try_uint(qnum, &val)) { + return def_value; + } + + return val; +} + +/** * qdict_get_try_bool(): Try to get a bool mapped by @key * * Return bool mapped by @key, if it is not present in the --=20 2.7.5