From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46767) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XNP4S-0007Ue-3p for qemu-devel@nongnu.org; Fri, 29 Aug 2014 12:30:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XNP4M-0002q1-1Z for qemu-devel@nongnu.org; Fri, 29 Aug 2014 12:30:39 -0400 Received: from mx1.redhat.com ([209.132.183.28]:13725) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XNP4L-0002pY-Ht for qemu-devel@nongnu.org; Fri, 29 Aug 2014 12:30:33 -0400 From: Stefan Hajnoczi Date: Fri, 29 Aug 2014 17:29:39 +0100 Message-Id: <1409329803-20744-12-git-send-email-stefanha@redhat.com> In-Reply-To: <1409329803-20744-1-git-send-email-stefanha@redhat.com> References: <1409329803-20744-1-git-send-email-stefanha@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 11/35] blockdev: fix drive-mirror 'granularity' error message List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Stefan Hajnoczi Name the 'granularity' parameter and give its expected value range. Previously the device name was mistakenly reported as the parameter name. Note that the error class is unchanged from ERROR_CLASS_GENERIC_ERROR. Reported-by: Eric Blake Signed-off-by: Stefan Hajnoczi Reviewed-by: Eric Blake Reviewed-by: Beno=C3=AEt Canet --- blockdev.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/blockdev.c b/blockdev.c index 6a204c6..eeb414e 100644 --- a/blockdev.c +++ b/blockdev.c @@ -2179,11 +2179,12 @@ void qmp_drive_mirror(const char *device, const c= har *target, } =20 if (granularity !=3D 0 && (granularity < 512 || granularity > 104857= 6 * 64)) { - error_set(errp, QERR_INVALID_PARAMETER, device); + error_set(errp, QERR_INVALID_PARAMETER_VALUE, "granularity", + "a value in range [512B, 64MB]"); return; } if (granularity & (granularity - 1)) { - error_set(errp, QERR_INVALID_PARAMETER, device); + error_set(errp, QERR_INVALID_PARAMETER_VALUE, "granularity", "po= wer of 2"); return; } =20 --=20 1.9.3