Commit 0fcc38e7 authored by Kevin Wolf's avatar Kevin Wolf
Browse files

vhdx: Don't use error_setg_errno() with constant errno 



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: default avatarKevin Wolf <kwolf@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Reviewed-by: default avatarJeff Cody <jcody@redhat.com>
parent b412f494

block/vhdx.c

+4 −5
Original line number Diff line number Diff line
@@ -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;

    }