On Tue, Mar 20, 2018 at 06:36:30PM +0100, Kevin Wolf wrote:
> 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 <kw...@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
>
Reviewed-by: Jeff Cody <jc...@redhat.com>
