Commit efc75e2a authored by Stefan Hajnoczi's avatar Stefan Hajnoczi Committed by Kevin Wolf
Browse files

block: rename .bdrv_create() to .bdrv_co_create_opts() 



BlockDriver->bdrv_create() has been called from coroutine context since
commit 5b7e1542 ("block: make
bdrv_create adopt coroutine").

Make this explicit by renaming to .bdrv_co_create_opts() and add the
coroutine_fn annotation.  This makes it obvious to block driver authors
that they may yield, use CoMutex, or other coroutine_fn APIs.
bdrv_co_create is reserved for the QAPI-based version that Kevin is
working on.

Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Message-Id: <20170705102231.20711-2-stefanha@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent 13471a40

block.c

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

    assert(cco->drv);



    ret = cco->drv->bdrv_create(cco->filename, cco->opts, &local_err);

    ret = cco->drv->bdrv_co_create_opts(cco->filename, cco->opts, &local_err);

    error_propagate(&cco->err, local_err);

    cco->ret = ret;

}
@@ -439,7 +439,7 @@ int bdrv_create(BlockDriver *drv, const char* filename, 
        .err = NULL,

    };



    if (!drv->bdrv_create) {

    if (!drv->bdrv_co_create_opts) {

        error_setg(errp, "Driver '%s' does not support image creation", drv->format_name);

        ret = -ENOTSUP;

        goto out;

block/crypto.c

+4 −4
Original line number Diff line number Diff line
@@ -556,7 +556,7 @@ static int block_crypto_open_luks(BlockDriverState *bs, 
                                     bs, options, flags, errp);

}



static int block_crypto_create_luks(const char *filename,

static int coroutine_fn block_crypto_co_create_opts_luks(const char *filename,

                                                         QemuOpts *opts,

                                                         Error **errp)

{
@@ -617,7 +617,7 @@ BlockDriver bdrv_crypto_luks = { 
    .bdrv_open          = block_crypto_open_luks,

    .bdrv_close         = block_crypto_close,

    .bdrv_child_perm    = bdrv_format_default_perms,

    .bdrv_create        = block_crypto_create_luks,

    .bdrv_co_create_opts = block_crypto_co_create_opts_luks,

    .bdrv_truncate      = block_crypto_truncate,

    .create_opts        = &block_crypto_create_opts_luks,

block/file-posix.c

+8 −7
Original line number Diff line number Diff line
@@ -1982,7 +1982,8 @@ static int64_t raw_get_allocated_file_size(BlockDriverState *bs) 
    return (int64_t)st.st_blocks * 512;

}



static int raw_create(const char *filename, QemuOpts *opts, Error **errp)

static int coroutine_fn raw_co_create_opts(const char *filename, QemuOpts *opts,

                                           Error **errp)

{

    int fd;

    int result = 0;
@@ -2276,7 +2277,7 @@ BlockDriver bdrv_file = { 
    .bdrv_reopen_commit = raw_reopen_commit,

    .bdrv_reopen_abort = raw_reopen_abort,

    .bdrv_close = raw_close,

    .bdrv_create = raw_create,

    .bdrv_co_create_opts = raw_co_create_opts,

    .bdrv_has_zero_init = bdrv_has_zero_init_1,

    .bdrv_co_block_status = raw_co_block_status,

    .bdrv_co_pwrite_zeroes = raw_co_pwrite_zeroes,
@@ -2680,7 +2681,7 @@ static coroutine_fn int hdev_co_pwrite_zeroes(BlockDriverState *bs, 
    return -ENOTSUP;

}



static int hdev_create(const char *filename, QemuOpts *opts,

static int coroutine_fn hdev_co_create_opts(const char *filename, QemuOpts *opts,

                                            Error **errp)

{

    int fd;
@@ -2754,7 +2755,7 @@ static BlockDriver bdrv_host_device = { 
    .bdrv_reopen_prepare = raw_reopen_prepare,

    .bdrv_reopen_commit  = raw_reopen_commit,

    .bdrv_reopen_abort   = raw_reopen_abort,

    .bdrv_create         = hdev_create,

    .bdrv_co_create_opts = hdev_co_create_opts,

    .create_opts         = &raw_create_opts,

    .bdrv_co_pwrite_zeroes = hdev_co_pwrite_zeroes,
@@ -2876,7 +2877,7 @@ static BlockDriver bdrv_host_cdrom = { 
    .bdrv_reopen_prepare = raw_reopen_prepare,

    .bdrv_reopen_commit  = raw_reopen_commit,

    .bdrv_reopen_abort   = raw_reopen_abort,

    .bdrv_create         = hdev_create,

    .bdrv_co_create_opts = hdev_co_create_opts,

    .create_opts         = &raw_create_opts,
@@ -3007,7 +3008,7 @@ static BlockDriver bdrv_host_cdrom = { 
    .bdrv_reopen_prepare = raw_reopen_prepare,

    .bdrv_reopen_commit  = raw_reopen_commit,

    .bdrv_reopen_abort   = raw_reopen_abort,

    .bdrv_create        = hdev_create,

    .bdrv_co_create_opts = hdev_co_create_opts,

    .create_opts        = &raw_create_opts,



    .bdrv_co_preadv         = raw_co_preadv,

block/file-win32.c

+3 −2
Original line number Diff line number Diff line
@@ -553,7 +553,8 @@ static int64_t raw_get_allocated_file_size(BlockDriverState *bs) 
    return st.st_size;

}



static int raw_create(const char *filename, QemuOpts *opts, Error **errp)

static int coroutine_fn raw_co_create_opts(const char *filename, QemuOpts *opts,

                                           Error **errp)

{

    int fd;

    int64_t total_size = 0;
@@ -599,7 +600,7 @@ BlockDriver bdrv_file = { 
    .bdrv_file_open     = raw_open,

    .bdrv_refresh_limits = raw_probe_alignment,

    .bdrv_close         = raw_close,

    .bdrv_create        = raw_create,

    .bdrv_co_create_opts = raw_co_create_opts,

    .bdrv_has_zero_init = bdrv_has_zero_init_1,



    .bdrv_aio_readv     = raw_aio_readv,

block/gluster.c

+7 −6
Original line number Diff line number Diff line
@@ -1021,8 +1021,9 @@ static int qemu_gluster_do_truncate(struct glfs_fd *fd, int64_t offset, 
    return 0;

}



static int qemu_gluster_create(const char *filename,

                               QemuOpts *opts, Error **errp)

static int coroutine_fn qemu_gluster_co_create_opts(const char *filename,

                                                    QemuOpts *opts,

                                                    Error **errp)

{

    BlockdevOptionsGluster *gconf;

    struct glfs *glfs;
@@ -1435,7 +1436,7 @@ static BlockDriver bdrv_gluster = { 
    .bdrv_reopen_commit           = qemu_gluster_reopen_commit,

    .bdrv_reopen_abort            = qemu_gluster_reopen_abort,

    .bdrv_close                   = qemu_gluster_close,

    .bdrv_create                  = qemu_gluster_create,

    .bdrv_co_create_opts          = qemu_gluster_co_create_opts,

    .bdrv_getlength               = qemu_gluster_getlength,

    .bdrv_get_allocated_file_size = qemu_gluster_allocated_file_size,

    .bdrv_truncate                = qemu_gluster_truncate,
@@ -1463,7 +1464,7 @@ static BlockDriver bdrv_gluster_tcp = { 
    .bdrv_reopen_commit           = qemu_gluster_reopen_commit,

    .bdrv_reopen_abort            = qemu_gluster_reopen_abort,

    .bdrv_close                   = qemu_gluster_close,

    .bdrv_create                  = qemu_gluster_create,

    .bdrv_co_create_opts          = qemu_gluster_co_create_opts,

    .bdrv_getlength               = qemu_gluster_getlength,

    .bdrv_get_allocated_file_size = qemu_gluster_allocated_file_size,

    .bdrv_truncate                = qemu_gluster_truncate,
@@ -1491,7 +1492,7 @@ static BlockDriver bdrv_gluster_unix = { 
    .bdrv_reopen_commit           = qemu_gluster_reopen_commit,

    .bdrv_reopen_abort            = qemu_gluster_reopen_abort,

    .bdrv_close                   = qemu_gluster_close,

    .bdrv_create                  = qemu_gluster_create,

    .bdrv_co_create_opts          = qemu_gluster_co_create_opts,

    .bdrv_getlength               = qemu_gluster_getlength,

    .bdrv_get_allocated_file_size = qemu_gluster_allocated_file_size,

    .bdrv_truncate                = qemu_gluster_truncate,
@@ -1525,7 +1526,7 @@ static BlockDriver bdrv_gluster_rdma = { 
    .bdrv_reopen_commit           = qemu_gluster_reopen_commit,

    .bdrv_reopen_abort            = qemu_gluster_reopen_abort,

    .bdrv_close                   = qemu_gluster_close,

    .bdrv_create                  = qemu_gluster_create,

    .bdrv_co_create_opts          = qemu_gluster_co_create_opts,

    .bdrv_getlength               = qemu_gluster_getlength,

    .bdrv_get_allocated_file_size = qemu_gluster_allocated_file_size,

    .bdrv_truncate                = qemu_gluster_truncate,