From nobody Sun Feb 8 23:05:03 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.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 1488900751230574.6213643297034; Tue, 7 Mar 2017 07:32:31 -0800 (PST) Received: from localhost ([::1]:51175 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1clH6B-0004Lx-Mb for importer@patchew.org; Tue, 07 Mar 2017 10:32:27 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34762) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1clGv3-0003Wj-OZ for qemu-devel@nongnu.org; Tue, 07 Mar 2017 10:21:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1clGv1-0003SJ-KU for qemu-devel@nongnu.org; Tue, 07 Mar 2017 10:20:57 -0500 Received: from mx1.redhat.com ([209.132.183.28]:34416) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1clGv1-0003Pv-0R for qemu-devel@nongnu.org; Tue, 07 Mar 2017 10:20:55 -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 BDD8061D31 for ; Tue, 7 Mar 2017 15:20:54 +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 v27FKqHt008395 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Tue, 7 Mar 2017 10:20:53 -0500 Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 0D85A1138541; Tue, 7 Mar 2017 16:20:46 +0100 (CET) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Tue, 7 Mar 2017 16:20:43 +0100 Message-Id: <1488900045-26344-23-git-send-email-armbru@redhat.com> In-Reply-To: <1488900045-26344-1-git-send-email-armbru@redhat.com> References: <1488900045-26344-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.39]); Tue, 07 Mar 2017 15:20:55 +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] [PULL v4 22/24] qapi: Improve how keyval input visitor reports unexpected dicts 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: , 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" Incorrect option -blockdev node-name=3Dfoo,driver=3Dfile,filename=3Dfoo.img,aio.unmap=3D= on is rejected with "Invalid parameter type for 'aio', expected: string". To make sense of this, you almost have to translate it into the equivalent QMP command { "execute": "blockdev-add", "arguments": { "node-name": "foo", "driver= ": "file", "filename": "foo.img", "aio": { "unmap": true } } } Improve the error message to "Parameters 'aio.*' are unexpected". Take care not to confuse the case "unexpected nested parameters" (i.e. the object is a QDict or QList) with the case "non-string scalar parameter". The latter is a misuse of the visitor, and should perhaps be an assertion. Note that test-qobject-input-visitor exercises this misuse in test_visitor_in_int_keyval(), test_visitor_in_bool_keyval() and test_visitor_in_number_keyval(). Signed-off-by: Markus Armbruster Reviewed-by: Kevin Wolf Message-Id: <1488317230-26248-23-git-send-email-armbru@redhat.com> --- qapi/qobject-input-visitor.c | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/qapi/qobject-input-visitor.c b/qapi/qobject-input-visitor.c index 1a484d5..b9acd86 100644 --- a/qapi/qobject-input-visitor.c +++ b/qapi/qobject-input-visitor.c @@ -167,9 +167,18 @@ static const char *qobject_input_get_keyval(QObjectInp= utVisitor *qiv, =20 qstr =3D qobject_to_qstring(qobj); if (!qstr) { - error_setg(errp, QERR_INVALID_PARAMETER_TYPE, - full_name(qiv, name), "string"); - return NULL; + switch (qobject_type(qobj)) { + case QTYPE_QDICT: + case QTYPE_QLIST: + error_setg(errp, "Parameters '%s.*' are unexpected", + full_name(qiv, name)); + return NULL; + default: + /* Non-string scalar (should this be an assertion?) */ + error_setg(errp, "Internal error: parameter %s invalid", + full_name(qiv, name)); + return NULL; + } } =20 return qstring_get_str(qstr); @@ -479,6 +488,15 @@ static void qobject_input_type_str(Visitor *v, const c= har *name, char **obj, *obj =3D g_strdup(qstring_get_str(qstr)); } =20 +static void qobject_input_type_str_keyval(Visitor *v, const char *name, + char **obj, Error **errp) +{ + QObjectInputVisitor *qiv =3D to_qiv(v); + const char *str =3D qobject_input_get_keyval(qiv, name, errp); + + *obj =3D g_strdup(str); +} + static void qobject_input_type_number(Visitor *v, const char *name, double= *obj, Error **errp) { @@ -650,7 +668,7 @@ Visitor *qobject_input_visitor_new_keyval(QObject *obj) v->visitor.type_int64 =3D qobject_input_type_int64_keyval; v->visitor.type_uint64 =3D qobject_input_type_uint64_keyval; v->visitor.type_bool =3D qobject_input_type_bool_keyval; - v->visitor.type_str =3D qobject_input_type_str; + v->visitor.type_str =3D qobject_input_type_str_keyval; v->visitor.type_number =3D qobject_input_type_number_keyval; v->visitor.type_any =3D qobject_input_type_any; v->visitor.type_null =3D qobject_input_type_null; --=20 2.7.4