qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Kevin Wolf <kwolf@redhat.com>
To: qemu-block@nongnu.org
Cc: kwolf@redhat.com, mreitz@redhat.com, den@openvz.org,
	jcody@redhat.com, eblake@redhat.com, berrange@redhat.com,
	qemu-devel@nongnu.org
Subject: [Qemu-devel] [PATCH for-2.12 10/12] vhdx: Don't use error_setg_errno() with constant errno
Date: Tue, 20 Mar 2018 18:36:30 +0100	[thread overview]
Message-ID: <20180320173632.25480-11-kwolf@redhat.com> (raw)
In-Reply-To: <20180320173632.25480-1-kwolf@redhat.com>

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 <kwolf@redhat.com>
---
 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(BlockdevCreateOptions *opts,
     /* Validate options and set default values */
     image_size = 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;
     }
 
@@ -1832,7 +1832,7 @@ static int coroutine_fn vhdx_co_create(BlockdevCreateOptions *opts,
         log_size = vhdx_opts->log_size;
     }
     if (log_size < MiB || (log_size % MiB) != 0) {
-        error_setg_errno(errp, EINVAL, "Log size must be a multiple of 1 MB");
+        error_setg(errp, "Log size must be a multiple of 1 MB");
         return -EINVAL;
     }
 
@@ -1874,7 +1874,7 @@ static int coroutine_fn vhdx_co_create(BlockdevCreateOptions *opts,
     }
 
     if (block_size < MiB || (block_size % MiB) != 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(BlockdevCreateOptions *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;
     }
 
-- 
2.13.6

  parent reply	other threads:[~2018-03-20 17:37 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-03-20 17:36 [Qemu-devel] [PATCH for-2.12 00/12] block: Follow-up for .bdrv_co_create (part 1) Kevin Wolf
2018-03-20 17:36 ` [Qemu-devel] [PATCH for-2.12 01/12] vdi: Change 'static' create option to 'preallocation' in QMP Kevin Wolf
2018-03-20 18:09   ` Eric Blake
2018-03-20 17:36 ` [Qemu-devel] [PATCH for-2.12 02/12] vdi: Fix build with CONFIG_VDI_DEBUG Kevin Wolf
2018-03-20 18:18   ` Eric Blake
2018-03-20 17:36 ` [Qemu-devel] [PATCH for-2.12 03/12] qemu-iotests: Test vdi image creation with QMP Kevin Wolf
2018-03-20 18:23   ` Eric Blake
2018-03-20 17:36 ` [Qemu-devel] [PATCH for-2.12 04/12] qemu-iotests: Enable 025 for luks Kevin Wolf
2018-03-20 18:25   ` Eric Blake
2018-03-21  9:32   ` Daniel P. Berrangé
2018-03-20 17:36 ` [Qemu-devel] [PATCH for-2.12 05/12] luks: Turn another invalid assertion into check Kevin Wolf
2018-03-20 18:26   ` Eric Blake
2018-03-21  9:31   ` Daniel P. Berrangé
2018-03-20 17:36 ` [Qemu-devel] [PATCH for-2.12 06/12] qemu-iotests: Test invalid resize on luks Kevin Wolf
2018-03-20 18:33   ` Eric Blake
2018-03-21 17:22     ` Kevin Wolf
2018-03-21  9:31   ` Daniel P. Berrangé
2018-03-20 17:36 ` [Qemu-devel] [PATCH for-2.12 07/12] parallels: Check maximum cluster size on create Kevin Wolf
2018-03-20 18:34   ` Eric Blake
2018-03-20 17:36 ` [Qemu-devel] [PATCH for-2.12 08/12] qemu-iotests: Test parallels image creation with QMP Kevin Wolf
2018-03-20 18:42   ` Eric Blake
2018-03-21 17:21     ` Kevin Wolf
2018-03-20 17:36 ` [Qemu-devel] [PATCH for-2.12 09/12] vhdx: Require power-of-two block size on create Kevin Wolf
2018-03-20 18:43   ` Eric Blake
2018-03-21 13:03   ` Jeff Cody
2018-03-20 17:36 ` Kevin Wolf [this message]
2018-03-20 18:45   ` [Qemu-devel] [PATCH for-2.12 10/12] vhdx: Don't use error_setg_errno() with constant errno Eric Blake
2018-03-21 13:04   ` Jeff Cody
2018-03-20 17:36 ` [Qemu-devel] [PATCH for-2.12 11/12] vhdx: Check for 4 GB maximum log size on creation Kevin Wolf
2018-03-20 18:45   ` Eric Blake
2018-03-21 13:10   ` Jeff Cody
2018-03-20 17:36 ` [Qemu-devel] [PATCH for-2.12 12/12] qemu-iotests: Test vhdx image creation with QMP Kevin Wolf
2018-03-20 18:53   ` Eric Blake
2018-03-21 17:26     ` Kevin Wolf

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180320173632.25480-11-kwolf@redhat.com \
    --to=kwolf@redhat.com \
    --cc=berrange@redhat.com \
    --cc=den@openvz.org \
    --cc=eblake@redhat.com \
    --cc=jcody@redhat.com \
    --cc=mreitz@redhat.com \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).