[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PULL 17/19] vhdx: Don't use error_setg_errno() with consta
From: |
Kevin Wolf |
Subject: |
[Qemu-block] [PULL 17/19] vhdx: Don't use error_setg_errno() with constant errno |
Date: |
Mon, 26 Mar 2018 16:35:58 +0200 |
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 <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Jeff Cody <address@hidden>
---
block/vhdx.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/block/vhdx.c b/block/vhdx.c
index 6a5e48eb69..4a087d8708 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
- [Qemu-block] [PULL 09/19] vdi: Fix build with CONFIG_VDI_DEBUG, (continued)
- [Qemu-block] [PULL 09/19] vdi: Fix build with CONFIG_VDI_DEBUG, Kevin Wolf, 2018/03/26
- [Qemu-block] [PULL 04/19] block/throttle: Remove protocol-related fields, Kevin Wolf, 2018/03/26
- [Qemu-block] [PULL 07/19] qcow2: Reset free_cluster_index when allocating a new refcount block, Kevin Wolf, 2018/03/26
- [Qemu-block] [PULL 10/19] qemu-iotests: Test vdi image creation with QMP, Kevin Wolf, 2018/03/26
- [Qemu-block] [PULL 13/19] qemu-iotests: Test invalid resize on luks, Kevin Wolf, 2018/03/26
- [Qemu-block] [PULL 11/19] qemu-iotests: Enable 025 for luks, Kevin Wolf, 2018/03/26
- [Qemu-block] [PULL 15/19] qemu-iotests: Test parallels image creation with QMP, Kevin Wolf, 2018/03/26
- [Qemu-block] [PULL 12/19] luks: Turn another invalid assertion into check, Kevin Wolf, 2018/03/26
- [Qemu-block] [PULL 18/19] vhdx: Check for 4 GB maximum log size on creation, Kevin Wolf, 2018/03/26
- [Qemu-block] [PULL 16/19] vhdx: Require power-of-two block size on create, Kevin Wolf, 2018/03/26
- [Qemu-block] [PULL 17/19] vhdx: Don't use error_setg_errno() with constant errno,
Kevin Wolf <=
- [Qemu-block] [PULL 14/19] parallels: Check maximum cluster size on create, Kevin Wolf, 2018/03/26
- [Qemu-block] [PULL 19/19] qemu-iotests: Test vhdx image creation with QMP, Kevin Wolf, 2018/03/26
- Re: [Qemu-block] [Qemu-devel] [PULL 00/19] Block layer patches, Peter Maydell, 2018/03/27