Commit d5124c00 authored by Max Reitz's avatar Max Reitz Committed by Kevin Wolf
Browse files

bdrv: Use "Error" for creating images 



Add an Error ** parameter to BlockDriver.bdrv_create to allow more
specific error messages.

Signed-off-by: default avatarMax Reitz <mreitz@redhat.com>
parent 015a1036

block.c

+1 −1
Original line number Diff line number Diff line
@@ -401,7 +401,7 @@ static void coroutine_fn bdrv_create_co_entry(void *opaque) 
    CreateCo *cco = opaque;

    assert(cco->drv);



    cco->ret = cco->drv->bdrv_create(cco->filename, cco->options);

    cco->ret = cco->drv->bdrv_create(cco->filename, cco->options, NULL);

}



int bdrv_create(BlockDriver *drv, const char* filename,

block/cow.c

+2 −1
Original line number Diff line number Diff line
@@ -295,7 +295,8 @@ static void cow_close(BlockDriverState *bs) 
{

}



static int cow_create(const char *filename, QEMUOptionParameter *options)

static int cow_create(const char *filename, QEMUOptionParameter *options,

                      Error **errp)

{

    struct cow_header_v2 cow_header;

    struct stat st;

block/gluster.c

+1 −1
Original line number Diff line number Diff line
@@ -357,7 +357,7 @@ out: 
}



static int qemu_gluster_create(const char *filename,

        QEMUOptionParameter *options)

        QEMUOptionParameter *options, Error **errp)

{

    struct glfs *glfs;

    struct glfs_fd *fd;

block/iscsi.c

+2 −1
Original line number Diff line number Diff line
@@ -1238,7 +1238,8 @@ static int iscsi_has_zero_init(BlockDriverState *bs) 
    return 0;

}



static int iscsi_create(const char *filename, QEMUOptionParameter *options)

static int iscsi_create(const char *filename, QEMUOptionParameter *options,

                        Error **errp)

{

    int ret = 0;

    int64_t total_size = 0;

block/qcow.c

+2 −1
Original line number Diff line number Diff line
@@ -659,7 +659,8 @@ static void qcow_close(BlockDriverState *bs) 
    error_free(s->migration_blocker);

}



static int qcow_create(const char *filename, QEMUOptionParameter *options)

static int qcow_create(const char *filename, QEMUOptionParameter *options,

                       Error **errp)

{

    int header_size, backing_filename_len, l1_size, shift, i;

    QCowHeader header;