From nobody Thu May 2 21:35:18 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=1605256070; cv=none; d=zohomail.com; s=zohoarc; b=WS8R5OvUJ1bZ4qXma+nLJJ5TrsdkQMFLoPq0IpI8BS/H+ROrx61Jr7CtFdPwYyPbbsMWQ5fQi8UXgzIgyAvi4vmegkulDXMwCN9s//XvivaBUYm4Yhv8Qm84BpEyuj6CHLiesh+LTvzTal8G4ccqGnktryZw1DGj9Ek0g5yJNgg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605256070; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=6jmqtFCyQyR5lOhwjDQZpJHWK07Q+NlKH03g0bFdrq0=; b=ASz/A5R2M7U97aX+FzkAgTzkD5uJWCFra5NbdnrKdmQiZYeR/1BPX4Isase+NMAojbtg4CcM9HlL4ztfuBLQFFZ5dMc4gPQmhCEDuIdSmwUhL4C3yd2IxFgcPbcX0bVsF4BDOpZRRJrpOJdAcmXQDo5ajlFVDna5ekeeONLmseo= 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) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1605256070643671.9784956753222; Fri, 13 Nov 2020 00:27:50 -0800 (PST) Received: from localhost ([::1]:50960 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kdUQu-0007ls-Sq for importer@patchew.org; Fri, 13 Nov 2020 03:27:48 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:37078) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kdUPj-0006A9-8w for qemu-devel@nongnu.org; Fri, 13 Nov 2020 03:26:35 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:26868) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kdUPg-0005i1-Fx for qemu-devel@nongnu.org; Fri, 13 Nov 2020 03:26:34 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-23-oLH01sXBNlCPFeoPzDa26Q-1; Fri, 13 Nov 2020 03:26:29 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5026C8049D7 for ; Fri, 13 Nov 2020 08:26:28 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-103.ams2.redhat.com [10.36.112.103]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2143919D6C for ; Fri, 13 Nov 2020 08:26:28 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 84ED511386A3; Fri, 13 Nov 2020 09:26:26 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605255991; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=6jmqtFCyQyR5lOhwjDQZpJHWK07Q+NlKH03g0bFdrq0=; b=b4p4whBnz6Nen0gxWGe/ALM6uRYOgRmoQ9e1v06PuGYisHjjnI62MOTluFSmgN5zKFuTPc AC3cmuD92ctwioBsvofZYU95Zz29DrdIxmXmnUlf3KDvwM2bkhCIph3Gqy5Q+JWAthxUWo OJZ1YXkBdcow+wlziAvWPfHDSGfdCxE= X-MC-Unique: oLH01sXBNlCPFeoPzDa26Q-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PATCH 01/10] qerror: Drop unused QERR_ macros Date: Fri, 13 Nov 2020 09:26:17 +0100 Message-Id: <20201113082626.2725812-2-armbru@redhat.com> In-Reply-To: <20201113082626.2725812-1-armbru@redhat.com> References: <20201113082626.2725812-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=armbru@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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=216.205.24.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/12 08:00:44 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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_H4=0.001, RCVD_IN_MSPIKE_WL=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.23 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-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" QERR_INVALID_BLOCK_FORMAT is dead since commit e6641719fe "block: Always pass NULL as drv for bdrv_open()", 2015-09-14. QERR_INVALID_PASSWORD is dead since commit c01c214b69 "block: remove all encryption handling APIs", 2017-07-11. Bury them. Signed-off-by: Markus Armbruster Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- include/qapi/qmp/qerror.h | 6 ------ 1 file changed, 6 deletions(-) diff --git a/include/qapi/qmp/qerror.h b/include/qapi/qmp/qerror.h index 7c76e24aa7..3eabd451d8 100644 --- a/include/qapi/qmp/qerror.h +++ b/include/qapi/qmp/qerror.h @@ -43,9 +43,6 @@ #define QERR_FEATURE_DISABLED \ "The feature '%s' is not enabled" =20 -#define QERR_INVALID_BLOCK_FORMAT \ - "Invalid block format '%s'" - #define QERR_INVALID_PARAMETER \ "Invalid parameter '%s'" =20 @@ -55,9 +52,6 @@ #define QERR_INVALID_PARAMETER_VALUE \ "Parameter '%s' expects %s" =20 -#define QERR_INVALID_PASSWORD \ - "Password incorrect" - #define QERR_IO_ERROR \ "An IO error has occurred" =20 --=20 2.26.2 From nobody Thu May 2 21:35:18 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=1605256558; cv=none; d=zohomail.com; s=zohoarc; b=XNgSwh4Q9DvF1Sn86Qet72OqBlgZmUz09AKVrTCwmohc5xFkFBCayY1XYdCnZuO52+20YgOWnVHCzW26vORwex+dpEhICZtClICtA0QzkP33PWjp1vWUx8btcecIKBqBpQASODEy/j3byKIGzTsoZY2EBAOsAUi/9TXo/oS2mt8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605256558; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Mq6Apkbd/jGqgdpb8XgipiGzgRsX/xftQn76h7xW0J4=; b=FKKADoqgNS0SOZbhdb2acseAKGlQhJ0BzCRrrNtM/RcvrG3qzwhr7Qupvkw4vhTOW5qhMx9J3W/G/aNoLKralxQNBxElqy7H5ladIUzT1XQTAxGWG4UZ9cERMil5lCzbms0b5O+vXm9unUF8F5Wo0gYFIKfKoftjhuySssPSa4M= 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) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1605256558779893.2887333354289; Fri, 13 Nov 2020 00:35:58 -0800 (PST) Received: from localhost ([::1]:39626 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kdUYn-0006w3-Qf for importer@patchew.org; Fri, 13 Nov 2020 03:35:57 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:37172) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kdUPl-0006C0-IU for qemu-devel@nongnu.org; Fri, 13 Nov 2020 03:26:37 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:37924) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kdUPg-0005i0-Kz for qemu-devel@nongnu.org; Fri, 13 Nov 2020 03:26:37 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-394-e6hnYJv4NJu9yXfxjaLv9Q-1; Fri, 13 Nov 2020 03:26:29 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5016810082E7 for ; Fri, 13 Nov 2020 08:26:28 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-103.ams2.redhat.com [10.36.112.103]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 21B3F3C04 for ; Fri, 13 Nov 2020 08:26:28 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 87DB91138603; Fri, 13 Nov 2020 09:26:26 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605255990; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Mq6Apkbd/jGqgdpb8XgipiGzgRsX/xftQn76h7xW0J4=; b=WbQCg4TcdigjRNDHGihiw8UTT7Or9acFXNAo9nP7j8RGBwWVsU6cZ5DM5XJ2Z/WgF2rl5n B3MWyNG2OFzAXVTe91GREcbNZAiitnJ2Xs8c+NXhxCcg1iRiAsxqT0U/bg2yxPcqGDsY5a k9gzDiBbGkBYeRbkLucU8PKdxMGnemw= X-MC-Unique: e6hnYJv4NJu9yXfxjaLv9Q-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PATCH 02/10] qerror: Eliminate QERR_ macros used in just one place Date: Fri, 13 Nov 2020 09:26:18 +0100 Message-Id: <20201113082626.2725812-3-armbru@redhat.com> In-Reply-To: <20201113082626.2725812-1-armbru@redhat.com> References: <20201113082626.2725812-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=armbru@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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=63.128.21.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/12 16:09:27 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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_H5=0.001, RCVD_IN_MSPIKE_WL=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.23 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-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Markus Armbruster --- include/qapi/qmp/qerror.h | 9 --------- monitor/misc.c | 8 ++++---- net/net.c | 2 +- 3 files changed, 5 insertions(+), 14 deletions(-) diff --git a/include/qapi/qmp/qerror.h b/include/qapi/qmp/qerror.h index 3eabd451d8..c272e3fc29 100644 --- a/include/qapi/qmp/qerror.h +++ b/include/qapi/qmp/qerror.h @@ -25,21 +25,12 @@ #define QERR_DEVICE_HAS_NO_MEDIUM \ "Device '%s' has no medium" =20 -#define QERR_DEVICE_INIT_FAILED \ - "Device '%s' could not be initialized" - #define QERR_DEVICE_IN_USE \ "Device '%s' is in use" =20 #define QERR_DEVICE_NO_HOTPLUG \ "Device '%s' does not support hotplugging" =20 -#define QERR_FD_NOT_FOUND \ - "File descriptor named '%s' not found" - -#define QERR_FD_NOT_SUPPLIED \ - "No file descriptor supplied via SCM_RIGHTS" - #define QERR_FEATURE_DISABLED \ "The feature '%s' is not enabled" =20 diff --git a/monitor/misc.c b/monitor/misc.c index 32e6a8c13d..9aa2505cfa 100644 --- a/monitor/misc.c +++ b/monitor/misc.c @@ -1232,7 +1232,7 @@ void qmp_getfd(const char *fdname, Error **errp) =20 fd =3D qemu_chr_fe_get_msgfd(&cur_mon->chr); if (fd =3D=3D -1) { - error_setg(errp, QERR_FD_NOT_SUPPLIED); + error_setg(errp, "No file descriptor supplied via SCM_RIGHTS"); return; } =20 @@ -1286,7 +1286,7 @@ void qmp_closefd(const char *fdname, Error **errp) } =20 qemu_mutex_unlock(&cur_mon->mon_lock); - error_setg(errp, QERR_FD_NOT_FOUND, fdname); + error_setg(errp, "File descriptor named '%s' not found", fdname); } =20 int monitor_get_fd(Monitor *mon, const char *fdname, Error **errp) @@ -1357,7 +1357,7 @@ AddfdInfo *qmp_add_fd(bool has_fdset_id, int64_t fdse= t_id, bool has_opaque, =20 fd =3D qemu_chr_fe_get_msgfd(&mon->chr); if (fd =3D=3D -1) { - error_setg(errp, QERR_FD_NOT_SUPPLIED); + error_setg(errp, "No file descriptor supplied via SCM_RIGHTS"); goto error; } =20 @@ -1410,7 +1410,7 @@ error: } else { snprintf(fd_str, sizeof(fd_str), "fdset-id:%" PRId64, fdset_id); } - error_setg(errp, QERR_FD_NOT_FOUND, fd_str); + error_setg(errp, "File descriptor named '%s' not found", fd_str); } =20 FdsetInfoList *qmp_query_fdsets(Error **errp) diff --git a/net/net.c b/net/net.c index 794c652282..5e1b57a608 100644 --- a/net/net.c +++ b/net/net.c @@ -1008,7 +1008,7 @@ static int net_client_init1(const Netdev *netdev, boo= l is_netdev, Error **errp) if (net_client_init_fun[netdev->type](netdev, netdev->id, peer, errp) = < 0) { /* FIXME drop when all init functions store an Error */ if (errp && !*errp) { - error_setg(errp, QERR_DEVICE_INIT_FAILED, + error_setg(errp, "Device '%s' could not be initialized", NetClientDriver_str(netdev->type)); } return -1; --=20 2.26.2 From nobody Thu May 2 21:35:18 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1605256072; cv=none; d=zohomail.com; s=zohoarc; b=ZU9aZwU1nYyHObd9FmpHxP3TiPmVAqUROhs1lN0JE9o0TYPNLvWapJ++6zRVVPqH1RYW05OMxvlweg6Jmqq6sbjxChUMRMcrZCM9fdOtVejyN7+nETk9BFcOneh4iwucW+CA3N7KadXqbf5gDpBM12WldTuCO1CQYGrnaAoIfkY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605256072; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Olk60YbFd2FfUrnlMF7SQHD1XySmQ4sJcxnOQMv83P8=; b=YOrR5wreZS6ODPix5zbXzhyeqfDsUMtQVwmk1RKyyp84RZ7QneJG21/FaQh0Ra0pVjDP3szMalUZ50FwuQ7Nz+W85RX7BosvpyBcFfmTgU0VSR2PlRUimWVztMQ1ByRfUvzuPljDICM8I/RDEDH95AhOUFfZcvu8y1xj3AlXL2M= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1605256072255199.184414396919; Fri, 13 Nov 2020 00:27:52 -0800 (PST) Received: from localhost ([::1]:51098 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kdUQx-0007pK-4T for importer@patchew.org; Fri, 13 Nov 2020 03:27:51 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:37134) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kdUPk-0006Ad-Ix for qemu-devel@nongnu.org; Fri, 13 Nov 2020 03:26:36 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:32945) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kdUPg-0005iB-N4 for qemu-devel@nongnu.org; Fri, 13 Nov 2020 03:26:36 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-23-TmvmUIMvOQCEgX_FcfLvTw-1; Fri, 13 Nov 2020 03:26:29 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7BCA76409D; Fri, 13 Nov 2020 08:26:28 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-103.ams2.redhat.com [10.36.112.103]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 21E3260BE2; Fri, 13 Nov 2020 08:26:28 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 8B198113861C; Fri, 13 Nov 2020 09:26:26 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605255991; 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=Olk60YbFd2FfUrnlMF7SQHD1XySmQ4sJcxnOQMv83P8=; b=ika73z6u3XIFuWiMg7bJr26dJeTPHFaksI2GZMGlszIDm7C0f1lAe1KU/gnr7oHaJp+lAL fQ28HeadX6Zey6EuN4ih4t5cWx+nzr6lt4gD8AetCGAiSFs0yZC+7vvlDqw/CKI30bA4VI IHkoILdTiN+qwV4dULuaMrYSkIbATB8= X-MC-Unique: TmvmUIMvOQCEgX_FcfLvTw-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PATCH 03/10] block: Improve some block-commit, block-stream error messages Date: Fri, 13 Nov 2020 09:26:19 +0100 Message-Id: <20201113082626.2725812-4-armbru@redhat.com> In-Reply-To: <20201113082626.2725812-1-armbru@redhat.com> References: <20201113082626.2725812-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=armbru@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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=216.205.24.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/12 08:00:44 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , qemu-block@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" block-commit defaults @base-node to the deepest backing image. When there is none, it fails with "Base 'NULL' not found". Improve to "There is no backing image". block-commit and block-stream reject a @base argument that doesn't resolve with "Base 'BASE' not found". Commit 6b33f3ae8b "qemu-img: Improve commit invalid base message" improved this message in qemu-img. Improve it here, too: "Can't find '%s' in the backing chain". QERR_BASE_NOT_FOUND is now unused. Drop. Cc: Kevin Wolf Cc: Max Reitz Cc: qemu-block@nongnu.org Signed-off-by: Markus Armbruster Reviewed-by: Max Reitz --- include/qapi/qmp/qerror.h | 2 -- blockdev.c | 15 +++++++++------ tests/qemu-iotests/040 | 12 ++++++------ 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/include/qapi/qmp/qerror.h b/include/qapi/qmp/qerror.h index c272e3fc29..5d7e69cc1f 100644 --- a/include/qapi/qmp/qerror.h +++ b/include/qapi/qmp/qerror.h @@ -16,8 +16,6 @@ * These macros will go away, please don't use in new code, and do not * add new ones! */ -#define QERR_BASE_NOT_FOUND \ - "Base '%s' not found" =20 #define QERR_BUS_NO_HOTPLUG \ "Bus '%s' does not support hotplugging" diff --git a/blockdev.c b/blockdev.c index fe6fb5dc1d..d05a8740f4 100644 --- a/blockdev.c +++ b/blockdev.c @@ -2531,7 +2531,7 @@ void qmp_block_stream(bool has_job_id, const char *jo= b_id, const char *device, if (has_base) { base_bs =3D bdrv_find_backing_image(bs, base); if (base_bs =3D=3D NULL) { - error_setg(errp, QERR_BASE_NOT_FOUND, base); + error_setg(errp, "Can't find '%s' in the backing chain", base); goto out; } assert(bdrv_get_aio_context(base_bs) =3D=3D aio_context); @@ -2703,13 +2703,16 @@ void qmp_block_commit(bool has_job_id, const char *= job_id, const char *device, } } else if (has_base && base) { base_bs =3D bdrv_find_backing_image(top_bs, base); + if (base_bs =3D=3D NULL) { + error_setg(errp, "Can't find '%s' in the backing chain", base); + goto out; + } } else { base_bs =3D bdrv_find_base(top_bs); - } - - if (base_bs =3D=3D NULL) { - error_setg(errp, QERR_BASE_NOT_FOUND, base ? base : "NULL"); - goto out; + if (base_bs =3D=3D NULL) { + error_setg(errp, "There is no backimg image"); + goto out; + } } =20 assert(bdrv_get_aio_context(base_bs) =3D=3D aio_context); diff --git a/tests/qemu-iotests/040 b/tests/qemu-iotests/040 index caf286571a..dc6069edc0 100755 --- a/tests/qemu-iotests/040 +++ b/tests/qemu-iotests/040 @@ -156,7 +156,7 @@ class TestSingleDrive(ImageCommitTestCase): self.assert_no_active_block_jobs() result =3D self.vm.qmp('block-commit', device=3D'drive0', top=3D'%= s' % backing_img, base=3D'%s' % backing_img) self.assert_qmp(result, 'error/class', 'GenericError') - self.assert_qmp(result, 'error/desc', 'Base \'%s\' not found' % ba= cking_img) + self.assert_qmp(result, 'error/desc', "Can't find '%s' in the back= ing chain" % backing_img) =20 def test_top_invalid(self): self.assert_no_active_block_jobs() @@ -168,7 +168,7 @@ class TestSingleDrive(ImageCommitTestCase): self.assert_no_active_block_jobs() result =3D self.vm.qmp('block-commit', device=3D'drive0', top=3D'%= s' % mid_img, base=3D'badfile') self.assert_qmp(result, 'error/class', 'GenericError') - self.assert_qmp(result, 'error/desc', 'Base \'badfile\' not found') + self.assert_qmp(result, 'error/desc', "Can't find 'badfile' in the= backing chain") =20 def test_top_node_invalid(self): self.assert_no_active_block_jobs() @@ -208,7 +208,7 @@ class TestSingleDrive(ImageCommitTestCase): self.assert_no_active_block_jobs() result =3D self.vm.qmp('block-commit', device=3D'drive0', top=3D'%= s' % backing_img, base=3D'%s' % mid_img) self.assert_qmp(result, 'error/class', 'GenericError') - self.assert_qmp(result, 'error/desc', 'Base \'%s\' not found' % mi= d_img) + self.assert_qmp(result, 'error/desc', "Can't find '%s' in the back= ing chain" % mid_img) =20 def test_top_and_base_node_reversed(self): self.assert_no_active_block_jobs() @@ -349,7 +349,7 @@ class TestRelativePaths(ImageCommitTestCase): self.assert_no_active_block_jobs() result =3D self.vm.qmp('block-commit', device=3D'drive0', top=3D'%= s' % self.mid_img, base=3D'%s' % self.mid_img) self.assert_qmp(result, 'error/class', 'GenericError') - self.assert_qmp(result, 'error/desc', 'Base \'%s\' not found' % se= lf.mid_img) + self.assert_qmp(result, 'error/desc', "Can't find '%s' in the back= ing chain" % self.mid_img) =20 def test_top_invalid(self): self.assert_no_active_block_jobs() @@ -361,7 +361,7 @@ class TestRelativePaths(ImageCommitTestCase): self.assert_no_active_block_jobs() result =3D self.vm.qmp('block-commit', device=3D'drive0', top=3D'%= s' % self.mid_img, base=3D'badfile') self.assert_qmp(result, 'error/class', 'GenericError') - self.assert_qmp(result, 'error/desc', 'Base \'badfile\' not found') + self.assert_qmp(result, 'error/desc', "Can't find 'badfile' in the= backing chain") =20 def test_top_is_active(self): self.run_commit_test(self.test_img, self.backing_img) @@ -372,7 +372,7 @@ class TestRelativePaths(ImageCommitTestCase): self.assert_no_active_block_jobs() result =3D self.vm.qmp('block-commit', device=3D'drive0', top=3D'%= s' % self.backing_img, base=3D'%s' % self.mid_img) self.assert_qmp(result, 'error/class', 'GenericError') - self.assert_qmp(result, 'error/desc', 'Base \'%s\' not found' % se= lf.mid_img) + self.assert_qmp(result, 'error/desc', "Can't find '%s' in the back= ing chain" % self.mid_img) =20 =20 class TestSetSpeed(ImageCommitTestCase): --=20 2.26.2 From nobody Thu May 2 21:35:18 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=1605256635; cv=none; d=zohomail.com; s=zohoarc; b=EL7f87coN2z9pQ3jT7wlklWO0KADAGkJ8O5yhfHrJ7OGZFTrxLGlzeD+rmgnm10WjfhYCQb+nvlWIUjAPRsYBzrrLeQKKS5t2pbKPySsuoonDPrTjBptfJ7fYPwXp/ih26cTtW08dCVu2Cq9t3Cfnhfev+xZT6C0OKsOq1o8kmE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605256635; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=X8qGhzws86jRZumTpEe6PNn/iogq6Zhnmlge8hSsvik=; b=Ev43uXJ0oC6i+y2EBjsRBeSBTk5g+Ts+4CpPaBOoHQi6v3iJRi6j5sGi/mG6mIiCyNJf866JCapwBIZEHJGv7ZX05nlKfZrInXoTuWvjQXtcwyB417LVTl14Jl2uyzw3Wy/Wo/JkiunF4v6CQBRFwoDxpIvz+hOpPb7G/vYR3ZM= 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) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1605256635903794.3612392283906; Fri, 13 Nov 2020 00:37:15 -0800 (PST) Received: from localhost ([::1]:41752 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kdUa2-0007uF-Al for importer@patchew.org; Fri, 13 Nov 2020 03:37:14 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:37206) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kdUPm-0006ES-Lq for qemu-devel@nongnu.org; Fri, 13 Nov 2020 03:26:38 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:50705) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kdUPi-0005jL-RU for qemu-devel@nongnu.org; Fri, 13 Nov 2020 03:26:38 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-25-LSVQbi0qPS218rFz27Wceg-1; Fri, 13 Nov 2020 03:26:32 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7ADD38049D4 for ; Fri, 13 Nov 2020 08:26:31 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-103.ams2.redhat.com [10.36.112.103]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 212086EF4A; Fri, 13 Nov 2020 08:26:28 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 8E5B811385C9; Fri, 13 Nov 2020 09:26:26 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605255994; 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=X8qGhzws86jRZumTpEe6PNn/iogq6Zhnmlge8hSsvik=; b=BDCYfoIy2vaZlu+7Y3NdJrTnJaMeAQ8iGl5A2QW+77QjPLkNmcLNJZ6/VUMxYBgcJypc+3 +XC9YfU6GP9aKNL+qHl1RNuBt7Gy8dIYeR9vy3jzzJYZMFXd5ZP3eabsseU/usvD1n8quz 5uCmv6fBxM7SPI5tyaR24qJGRaFeqhM= X-MC-Unique: LSVQbi0qPS218rFz27Wceg-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PATCH 04/10] ui: Improve some set_passwd, expire_password error messages Date: Fri, 13 Nov 2020 09:26:20 +0100 Message-Id: <20201113082626.2725812-5-armbru@redhat.com> In-Reply-To: <20201113082626.2725812-1-armbru@redhat.com> References: <20201113082626.2725812-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=armbru@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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=216.205.24.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/12 08:00:44 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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_H4=0.001, RCVD_IN_MSPIKE_WL=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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" set_passwd and expire_password reject invalid "protocol" with "Invalid parameter 'protocol'". Misleading; the parameter is valid, its value isn't. Improve to "Parameter 'protocol' expects 'vnc' or 'spice'". expire_password fails with "Could not set password". Misleading; improve to "Could not set password expire time". QERR_SET_PASSWD_FAILED is now unused. Drop. Cc: Gerd Hoffmann Signed-off-by: Markus Armbruster --- include/qapi/qmp/qerror.h | 3 --- monitor/qmp-cmds.c | 38 +++++++++++++++----------------------- 2 files changed, 15 insertions(+), 26 deletions(-) diff --git a/include/qapi/qmp/qerror.h b/include/qapi/qmp/qerror.h index 5d7e69cc1f..d8267129bc 100644 --- a/include/qapi/qmp/qerror.h +++ b/include/qapi/qmp/qerror.h @@ -65,9 +65,6 @@ #define QERR_REPLAY_NOT_SUPPORTED \ "Record/replay feature is not supported for '%s'" =20 -#define QERR_SET_PASSWD_FAILED \ - "Could not set password" - #define QERR_UNDEFINED_ERROR \ "An undefined error has occurred" =20 diff --git a/monitor/qmp-cmds.c b/monitor/qmp-cmds.c index a08143b323..ffbf948d55 100644 --- a/monitor/qmp-cmds.c +++ b/monitor/qmp-cmds.c @@ -199,13 +199,7 @@ void qmp_set_password(const char *protocol, const char= *password, } rc =3D qemu_spice.set_passwd(password, fail_if_connected, disconnect_if_connected); - if (rc !=3D 0) { - error_setg(errp, QERR_SET_PASSWD_FAILED); - } - return; - } - - if (strcmp(protocol, "vnc") =3D=3D 0) { + } else if (strcmp(protocol, "vnc") =3D=3D 0) { if (fail_if_connected || disconnect_if_connected) { /* vnc supports "connected=3Dkeep" only */ error_setg(errp, QERR_INVALID_PARAMETER, "connected"); @@ -214,13 +208,15 @@ void qmp_set_password(const char *protocol, const cha= r *password, /* Note that setting an empty password will not disable login thro= ugh * this interface. */ rc =3D vnc_display_password(NULL, password); - if (rc < 0) { - error_setg(errp, QERR_SET_PASSWD_FAILED); - } + } else { + error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "protocol", + "'vnc' or 'spice'"); return; } =20 - error_setg(errp, QERR_INVALID_PARAMETER, "protocol"); + if (rc !=3D 0) { + error_setg(errp, "Could not set password"); + } } =20 void qmp_expire_password(const char *protocol, const char *whenstr, @@ -244,28 +240,24 @@ void qmp_expire_password(const char *protocol, const = char *whenstr, return; } rc =3D qemu_spice.set_pw_expire(when); - if (rc !=3D 0) { - error_setg(errp, QERR_SET_PASSWD_FAILED); - } - return; - } - - if (strcmp(protocol, "vnc") =3D=3D 0) { + } else if (strcmp(protocol, "vnc") =3D=3D 0) { rc =3D vnc_display_pw_expire(NULL, when); - if (rc !=3D 0) { - error_setg(errp, QERR_SET_PASSWD_FAILED); - } + } else { + error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "protocol", + "'vnc' or 'spice'"); return; } =20 - error_setg(errp, QERR_INVALID_PARAMETER, "protocol"); + if (rc !=3D 0) { + error_setg(errp, "Could not set password expire time"); + } } =20 #ifdef CONFIG_VNC void qmp_change_vnc_password(const char *password, Error **errp) { if (vnc_display_password(NULL, password) < 0) { - error_setg(errp, QERR_SET_PASSWD_FAILED); + error_setg(errp, "Could not set password"); } } =20 --=20 2.26.2 From nobody Thu May 2 21:35:18 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=1605256074; cv=none; d=zohomail.com; s=zohoarc; b=WEXZmV2pfhC9s+b/t+oKy6rNLqse83FYxv2xPBLALOKA7eUmQccVSWQngcdaH50R9SIKdM/kXFmxnJKx+Ug3qJ0GiOztEBU8oZfDurtjNVOqLc+6tDPLJrLlij380oY6+lwyhHB4mcp46ayiejDoH6wD3dokg7Xf/04LSeRWxTo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605256074; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=3jma4QtDqnnw5CZ+n3iJCqfwEu8f61MFPver8SLf20g=; b=GyRNvNTLaqiQxtHSKAsvh/dEWX/43PHkKqM2W8VPyfxXZ7VBAP/P1acWGT2+uEp2Q9neGGdaPnF97EQoqvF0rR/yywUnWkCoCzva3em07Knx9D5IHY3hbiGKKk6oquY5qXVabpw5sg5OsBbhMyxcwNpet2TRvU/eJLpKr+q1rwg= 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) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1605256074296381.7343697169547; Fri, 13 Nov 2020 00:27:54 -0800 (PST) Received: from localhost ([::1]:51432 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kdUQz-0007xS-69 for importer@patchew.org; Fri, 13 Nov 2020 03:27:53 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:37248) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kdUPn-0006HW-UT for qemu-devel@nongnu.org; Fri, 13 Nov 2020 03:26:40 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:53289) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kdUPk-0005kX-Sm for qemu-devel@nongnu.org; Fri, 13 Nov 2020 03:26:39 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-488-wybjaIZgNyGLSvCQyY07ng-1; Fri, 13 Nov 2020 03:26:33 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8E92210082E5 for ; Fri, 13 Nov 2020 08:26:32 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-103.ams2.redhat.com [10.36.112.103]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 93C5760BE2; Fri, 13 Nov 2020 08:26:29 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 917EB11385CA; Fri, 13 Nov 2020 09:26:26 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605255995; 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=3jma4QtDqnnw5CZ+n3iJCqfwEu8f61MFPver8SLf20g=; b=HrGPc/ckREkPm1WViKw9J8Nr9hjLgylWNbnV/pM1RbTQo6GUFq3VT4XeRwSHbig0/jMar1 49Yi+vVS9tk1q42SxC2nzPG8ooZfwG88oQk6gPwfqPUp6W31PrImr2RYLeKNFWlsGaIfhg YRIQUz0Jrknaj5IH27KmLeaTDaKXAA8= X-MC-Unique: wybjaIZgNyGLSvCQyY07ng-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PATCH 05/10] ui: Improve a client_migrate_info error message Date: Fri, 13 Nov 2020 09:26:21 +0100 Message-Id: <20201113082626.2725812-6-armbru@redhat.com> In-Reply-To: <20201113082626.2725812-1-armbru@redhat.com> References: <20201113082626.2725812-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=armbru@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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=63.128.21.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/12 16:09:27 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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_H5=0.001, RCVD_IN_MSPIKE_WL=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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" client_migrate_info reports spice_server_migrate_connect() failure as "An undefined error has occurred". Improve to "Could not set up display for migration". QERR_UNDEFINED_ERROR is now unused. Drop. Cc: Gerd Hoffmann Signed-off-by: Markus Armbruster --- include/qapi/qmp/qerror.h | 3 --- monitor/misc.c | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/include/qapi/qmp/qerror.h b/include/qapi/qmp/qerror.h index d8267129bc..596fce0c54 100644 --- a/include/qapi/qmp/qerror.h +++ b/include/qapi/qmp/qerror.h @@ -65,9 +65,6 @@ #define QERR_REPLAY_NOT_SUPPORTED \ "Record/replay feature is not supported for '%s'" =20 -#define QERR_UNDEFINED_ERROR \ - "An undefined error has occurred" - #define QERR_UNSUPPORTED \ "this feature or command is not currently supported" =20 diff --git a/monitor/misc.c b/monitor/misc.c index 9aa2505cfa..f0d3d41753 100644 --- a/monitor/misc.c +++ b/monitor/misc.c @@ -441,7 +441,7 @@ void qmp_client_migrate_info(const char *protocol, cons= t char *hostname, has_port ? port : -1, has_tls_port ? tls_port : -1, cert_subject)) { - error_setg(errp, QERR_UNDEFINED_ERROR); + error_setg(errp, "Could not set up display for migration"); return; } return; --=20 2.26.2 From nobody Thu May 2 21:35:18 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=1605256708; cv=none; d=zohomail.com; s=zohoarc; b=k4Hrmct5RnmPa3cdq2H+ddBPjPZVtWvX4KNJXangENAnzSEUxBRgFwIOvJE3RrLc45JgdGFYc0gFdjekGiRfjxz+2IHpwR4Iq1HGsj1F8WtLmPnLIfU1k1wTrWpkw/fpskmyQK3enZjCdIyPpPZ7DyqbqziGQOM6u6gaGrUIS+w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605256708; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=dqGxUULY28XC559h0z469fbhrxPBtyGM8HwdceIc2oI=; b=CObG8GDZubSkoqVsZR5sBq0Cn6Ih3hNI6wpy47dRe3AYAU6yNIQNFvaEcKpippi1nCouAmgh3kiMX0OuIqFE3w/enrBAXmszxI+cxdCg4Mq6o4EqJgh6CIna+gjdkUbVadpnIF4hY0j/AxMq3t7psXjDBfa8Z6LG557YIpv2NjA= 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) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1605256708741435.2985597030313; Fri, 13 Nov 2020 00:38:28 -0800 (PST) Received: from localhost ([::1]:43858 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kdUbC-0000Oe-Iu for importer@patchew.org; Fri, 13 Nov 2020 03:38:26 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:37214) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kdUPm-0006Eo-RY for qemu-devel@nongnu.org; Fri, 13 Nov 2020 03:26:38 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:46126) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kdUPk-0005kR-3O for qemu-devel@nongnu.org; Fri, 13 Nov 2020 03:26:38 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-165-niBvEmYbP_qlsnZ8SBFV_w-1; Fri, 13 Nov 2020 03:26:33 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B049F64092 for ; Fri, 13 Nov 2020 08:26:32 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-103.ams2.redhat.com [10.36.112.103]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 902685D9E4; Fri, 13 Nov 2020 08:26:29 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 948DB11384A8; Fri, 13 Nov 2020 09:26:26 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605255995; 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=dqGxUULY28XC559h0z469fbhrxPBtyGM8HwdceIc2oI=; b=QsEdHeDF0+/TjYv/T1mYfGKFMxgKHf4CX+p59aoTa/RCKMJOqTWd13hIznoZ9QYKj88brz ictajVood5yyQsb4jc4GCIIvVwDezsGmNKrk6yiRHaXDrROMWr7xcP4emPoW8JmzKMRWJQ pkuipyj0dBSFdiqt0D0uDRyDIVNHgzs= X-MC-Unique: niBvEmYbP_qlsnZ8SBFV_w-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PATCH 06/10] ui: Tweak a client_migrate_info error message Date: Fri, 13 Nov 2020 09:26:22 +0100 Message-Id: <20201113082626.2725812-7-armbru@redhat.com> In-Reply-To: <20201113082626.2725812-1-armbru@redhat.com> References: <20201113082626.2725812-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=armbru@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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=216.205.24.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/12 08:00:44 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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_H4=0.001, RCVD_IN_MSPIKE_WL=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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Change Parameter 'protocol' expects spice to Parameter 'protocol' expects 'spice' for consistency with similar error messages elsewhere. Cc: Gerd Hoffmann Signed-off-by: Markus Armbruster --- monitor/misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/monitor/misc.c b/monitor/misc.c index f0d3d41753..354ac87736 100644 --- a/monitor/misc.c +++ b/monitor/misc.c @@ -447,7 +447,7 @@ void qmp_client_migrate_info(const char *protocol, cons= t char *hostname, return; } =20 - error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "protocol", "spice"); + error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "protocol", "'spice'"); } =20 static void hmp_logfile(Monitor *mon, const QDict *qdict) --=20 2.26.2 From nobody Thu May 2 21:35:18 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=1605256326; cv=none; d=zohomail.com; s=zohoarc; b=BsPKIVa/JW3lG94UgupsAOyXy2IVdQy8EVjj7WhbQOAtC2tN70eUXGPCKWcyYHPOsNY9/jpyKJl5CCRsq6+/rNgtEqGKOjRhcLgB591qdWGykCI0f/PfNGUArPV9FS5VDR7LyX3ysDNBVw+iUx+n1/iK4q1GUh4Bw7GRG22SSOo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605256326; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=6HH4VnlO7j3VP+jymHOpgOK0e6DsBp6SHegRBnSl18c=; b=lBMCyrk/6pbobR9bmJXnQnrseArfcHacd77tOv7msZ1tiOtzC+G0uHKn40Q6q95yGCHlaSDaccZJ7dm3BN7rXgBLkvimR+Qbmeubm9YsjjDJKWK2tqqF7OZbmouY2O0sY2qdEfhdGWhCW8KCUYxzdx/ULmlAyYZ4OO4W15otS9k= 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) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1605256326880682.5176094539228; Fri, 13 Nov 2020 00:32:06 -0800 (PST) Received: from localhost ([::1]:58700 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kdUV3-00032r-QQ for importer@patchew.org; Fri, 13 Nov 2020 03:32:05 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:37232) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kdUPn-0006Fq-7A for qemu-devel@nongnu.org; Fri, 13 Nov 2020 03:26:39 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:32258) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kdUPk-0005kd-LJ for qemu-devel@nongnu.org; Fri, 13 Nov 2020 03:26:38 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-195-gAD6HcCXOBKwCCQbJ08P2w-1; Fri, 13 Nov 2020 03:26:30 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C04C5186DD4A; Fri, 13 Nov 2020 08:26:29 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-103.ams2.redhat.com [10.36.112.103]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 93E916EF62; Fri, 13 Nov 2020 08:26:29 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 978FF1138400; Fri, 13 Nov 2020 09:26:26 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605255995; 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=6HH4VnlO7j3VP+jymHOpgOK0e6DsBp6SHegRBnSl18c=; b=O42oRTJpvPohRIejnbGZW3LuiGid4AomP0CxhSci4D6ysxn79Sw52vtDUq3myDnyNw+dy6 HHwNcgu0uIQhuPSgdTHip5350KauVZQAGNp/UpwHcCYDJQaAjTBjX9PxVSH+ZoZjqQ5qNY edBBN/DVzTuO9ELcyxubFChIksTXVqU= X-MC-Unique: gAD6HcCXOBKwCCQbJ08P2w-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PATCH 07/10] qga: Replace an unreachable error by abort() Date: Fri, 13 Nov 2020 09:26:23 +0100 Message-Id: <20201113082626.2725812-8-armbru@redhat.com> In-Reply-To: <20201113082626.2725812-1-armbru@redhat.com> References: <20201113082626.2725812-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=armbru@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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=216.205.24.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/12 08:00:44 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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_H4=0.001, RCVD_IN_MSPIKE_WL=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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Roth Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" check_suspend_mode()'s error message Parameter 'mode' expects GuestSuspendMode makes no sense to users: GuestSuspendMode is a C enum. Fortunately, it is unreachable. Replace it by abort(). Cc: Michael Roth Signed-off-by: Markus Armbruster --- qga/commands-win32.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/qga/commands-win32.c b/qga/commands-win32.c index 300b87c859..87dc43e837 100644 --- a/qga/commands-win32.c +++ b/qga/commands-win32.c @@ -1441,8 +1441,7 @@ static void check_suspend_mode(GuestSuspendMode mode,= Error **errp) } break; default: - error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "mode", - "GuestSuspendMode"); + abort(); } } =20 --=20 2.26.2 From nobody Thu May 2 21:35:18 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=1605256335; cv=none; d=zohomail.com; s=zohoarc; b=Bx1KAFaa3pDBP+LW9o63rwXh2iURH95r4B+fG+Nhvv7L1dd7R5h04rZoTPgyX2AReBWMEzhwI4rVaIQHIyzISvSj01/qyuFUit630WvGumHW39VhlHGk/6f1Lf/gH1lv6GA7PYGnaGgRuuu7uLbzF3l+e65rLMoxpzgRwJmyV34= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605256335; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Qa6UcU7GnhGYCWrAd4CKY0zyrE7pm8Zz/JHPSJL+3e4=; b=iFnmOxn3L+dxfPGnPtI3TZ3LlIzBVwVh0Ipp6SGFngTn+gkbODbCyi2eYfBKIURXPtV+Qk2wH0Rol+zYvWA4mVHeGlC2hdXJF7pliG2izZJI332x9WyuRwcvUi49Jh/Bo0pekNH3Tx5hqGPPGWcWA88t7Qm3VJ/gKYyUBCzbZsY= 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) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1605256335866720.9983485523763; Fri, 13 Nov 2020 00:32:15 -0800 (PST) Received: from localhost ([::1]:59098 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kdUVC-0003E7-Lx for importer@patchew.org; Fri, 13 Nov 2020 03:32:14 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:37184) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kdUPl-0006Co-T1 for qemu-devel@nongnu.org; Fri, 13 Nov 2020 03:26:37 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:20972) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kdUPj-0005jR-6P for qemu-devel@nongnu.org; Fri, 13 Nov 2020 03:26:37 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-193-_ekKB961O5mhlR-n87JjSQ-1; Fri, 13 Nov 2020 03:26:30 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id BC6698030AE; Fri, 13 Nov 2020 08:26:29 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-103.ams2.redhat.com [10.36.112.103]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9049A6EF50; Fri, 13 Nov 2020 08:26:29 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 9AAE21138401; Fri, 13 Nov 2020 09:26:26 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605255994; 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=Qa6UcU7GnhGYCWrAd4CKY0zyrE7pm8Zz/JHPSJL+3e4=; b=XcXsLdaCyBSxl6mcmnw7OBEagoQQP0FXwgTwLPcgVjNpQCnAiu4AfV6VDCtXfmJXCS1QJF cx1jfwaHDHBYQG50XfhSagOBIBYwF9+3bJK/ErHVQQixochHCTpwvpi+DDVBm0//gbmxJ0 ZpFoNIHgnRf14BElQVhhjlJSUON+XHY= X-MC-Unique: _ekKB961O5mhlR-n87JjSQ-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PATCH 08/10] qga: Tweak a guest-shutdown error message Date: Fri, 13 Nov 2020 09:26:24 +0100 Message-Id: <20201113082626.2725812-9-armbru@redhat.com> In-Reply-To: <20201113082626.2725812-1-armbru@redhat.com> References: <20201113082626.2725812-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=armbru@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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=216.205.24.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/12 08:00:44 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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_H4=0.001, RCVD_IN_MSPIKE_WL=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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Roth Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Change Parameter 'mode' expects halt|powerdown|reboot to Parameter 'mode' expects 'halt', 'powerdown', or 'reboot' for consistency with similar error messages elsewhere. Cc: Michael Roth Signed-off-by: Markus Armbruster --- qga/commands-win32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qga/commands-win32.c b/qga/commands-win32.c index 87dc43e837..ba1fd07d06 100644 --- a/qga/commands-win32.c +++ b/qga/commands-win32.c @@ -334,7 +334,7 @@ void qmp_guest_shutdown(bool has_mode, const char *mode= , Error **errp) shutdown_flag |=3D EWX_REBOOT; } else { error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "mode", - "halt|powerdown|reboot"); + "'halt', 'powerdown', or 'reboot'"); return; } =20 --=20 2.26.2 From nobody Thu May 2 21:35:18 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1605256325; cv=none; d=zohomail.com; s=zohoarc; b=hxVhcS2iQyJSM5mOPQoIdDmmXv79IwxaMsrEj8XqU9AXDX6x2K6CsO3Q0ptioGoCOxBTkWf8x+Q52QCSgZenRm0pJbDAhspVHIxjQMwuEwnMszHQpdTGMrCPzrVL3xtJh7uAz3aF79DWlLG0Xp+iHeTL1rd1cg5uUruFoiTnLec= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605256325; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=pHZOHYg/YkLyozkwol0zlyulrL19nA2pYvLnXj8ADIs=; b=epveSJkzEPhabecqSvgItdhXpSLJeeoIEGn5Dj1lWDVbHobBSmR5dOZlmq180503wcIZimRVHCNz32PsAIczY2JtAAhJaJQP5PhOanEs2dM5XfbR2l3cebLYw1xlHWM64I54gCAgzqBCXFfdi13atQi22Bs38PK+zXiUp9qmTq0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 160525632564673.45432556536684; Fri, 13 Nov 2020 00:32:05 -0800 (PST) Received: from localhost ([::1]:58608 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kdUV2-0002zN-4K for importer@patchew.org; Fri, 13 Nov 2020 03:32:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:37140) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kdUPk-0006At-OF for qemu-devel@nongnu.org; Fri, 13 Nov 2020 03:26:36 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:53006) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kdUPh-0005j8-7O for qemu-devel@nongnu.org; Fri, 13 Nov 2020 03:26:36 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-426-A-Vbh5pmN4uCz9ABMt6L3Q-1; Fri, 13 Nov 2020 03:26:30 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C58248049DA for ; Fri, 13 Nov 2020 08:26:29 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-103.ams2.redhat.com [10.36.112.103]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9700C5D9E8; Fri, 13 Nov 2020 08:26:29 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 9DE911138402; Fri, 13 Nov 2020 09:26:26 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605255992; 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=pHZOHYg/YkLyozkwol0zlyulrL19nA2pYvLnXj8ADIs=; b=XyYkSa7g6Z0uYrW8zENzoBVd5tRv27w3fIvVHm2EJbQSxbHhnB4cs/rvWA8ZAKbMgZ8pu0 LIdLL/o6Ne7rg0FH7s+IHXWIjasf5pmwY9XN5+96Z4UYOA53LFO7dm7BLOW2wMrvsH+Js5 dp77fL4jbx5h8fiSFnoLaTa9wXQlYYg= X-MC-Unique: A-Vbh5pmN4uCz9ABMt6L3Q-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PATCH 09/10] qom: Improve {qom, device}-list-properties error messages Date: Fri, 13 Nov 2020 09:26:25 +0100 Message-Id: <20201113082626.2725812-10-armbru@redhat.com> In-Reply-To: <20201113082626.2725812-1-armbru@redhat.com> References: <20201113082626.2725812-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=armbru@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=63.128.21.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/12 16:09:27 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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_H5=0.001, RCVD_IN_MSPIKE_WL=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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Eduardo Habkost Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) qom-list-properties reports Parameter 'typename' expects device when @typename exists, but isn't a TYPE_DEVICE. Improve this to Parameter 'typename' expects a non-abstract device type device-list-properties reports Parameter 'typename' expects object when @typename exists, but isn't a TYPE_OBJECT. Improve this to Parameter 'typename' expects a QOM type Cc: Paolo Bonzini Cc: "Daniel P. Berrang=C3=A9" Cc: Eduardo Habkost Signed-off-by: Markus Armbruster --- qom/qom-qmp-cmds.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/qom/qom-qmp-cmds.c b/qom/qom-qmp-cmds.c index 310ab2d048..2dd233f293 100644 --- a/qom/qom-qmp-cmds.c +++ b/qom/qom-qmp-cmds.c @@ -138,15 +138,10 @@ ObjectPropertyInfoList *qmp_device_list_properties(co= nst char *typename, return NULL; } =20 - klass =3D object_class_dynamic_cast(klass, TYPE_DEVICE); - if (klass =3D=3D NULL) { - error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "typename", TYPE_DE= VICE); - return NULL; - } - - if (object_class_is_abstract(klass)) { + if (!object_class_dynamic_cast(klass, TYPE_DEVICE) + || object_class_is_abstract(klass)) { error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "typename", - "non-abstract device type"); + "a non-abstract device type"); return NULL; } =20 @@ -208,9 +203,9 @@ ObjectPropertyInfoList *qmp_qom_list_properties(const c= har *typename, return NULL; } =20 - klass =3D object_class_dynamic_cast(klass, TYPE_OBJECT); - if (klass =3D=3D NULL) { - error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "typename", TYPE_OB= JECT); + if (!object_class_dynamic_cast(klass, TYPE_OBJECT)) { + error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "typename", + "a QOM type"); return NULL; } =20 --=20 2.26.2 From nobody Thu May 2 21:35:18 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=1605256465; cv=none; d=zohomail.com; s=zohoarc; b=N1hyixxBPD2ivlbeK/AZbzrDe15b7EmuwoVSrk67qPySe5X9a72l+6I/9QkgJ+p0NpSVfEwirLshnl60P52pYfZlD7CPeoNL02PJ5qIEfpOI/EixuWfbND58LNTJkApSeXKDyqtxkEXtfAq+KXiHynCjL2cslDC1aK8YDiXvwyc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605256465; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Yi11DC7Q4Yhy44eYBjY5ENf72O5lFNnlB5CRDSqfCVg=; b=NqgRpLPH0s+hoYxi4HQSOU/aB6U3/giebBOtIxxweFbqJIIo6cswpzQPHEGzBaKGVIWy8EqxnqQq8n65Rb06/l2g7LukXFQu7aaV7RukKlJPDgREPdZNFrYSYqs8lUr3Qi0h8tC1vrtku59nayY9CDyaE7nj3eODC4gpHnVOkU4= 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) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1605256465366214.0835840343209; Fri, 13 Nov 2020 00:34:25 -0800 (PST) Received: from localhost ([::1]:36432 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kdUXI-0005Zm-CS for importer@patchew.org; Fri, 13 Nov 2020 03:34:24 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:37154) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kdUPl-0006BC-0F for qemu-devel@nongnu.org; Fri, 13 Nov 2020 03:26:37 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:29142) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kdUPi-0005jF-5N for qemu-devel@nongnu.org; Fri, 13 Nov 2020 03:26:36 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-224-ZtLsMilnNXm1sm-KdCuKQw-1; Fri, 13 Nov 2020 03:26:30 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C82AF186DD4D for ; Fri, 13 Nov 2020 08:26:29 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-103.ams2.redhat.com [10.36.112.103]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9B0E75577C for ; Fri, 13 Nov 2020 08:26:29 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id A0F361138403; Fri, 13 Nov 2020 09:26:26 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605255993; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Yi11DC7Q4Yhy44eYBjY5ENf72O5lFNnlB5CRDSqfCVg=; b=ck1ZaK+bllzjLwDsJDM3gNP//mqQ/NS2ahcToQKCNMnTf1HXyYC6Vnh42zN3uRbtFlRRtT GeW4TD8VI07ETQJJ1/cJHns2W1Q4jWrUMTK/9FJtpsvtd9+AcX68pxdDGQRvWw1NFJbxo7 1l9qqXI2ZrGEj6YbXBYvXccMvylaUVE= X-MC-Unique: ZtLsMilnNXm1sm-KdCuKQw-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PATCH 10/10] Tweak a few "Parameter 'NAME' expects THING" error message Date: Fri, 13 Nov 2020 09:26:26 +0100 Message-Id: <20201113082626.2725812-11-armbru@redhat.com> In-Reply-To: <20201113082626.2725812-1-armbru@redhat.com> References: <20201113082626.2725812-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=armbru@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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=63.128.21.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/12 16:09:27 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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_H5=0.001, RCVD_IN_MSPIKE_WL=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.23 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-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Change to "expects a THING" where that's an obvious improvement Signed-off-by: Markus Armbruster --- block/quorum.c | 2 +- blockdev.c | 2 +- chardev/char.c | 2 +- hw/core/qdev-properties-system.c | 2 +- softmmu/qdev-monitor.c | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/block/quorum.c b/block/quorum.c index e846a7e892..656a80f93a 100644 --- a/block/quorum.c +++ b/block/quorum.c @@ -856,7 +856,7 @@ static int quorum_valid_threshold(int threshold, int nu= m_children, Error **errp) =20 if (threshold < 1) { error_setg(errp, QERR_INVALID_PARAMETER_VALUE, - "vote-threshold", "value >=3D 1"); + "vote-threshold", "a value >=3D 1"); return -ERANGE; } =20 diff --git a/blockdev.c b/blockdev.c index d05a8740f4..6c7be7c522 100644 --- a/blockdev.c +++ b/blockdev.c @@ -2991,7 +2991,7 @@ static void blockdev_mirror_common(const char *job_id= , BlockDriverState *bs, } if (granularity & (granularity - 1)) { error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "granularity", - "power of 2"); + "a power of 2"); return; } =20 diff --git a/chardev/char.c b/chardev/char.c index aa4282164a..a9b8c5a9aa 100644 --- a/chardev/char.c +++ b/chardev/char.c @@ -521,7 +521,7 @@ static const ChardevClass *char_get_class(const char *d= river, Error **errp) =20 if (object_class_is_abstract(oc)) { error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "driver", - "abstract device type"); + "an abstract device type"); return NULL; } =20 diff --git a/hw/core/qdev-properties-system.c b/hw/core/qdev-properties-sys= tem.c index b81a4e8d14..93061b5bf1 100644 --- a/hw/core/qdev-properties-system.c +++ b/hw/core/qdev-properties-system.c @@ -776,7 +776,7 @@ static void set_pci_devfn(Object *obj, Visitor *v, cons= t char *name, } if (value < -1 || value > 255) { error_setg(errp, QERR_INVALID_PARAMETER_VALUE, - name ? name : "null", "pci_devfn"); + name ? name : "null", "a value between -1 and 255"); return; } *ptr =3D value; diff --git a/softmmu/qdev-monitor.c b/softmmu/qdev-monitor.c index bcfb90a08f..08318c5d9d 100644 --- a/softmmu/qdev-monitor.c +++ b/softmmu/qdev-monitor.c @@ -237,7 +237,7 @@ static DeviceClass *qdev_get_device_class(const char **= driver, Error **errp) =20 if (object_class_is_abstract(oc)) { error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "driver", - "non-abstract device type"); + "a non-abstract device type"); return NULL; } =20 @@ -245,7 +245,7 @@ static DeviceClass *qdev_get_device_class(const char **= driver, Error **errp) if (!dc->user_creatable || (qdev_hotplug && !dc->hotpluggable)) { error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "driver", - "pluggable device type"); + "a pluggable device type"); return NULL; } =20 --=20 2.26.2