From nobody Fri May 3 18:58:27 2024 Delivered-To: importer@patchew.org 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; 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=1576595160; cv=none; d=zohomail.com; s=zohoarc; b=ic0txzzFSMlrU8afZJPolenAyZdA5vLi+AEaoWYGOLLM1FSgBy+pODyU7YMxGTJyklBCOhrhlylhgWm2yGe9vTq3o/YjhIoDmAYoNGJckjrtdRDutt4f7ndL1wO72/2WQaXnf0kKbFJqhqOJ1v3Tmzlf0tm3wK0pYDlb8BjzjN0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576595160; 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=2FDRYRtssVQ4XYVOKoVpIB3ytBicvhpCOFhfrDHzyyY=; b=RycHJs0b19APV2GNkGCCFjMHjH2VkE+dt3ObooVvGcrrsQaIVX/lgDFzf1Zh4KkcGcCyOabf/elxf9nT+HxWJA24ssk06VoxlZ21vJPAZIOAOeQ53eknbo1eYzzlefZazhhS5JEi5ZZHJtzIdyojQ6Fvt3gHv6diLjY0W0YDZq0= 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 1576595160573349.43095419975657; Tue, 17 Dec 2019 07:06:00 -0800 (PST) Received: from localhost ([::1]:41616 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihEQB-0003Li-Gk for importer@patchew.org; Tue, 17 Dec 2019 10:05:59 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41723) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihEPO-0002l8-Qh for qemu-devel@nongnu.org; Tue, 17 Dec 2019 10:05:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihEPM-0005DJ-QQ for qemu-devel@nongnu.org; Tue, 17 Dec 2019 10:05:10 -0500 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:46069 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ihEPM-0005Av-Mm for qemu-devel@nongnu.org; Tue, 17 Dec 2019 10:05:08 -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-291-X9LJY1mmPcykMVj-G2nQ_g-1; Tue, 17 Dec 2019 10:05:04 -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 3A6758E818B; Tue, 17 Dec 2019 15:05:03 +0000 (UTC) Received: from linux.fritz.box.com (ovpn-117-20.ams2.redhat.com [10.36.117.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 095207C856; Tue, 17 Dec 2019 15:05:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576595107; 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=2FDRYRtssVQ4XYVOKoVpIB3ytBicvhpCOFhfrDHzyyY=; b=TeN0Eb+HV0Vzg3Cn9z195dUfrX8uyGX5eDc+Zsl/vemBmdE7ozOASdmUW9KnUN4gqv0nm0 cUthTM4rum8WiDtnM0r2Lr4QrnnuqZmmi55JJoztBRvTU13vXfvfUC8Cmf9adSJeYwuEBM l2xX4OJXxaItwWQYXIv7UkMNILXqmzc= From: Kevin Wolf To: qemu-block@nongnu.org Subject: [PATCH v2] blockjob: Fix error message for negative speed Date: Tue, 17 Dec 2019 16:04:58 +0100 Message-Id: <20191217150458.10288-1-kwolf@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-MC-Unique: X9LJY1mmPcykMVj-G2nQ_g-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.81 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: kwolf@redhat.com, berto@igalia.com, qemu-devel@nongnu.org, mreitz@redhat.com 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" The error message for a negative speed uses QERR_INVALID_PARAMETER, which implies that the 'speed' option doesn't even exist: {"error": {"class": "GenericError", "desc": "Invalid parameter 'speed'"= }} Make it use QERR_INVALID_PARAMETER_VALUE instead: {"error": {"class": "GenericError", "desc": "Parameter 'speed' expects = a non-negative value"}} Signed-off-by: Kevin Wolf Reviewed-by: Alberto Garcia Reviewed-by: Max Reitz --- v2: - Update reference output for 030 [Max] blockjob.c | 3 ++- tests/qemu-iotests/030 | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/blockjob.c b/blockjob.c index c6e20e2fcd..5d63b1e89d 100644 --- a/blockjob.c +++ b/blockjob.c @@ -261,7 +261,8 @@ void block_job_set_speed(BlockJob *job, int64_t speed, = Error **errp) return; } if (speed < 0) { - error_setg(errp, QERR_INVALID_PARAMETER, "speed"); + error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "speed", + "a non-negative value"); return; } =20 diff --git a/tests/qemu-iotests/030 b/tests/qemu-iotests/030 index f3766f2a81..be35bde06f 100755 --- a/tests/qemu-iotests/030 +++ b/tests/qemu-iotests/030 @@ -943,7 +943,7 @@ class TestSetSpeed(iotests.QMPTestCase): self.assert_no_active_block_jobs() =20 result =3D self.vm.qmp('block-stream', device=3D'drive0', speed=3D= -1) - self.assert_qmp(result, 'error/desc', "Invalid parameter 'speed'") + self.assert_qmp(result, 'error/desc', "Parameter 'speed' expects a= non-negative value") =20 self.assert_no_active_block_jobs() =20 @@ -952,7 +952,7 @@ class TestSetSpeed(iotests.QMPTestCase): self.assert_qmp(result, 'return', {}) =20 result =3D self.vm.qmp('block-job-set-speed', device=3D'drive0', s= peed=3D-1) - self.assert_qmp(result, 'error/desc', "Invalid parameter 'speed'") + self.assert_qmp(result, 'error/desc', "Parameter 'speed' expects a= non-negative value") =20 self.cancel_and_wait(resume=3DTrue) =20 --=20 2.20.1