Commit 71c79813 authored by Luiz Capitulino's avatar Luiz Capitulino Committed by Kevin Wolf
Browse files

block: bdrv_img_create(): add Error ** argument 



This commit adds an Error ** argument to bdrv_img_create() and set it
appropriately on error.

Callers of bdrv_img_create() pass NULL for the new argument and still
rely on bdrv_img_create()'s return value. Next commits will change
callers to use the Error object instead.

Signed-off-by: default avatarLuiz Capitulino <lcapitulino@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent 3c42ea66

block.c

+21 −1
Original line number Diff line number Diff line
@@ -4444,7 +4444,7 @@ bdrv_acct_done(BlockDriverState *bs, BlockAcctCookie *cookie) 


int bdrv_img_create(const char *filename, const char *fmt,

                    const char *base_filename, const char *base_fmt,

                    char *options, uint64_t img_size, int flags)

                    char *options, uint64_t img_size, int flags, Error **errp)

{

    QEMUOptionParameter *param = NULL, *create_options = NULL;

    QEMUOptionParameter *backing_fmt, *backing_file, *size;
@@ -4457,6 +4457,7 @@ int bdrv_img_create(const char *filename, const char *fmt, 
    drv = bdrv_find_format(fmt);

    if (!drv) {

        error_report("Unknown file format '%s'", fmt);

        error_setg(errp, "Unknown file format '%s'", fmt);

        ret = -EINVAL;

        goto out;

    }
@@ -4464,6 +4465,7 @@ int bdrv_img_create(const char *filename, const char *fmt, 
    proto_drv = bdrv_find_protocol(filename);

    if (!proto_drv) {

        error_report("Unknown protocol '%s'", filename);

        error_setg(errp, "Unknown protocol '%s'", filename);

        ret = -EINVAL;

        goto out;

    }
@@ -4483,6 +4485,7 @@ int bdrv_img_create(const char *filename, const char *fmt, 
        param = parse_option_parameters(options, create_options, param);

        if (param == NULL) {

            error_report("Invalid options for file format '%s'.", fmt);

            error_setg(errp, "Invalid options for file format '%s'.", fmt);

            ret = -EINVAL;

            goto out;

        }
@@ -4493,6 +4496,8 @@ int bdrv_img_create(const char *filename, const char *fmt, 
                                 base_filename)) {

            error_report("Backing file not supported for file format '%s'",

                         fmt);

            error_setg(errp, "Backing file not supported for file format '%s'",

                       fmt);

            ret = -EINVAL;

            goto out;

        }
@@ -4502,6 +4507,8 @@ int bdrv_img_create(const char *filename, const char *fmt, 
        if (set_option_parameter(param, BLOCK_OPT_BACKING_FMT, base_fmt)) {

            error_report("Backing file format not supported for file "

                         "format '%s'", fmt);

            error_setg(errp, "Backing file format not supported for file "

                             "format '%s'", fmt);

            ret = -EINVAL;

            goto out;

        }
@@ -4512,6 +4519,8 @@ int bdrv_img_create(const char *filename, const char *fmt, 
        if (!strcmp(filename, backing_file->value.s)) {

            error_report("Error: Trying to create an image with the "

                         "same filename as the backing file");

            error_setg(errp, "Error: Trying to create an image with the "

                             "same filename as the backing file");

            ret = -EINVAL;

            goto out;

        }
@@ -4523,6 +4532,8 @@ int bdrv_img_create(const char *filename, const char *fmt, 
        if (!backing_drv) {

            error_report("Unknown backing file format '%s'",

                         backing_fmt->value.s);

            error_setg(errp, "Unknown backing file format '%s'",

                       backing_fmt->value.s);

            ret = -EINVAL;

            goto out;

        }
@@ -4546,6 +4557,8 @@ int bdrv_img_create(const char *filename, const char *fmt, 
            ret = bdrv_open(bs, backing_file->value.s, back_flags, backing_drv);

            if (ret < 0) {

                error_report("Could not open '%s'", backing_file->value.s);

                error_setg_errno(errp, -ret, "Could not open '%s'",

                                 backing_file->value.s);

                goto out;

            }

            bdrv_get_geometry(bs, &size);
@@ -4555,6 +4568,7 @@ int bdrv_img_create(const char *filename, const char *fmt, 
            set_option_parameter(param, BLOCK_OPT_SIZE, buf);

        } else {

            error_report("Image creation needs a size parameter");

            error_setg(errp, "Image creation needs a size parameter");

            ret = -EINVAL;

            goto out;

        }
@@ -4570,12 +4584,18 @@ int bdrv_img_create(const char *filename, const char *fmt, 
        if (ret == -ENOTSUP) {

            error_report("Formatting or formatting option not supported for "

                         "file format '%s'", fmt);

            error_setg(errp,"Formatting or formatting option not supported for "

                            "file format '%s'", fmt);

        } else if (ret == -EFBIG) {

            error_report("The image size is too large for file format '%s'",

                         fmt);

            error_setg(errp, "The image size is too large for file format '%s'",

                       fmt);

        } else {

            error_report("%s: error while creating %s: %s", filename, fmt,

                         strerror(-ret));

            error_setg(errp, "%s: error while creating %s: %s", filename, fmt,

                       strerror(-ret));

        }

    }

block.h

+1 −1
Original line number Diff line number Diff line
@@ -345,7 +345,7 @@ int bdrv_load_vmstate(BlockDriverState *bs, uint8_t *buf, 


int bdrv_img_create(const char *filename, const char *fmt,

                    const char *base_filename, const char *base_fmt,

                    char *options, uint64_t img_size, int flags);

                    char *options, uint64_t img_size, int flags, Error **errp);



void bdrv_set_buffer_alignment(BlockDriverState *bs, int align);

void *qemu_blockalign(BlockDriverState *bs, size_t size);

blockdev.c

+3 −3
Original line number Diff line number Diff line
@@ -789,7 +789,7 @@ void qmp_transaction(BlockdevActionList *dev_list, Error **errp) 
            ret = bdrv_img_create(new_image_file, format,

                                  states->old_bs->filename,

                                  states->old_bs->drv->format_name,

                                  NULL, -1, flags);

                                  NULL, -1, flags, NULL);

            if (ret) {

                error_set(errp, QERR_OPEN_FILE_FAILED, new_image_file);

                goto delete_and_fail;
@@ -1264,7 +1264,7 @@ void qmp_drive_mirror(const char *device, const char *target, 
        bdrv_get_geometry(bs, &size);

        size *= 512;

        ret = bdrv_img_create(target, format,

                              NULL, NULL, NULL, size, flags);

                              NULL, NULL, NULL, size, flags, NULL);

    } else {

        switch (mode) {

        case NEW_IMAGE_MODE_EXISTING:
@@ -1275,7 +1275,7 @@ void qmp_drive_mirror(const char *device, const char *target, 
            ret = bdrv_img_create(target, format,

                                  source->filename,

                                  source->drv->format_name,

                                  NULL, -1, flags);

                                  NULL, -1, flags, NULL);

            break;

        default:

            abort();

qemu-img.c

+1 −1
Original line number Diff line number Diff line
@@ -362,7 +362,7 @@ static int img_create(int argc, char **argv) 
    }



    ret = bdrv_img_create(filename, fmt, base_filename, base_fmt,

                          options, img_size, BDRV_O_FLAGS);

                          options, img_size, BDRV_O_FLAGS, NULL);

out:

    if (ret) {

        return 1;