From nobody Thu Jul 17 10:21:33 2025 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.zoho.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 1487711257734326.6092588081349; Tue, 21 Feb 2017 13:07:37 -0800 (PST) Received: from localhost ([::1]:48579 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cgHep-0000YC-GB for importer@patchew.org; Tue, 21 Feb 2017 16:07:35 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38717) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cgHZN-0005CU-7a for qemu-devel@nongnu.org; Tue, 21 Feb 2017 16:01:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cgHZM-0006do-A3 for qemu-devel@nongnu.org; Tue, 21 Feb 2017 16:01:57 -0500 Received: from mx1.redhat.com ([209.132.183.28]:44120) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cgHZH-0006az-P1; Tue, 21 Feb 2017 16:01:51 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B92EE80F8F; Tue, 21 Feb 2017 21:01:51 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-55.ams2.redhat.com [10.36.116.55]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v1LL1nAZ001092 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Tue, 21 Feb 2017 16:01:51 -0500 Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 6A0D21138657; Tue, 21 Feb 2017 22:01:48 +0100 (CET) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Tue, 21 Feb 2017 22:01:47 +0100 Message-Id: <1487710908-26356-5-git-send-email-armbru@redhat.com> In-Reply-To: <1487710908-26356-1-git-send-email-armbru@redhat.com> References: <1487710908-26356-1-git-send-email-armbru@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Tue, 21 Feb 2017 21:01:51 +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 RFC v3 4/5] qapi: Factor qobject_input_get_autocast() out of methods 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, pkrempa@redhat.com, qemu-block@nongnu.org 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 Reviewed-by: Eric Blake --- qapi/qobject-input-visitor.c | 87 ++++++++++++++++++----------------------= ---- 1 file changed, 35 insertions(+), 52 deletions(-) diff --git a/qapi/qobject-input-visitor.c b/qapi/qobject-input-visitor.c index 0bf6849..970bb37 100644 --- a/qapi/qobject-input-visitor.c +++ b/qapi/qobject-input-visitor.c @@ -143,6 +143,28 @@ static QObject *qobject_input_get_object(QObjectInputV= isitor *qiv, return obj; } =20 +static const char *qobject_input_get_autocast(QObjectInputVisitor *qiv, + const char *name, + Error **errp) +{ + QObject *qobj; + QString *qstr; + + qobj =3D qobject_input_get_object(qiv, name, true, errp); + if (!qobj) { + return NULL; + } + + qstr =3D qobject_to_qstring(qobj); + if (!qstr) { + error_setg(errp, QERR_INVALID_PARAMETER_TYPE, + qobject_input_get_name(qiv, name), "string"); + return NULL; + } + + return qstring_get_str(qstr); +} + static void qdict_add_key(const char *key, QObject *obj, void *opaque) { GHashTable *h =3D opaque; @@ -328,20 +350,13 @@ static void qobject_input_type_int64_autocast(Visitor= *v, const char *name, int64_t *obj, Error **errp) { QObjectInputVisitor *qiv =3D to_qiv(v); - QObject *qobj =3D qobject_input_get_object(qiv, name, true, errp); - QString *qstr; + const char *str =3D qobject_input_get_autocast(qiv, name, errp); =20 - if (!qobj) { - return; - } - qstr =3D qobject_to_qstring(qobj); - if (!qstr) { - error_setg(errp, QERR_INVALID_PARAMETER_TYPE, - qobject_input_get_name(qiv, name), "string"); + if (!str) { return; } =20 - if (qemu_strtoi64(qstring_get_str(qstr), NULL, 0, obj) < 0) { + if (qemu_strtoi64(str, NULL, 0, obj) < 0) { /* TODO report -ERANGE more nicely */ error_setg(errp, QERR_INVALID_PARAMETER_VALUE, qobject_input_get_name(qiv, name), "integer"); @@ -373,20 +388,13 @@ static void qobject_input_type_uint64_autocast(Visito= r *v, const char *name, uint64_t *obj, Error **errp) { QObjectInputVisitor *qiv =3D to_qiv(v); - QObject *qobj =3D qobject_input_get_object(qiv, name, true, errp); - QString *qstr; + const char *str =3D qobject_input_get_autocast(qiv, name, errp); =20 - if (!qobj) { - return; - } - qstr =3D qobject_to_qstring(qobj); - if (!qstr) { - error_setg(errp, QERR_INVALID_PARAMETER_TYPE, - qobject_input_get_name(qiv, name), "string"); + if (!str) { return; } =20 - if (qemu_strtou64(qstring_get_str(qstr), NULL, 0, obj) < 0) { + if (qemu_strtou64(str, NULL, 0, obj) < 0) { /* TODO report -ERANGE more nicely */ error_setg(errp, QERR_INVALID_PARAMETER_VALUE, qobject_input_get_name(qiv, name), "integer"); @@ -417,21 +425,12 @@ static void qobject_input_type_bool_autocast(Visitor = *v, const char *name, bool *obj, Error **errp) { QObjectInputVisitor *qiv =3D to_qiv(v); - QObject *qobj =3D qobject_input_get_object(qiv, name, true, errp); - QString *qstr; - const char *str; + const char *str =3D qobject_input_get_autocast(qiv, name, errp); =20 - if (!qobj) { - return; - } - qstr =3D qobject_to_qstring(qobj); - if (!qstr) { - error_setg(errp, QERR_INVALID_PARAMETER_TYPE, - qobject_input_get_name(qiv, name), "string"); + if (!str) { return; } =20 - str =3D qstring_get_str(qstr); if (!strcmp(str, "on")) { *obj =3D true; } else if (!strcmp(str, "off")) { @@ -494,22 +493,13 @@ static void qobject_input_type_number_autocast(Visito= r *v, const char *name, double *obj, Error **errp) { QObjectInputVisitor *qiv =3D to_qiv(v); - QObject *qobj =3D qobject_input_get_object(qiv, name, true, errp); - QString *qstr; - const char *str; + const char *str =3D qobject_input_get_autocast(qiv, name, errp); char *endp; =20 - if (!qobj) { - return; - } - qstr =3D qobject_to_qstring(qobj); - if (!qstr) { - error_setg(errp, QERR_INVALID_PARAMETER_TYPE, - qobject_input_get_name(qiv, name), "string"); + if (!str) { return; } =20 - str =3D qstring_get_str(qstr); errno =3D 0; *obj =3D strtod(str, &endp); if (errno || endp =3D=3D str || *endp) { @@ -553,20 +543,13 @@ static void qobject_input_type_size_autocast(Visitor = *v, const char *name, uint64_t *obj, Error **errp) { QObjectInputVisitor *qiv =3D to_qiv(v); - QObject *qobj =3D qobject_input_get_object(qiv, name, true, errp); - QString *qstr; + const char *str =3D qobject_input_get_autocast(qiv, name, errp); =20 - if (!qobj) { - return; - } - qstr =3D qobject_to_qstring(qobj); - if (!qstr) { - error_setg(errp, QERR_INVALID_PARAMETER_TYPE, - qobject_input_get_name(qiv, name), "string"); + if (!str) { return; } =20 - if (qemu_strtosz(qstring_get_str(qstr), NULL, obj) < 0) { + if (qemu_strtosz(str, NULL, obj) < 0) { /* TODO report -ERANGE more nicely */ error_setg(errp, QERR_INVALID_PARAMETER_VALUE, qobject_input_get_name(qiv, name), "size"); --=20 2.7.4