From nobody Fri May 17 11:59:01 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1678201160; cv=none; d=zohomail.com; s=zohoarc; b=gEfROoj55BRxb0bD7T2V9UxVmrZk60qbWaQVXTk94GQxEs8YWKKlhAR9WLk3sTOZsVpgzNM2e58empnC9TDmGyMkRsB1lixqGtdBosBpVJCYu4zuMltTvuyhVoMiGN6puSmrvUawtaNQBxxN6ycJh2S5PYHKk7Q3oahoBlSSwkM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1678201160; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=iRHp56z2GnSurZMklSd8OPIgMtRc3/2Sm2OHRWzboeY=; b=Cp3JFEHXRH5vfuA6k8Ku6feV7uuyntlKsKmrNVl6p/Zc00qbLcC5e4QMs9fEy+thXJAbzeCQGo8mwzzSacP1mJd8FxT8nboefenv64LeNym2cfZls6EkbIXRNjU1/LmMeSSNszZ5Bn1EuoWxF2TH13MGJnLs2Hhs+Y5BkvPCTQU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1678201160599206.71207637453438; Tue, 7 Mar 2023 06:59:20 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pZYmQ-0002Xs-L5; Tue, 07 Mar 2023 09:59:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pZYmJ-0002St-IN for qemu-devel@nongnu.org; Tue, 07 Mar 2023 09:59:03 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pZYm2-0004oq-6h for qemu-devel@nongnu.org; Tue, 07 Mar 2023 09:58:52 -0500 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-640-_vgpzzmWNKKnt6jwwoUh7w-1; Tue, 07 Mar 2023 09:58:30 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 967A91C05134; Tue, 7 Mar 2023 14:58:30 +0000 (UTC) Received: from localhost (unknown [10.39.208.40]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6505D2026D4B; Tue, 7 Mar 2023 14:58:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678201116; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iRHp56z2GnSurZMklSd8OPIgMtRc3/2Sm2OHRWzboeY=; b=et8WLeOaYuscxmmhQfJuehDXAFE3MWltuv3P1yNcYZJElfH3/RIgpDOEqEnt4tfNCeSqD2 BDdYrYH1BhbUlRmXNl0aQ35Na5Wbztvu6rEh0JsUesgJSFuBx5USQsHv+rBa4aTj6Q7Gcm FhW/A89zSg1jqD7RxvCIWJCn+39gf/M= X-MC-Unique: _vgpzzmWNKKnt6jwwoUh7w-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Cc: armbru@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Michael Roth Subject: [PATCH v3] qapi: give available enum values as error hint Date: Tue, 7 Mar 2023 18:58:25 +0400 Message-Id: <20230307145825.2544850-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1678201162824100003 From: Marc-Andr=C3=A9 Lureau This allows for a more pleasant user experience. Before: $ ./qemu-system-x86_64 -display egl-headless,gl=3D qemu-system-x86_64: -display egl-headless,gl=3D: Parameter 'gl' does not ac= cept value '' After: $ ./qemu-system-x86_64 -display egl-headless,gl=3D qemu-system-x86_64: -display egl-headless,gl=3D: Parameter 'gl' does not ac= cept value '' Acceptable values are 'off', 'on', 'core', 'es' Signed-off-by: Marc-Andr=C3=A9 Lureau --- qapi/qapi-visit-core.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/qapi/qapi-visit-core.c b/qapi/qapi-visit-core.c index 6c13510a2b..7468b8c7b8 100644 --- a/qapi/qapi-visit-core.c +++ b/qapi/qapi-visit-core.c @@ -392,9 +392,25 @@ static bool output_type_enum(Visitor *v, const char *n= ame, int *obj, return visit_type_str(v, name, &enum_str, errp); } =20 +static void error_append_qapi_enum_hint(Error *const *errp, const QEnumLoo= kup *lookup) +{ + int i; + + error_append_hint(errp, "Acceptable values are "); + for (i =3D 0; i < lookup->size; i++) { + error_append_hint(errp, "'%s'", lookup->array[i]); + if (i + 1 < lookup->size) { + error_append_hint(errp, ", "); + } + } + error_append_hint(errp, "\n"); +} + + static bool input_type_enum(Visitor *v, const char *name, int *obj, const QEnumLookup *lookup, Error **errp) { + ERRP_GUARD(); int64_t value; g_autofree char *enum_str =3D NULL; =20 @@ -406,6 +422,7 @@ static bool input_type_enum(Visitor *v, const char *nam= e, int *obj, if (value < 0) { error_setg(errp, "Parameter '%s' does not accept value '%s'", name ? name : "null", enum_str); + error_append_qapi_enum_hint(errp, lookup); return false; } =20 --=20 2.39.2