From nobody Wed Nov 27 15:51:36 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=1698750804; cv=none; d=zohomail.com; s=zohoarc; b=GOeGIrnx1brD2JCUA3L/3Z1mjjf6O3VwDPEwNQ0Bcr1dlkAT8hjPffd8oFx9rkZ4nukZd67Oh0chFU9m5DRzBgQBPUiREj0+QxR8txJWrQGEXQrGi+Ep43frGfryZ+rf45T0EGNAbGN5ApGozBabMqE5VF/u/sv+u4ma8YL3bFA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1698750804; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=LQCgrIYKTPXGuFD9c+YZAZ+xUtgJlLfCEQiQ9SuG0BE=; b=JdnYRRrTpndWCAxmx93H0f+6SCOdA2JnJKVUj084EqXSOlgiYbwGFqGub4108n771NwjfY+Kfn44WSnGCrYID10koHumCTTrRNaDrHBeYC3O/VFCM0SqFqstt9qFvhpYD05nZdcaY8hZbZ4Gg+N+/83MnF2xvCzb13KWRix4MjQ= 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 16987508047571004.183487240713; Tue, 31 Oct 2023 04:13:24 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qxmeR-0004Re-QT; Tue, 31 Oct 2023 07:11:15 -0400 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 1qxmeQ-0004Nd-6T for qemu-devel@nongnu.org; Tue, 31 Oct 2023 07:11:14 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qxmeN-0006zR-GU for qemu-devel@nongnu.org; Tue, 31 Oct 2023 07:11:13 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-269-J0pcYw20NYmtXiSd8psJbw-1; Tue, 31 Oct 2023 07:11:02 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4B14A816F27; Tue, 31 Oct 2023 11:11:01 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.193.56]) by smtp.corp.redhat.com (Postfix) with ESMTPS id F1FCD2026D4C; Tue, 31 Oct 2023 11:11:00 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id EABB121E691F; Tue, 31 Oct 2023 12:10:59 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1698750670; 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: in-reply-to:in-reply-to:references:references; bh=LQCgrIYKTPXGuFD9c+YZAZ+xUtgJlLfCEQiQ9SuG0BE=; b=bKhZUgP7g995PSd8ueLsJ4YpbWhl7K7QKs/9zmJQ/81VHbat7kbOaagJLt3ExiP/N77rvu e/PQKVxM8KXQEgQ5Sur/qWHHb37IIvPzRQSUsgr5ef8N/nzzdwfz2/xp2YLATMcrvv8bbT bBos/zUbi13LHR/52h5rzPZ8NpFtXpY= X-MC-Unique: J0pcYw20NYmtXiSd8psJbw-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: philmd@linaro.org, npiggin@gmail.com, danielhb413@gmail.com, clg@kaod.org, david@gibson.dropbear.id.au, harshpb@linux.ibm.com, dave@treblig.org, jasowang@redhat.com, michael.roth@amd.com, kkostiuk@redhat.com, mst@redhat.com, david@redhat.com, kraxel@redhat.com, marcandre.lureau@redhat.com, qemu-ppc@nongnu.org Subject: [PATCH 4/7] ui/qmp-cmds: Improve two error messages Date: Tue, 31 Oct 2023 12:10:56 +0100 Message-ID: <20231031111059.3407803-5-armbru@redhat.com> In-Reply-To: <20231031111059.3407803-1-armbru@redhat.com> References: <20231031111059.3407803-1-armbru@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.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.129.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.481, 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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable 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: 1698750805105100003 Content-Type: text/plain; charset="utf-8" set_password with "protocol": "vnc" supports only "connected": "keep". Any other value is rejected with Invalid parameter 'connected' Improve this to parameter 'connected' must be 'keep' when 'protocol' is 'vnc' client_migrate_info requires "port" or "tls-port". When both are missing, it fails with Parameter 'port/tls-port' is missing Improve this to parameter 'port' or 'tls-port' is required Signed-off-by: Markus Armbruster Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- ui/ui-qmp-cmds.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ui/ui-qmp-cmds.c b/ui/ui-qmp-cmds.c index debc07d678..8880691f92 100644 --- a/ui/ui-qmp-cmds.c +++ b/ui/ui-qmp-cmds.c @@ -44,7 +44,8 @@ void qmp_set_password(SetPasswordOptions *opts, Error **e= rrp) assert(opts->protocol =3D=3D DISPLAY_PROTOCOL_VNC); if (opts->connected !=3D SET_PASSWORD_ACTION_KEEP) { /* vnc supports "connected=3Dkeep" only */ - error_setg(errp, QERR_INVALID_PARAMETER, "connected"); + error_setg(errp, "parameter 'connected' must be 'keep'" + " when 'protocol' is 'vnc'"); return; } /* @@ -195,7 +196,7 @@ void qmp_client_migrate_info(const char *protocol, cons= t char *hostname, } =20 if (!has_port && !has_tls_port) { - error_setg(errp, QERR_MISSING_PARAMETER, "port/tls-port"); + error_setg(errp, "parameter 'port' or 'tls-port' is required"); return; } =20 --=20 2.41.0