From nobody Sun Oct 26 00:02:43 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1521567975785286.2108097548845; Tue, 20 Mar 2018 10:46:15 -0700 (PDT) Received: from localhost ([::1]:50998 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eyLKw-0000cb-Uv for importer@patchew.org; Tue, 20 Mar 2018 13:46:15 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51750) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eyLC0-0000NN-6H for qemu-devel@nongnu.org; Tue, 20 Mar 2018 13:37:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eyLBz-0000X9-Bd for qemu-devel@nongnu.org; Tue, 20 Mar 2018 13:37:00 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:54766 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eyLBw-0000Vh-KT; Tue, 20 Mar 2018 13:36:56 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 344878163C52; Tue, 20 Mar 2018 17:36:56 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-117-157.ams2.redhat.com [10.36.117.157]) by smtp.corp.redhat.com (Postfix) with ESMTP id D9C3C11701CA; Tue, 20 Mar 2018 17:36:54 +0000 (UTC) From: Kevin Wolf To: qemu-block@nongnu.org Date: Tue, 20 Mar 2018 18:36:30 +0100 Message-Id: <20180320173632.25480-11-kwolf@redhat.com> In-Reply-To: <20180320173632.25480-1-kwolf@redhat.com> References: <20180320173632.25480-1-kwolf@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.8]); Tue, 20 Mar 2018 17:36:56 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.8]); Tue, 20 Mar 2018 17:36:56 +0000 (UTC) for IP:'10.11.54.3' DOMAIN:'int-mx03.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'kwolf@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH for-2.12 10/12] vhdx: Don't use error_setg_errno() with constant errno X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, jcody@redhat.com, qemu-devel@nongnu.org, mreitz@redhat.com, den@openvz.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" error_setg_errno() is meant for cases where we got an errno from the OS that can add useful extra information to an error message. It's pointless if we pass a constant errno, these cases should use plain error_setg(). Signed-off-by: Kevin Wolf Reviewed-by: Eric Blake Reviewed-by: Jeff Cody --- block/vhdx.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/block/vhdx.c b/block/vhdx.c index ca211a3196..0e48179b81 100644 --- a/block/vhdx.c +++ b/block/vhdx.c @@ -1822,7 +1822,7 @@ static int coroutine_fn vhdx_co_create(BlockdevCreate= Options *opts, /* Validate options and set default values */ image_size =3D vhdx_opts->size; if (image_size > VHDX_MAX_IMAGE_SIZE) { - error_setg_errno(errp, EINVAL, "Image size too large; max of 64TB"= ); + error_setg(errp, "Image size too large; max of 64TB"); return -EINVAL; } =20 @@ -1832,7 +1832,7 @@ static int coroutine_fn vhdx_co_create(BlockdevCreate= Options *opts, log_size =3D vhdx_opts->log_size; } if (log_size < MiB || (log_size % MiB) !=3D 0) { - error_setg_errno(errp, EINVAL, "Log size must be a multiple of 1 M= B"); + error_setg(errp, "Log size must be a multiple of 1 MB"); return -EINVAL; } =20 @@ -1874,7 +1874,7 @@ static int coroutine_fn vhdx_co_create(BlockdevCreate= Options *opts, } =20 if (block_size < MiB || (block_size % MiB) !=3D 0) { - error_setg_errno(errp, EINVAL, "Block size must be a multiple of 1= MB"); + error_setg(errp, "Block size must be a multiple of 1 MB"); return -EINVAL; } if (!is_power_of_2(block_size)) { @@ -1882,8 +1882,7 @@ static int coroutine_fn vhdx_co_create(BlockdevCreate= Options *opts, return -EINVAL; } if (block_size > VHDX_BLOCK_SIZE_MAX) { - error_setg_errno(errp, EINVAL, "Block size must not exceed %d", - VHDX_BLOCK_SIZE_MAX); + error_setg(errp, "Block size must not exceed %d", VHDX_BLOCK_SIZE_= MAX); return -EINVAL; } =20 --=20 2.13.6