Commit e1d7f8bb authored by Daniel Henrique Barboza's avatar Daniel Henrique Barboza Committed by Kevin Wolf
Browse files

block.c: adding bdrv_co_delete_file 



Using the new 'bdrv_co_delete_file' interface, a pure co_routine function
'bdrv_co_delete_file' inside block.c can can be used in a way similar of
the existing bdrv_create_file to to clean up a created file.

We're creating a pure co_routine because the only caller of
'bdrv_co_delete_file' will be already in co_routine context, thus there
is no need to add all the machinery to check for qemu_in_coroutine() and
create a separated co_routine to do the job.

Suggested-by: default avatarDaniel P. Berrangé <berrange@redhat.com>
Signed-off-by: default avatarDaniel Henrique Barboza <danielhb413@gmail.com>
Message-Id: <20200130213907.2830642-3-danielhb413@gmail.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent 9bffae14

block.c

+26 −0
Original line number Diff line number Diff line
@@ -668,6 +668,32 @@ int bdrv_create_file(const char *filename, QemuOpts *opts, Error **errp) 
    }

}



int coroutine_fn bdrv_co_delete_file(BlockDriverState *bs, Error **errp)

{

    Error *local_err = NULL;

    int ret;



    assert(bs != NULL);



    if (!bs->drv) {

        error_setg(errp, "Block node '%s' is not opened", bs->filename);

        return -ENOMEDIUM;

    }



    if (!bs->drv->bdrv_co_delete_file) {

        error_setg(errp, "Driver '%s' does not support image deletion",

                   bs->drv->format_name);

        return -ENOTSUP;

    }



    ret = bs->drv->bdrv_co_delete_file(bs, &local_err);

    if (ret < 0) {

        error_propagate(errp, local_err);

    }



    return ret;

}



/**

 * Try to get @bs's logical and physical block size.

 * On success, store them in @bsz struct and return 0.

include/block/block.h

+1 −0
Original line number Diff line number Diff line
@@ -363,6 +363,7 @@ bool bdrv_is_backing_chain_frozen(BlockDriverState *bs, BlockDriverState *base, 
int bdrv_freeze_backing_chain(BlockDriverState *bs, BlockDriverState *base,

                              Error **errp);

void bdrv_unfreeze_backing_chain(BlockDriverState *bs, BlockDriverState *base);

int coroutine_fn bdrv_co_delete_file(BlockDriverState *bs, Error **errp);





typedef struct BdrvCheckResult {