@@ -548,6 +548,84 @@ int bdrv_create_file(const char *filename, QemuOpts *opts, Error **errp)
return ret;
}
+typedef struct DeleteCo {
+ BlockDriver *drv;
+ BlockDriverState *bs;
+ int ret;
+ Error *err;
+} DeleteCo;
+
+static void coroutine_fn bdrv_delete_co_entry(void *opaque)
+{
+ Error *local_err = NULL;
+ DeleteCo *dco = opaque;
+
+ assert(dco->bs);
+
+ dco->ret = dco->drv->bdrv_co_delete_file(dco->bs, &local_err);
+ error_propagate(&dco->err, local_err);
+}
+
+int bdrv_delete_file(const char *filename, Error **errp)
+{
+ BlockDriver *drv = bdrv_find_protocol(filename, true, NULL);
+ BlockDriverState *bs = bdrv_open(filename, NULL, NULL,
+ BDRV_O_RDWR | BDRV_O_PROTOCOL,
+ NULL);
+ DeleteCo dco = {
+ .drv = drv,
+ .bs = bs,
+ .ret = NOT_DONE,
+ .err = NULL,
+ };
+ Coroutine *co;
+ int ret;
+
+ if (!drv) {
+ error_setg(errp, "File '%s' has unknown format", filename);
+ ret = -ENOMEDIUM;
+ goto out;
+ }
+
+ if (!drv->bdrv_co_delete_file) {
+ error_setg(errp, "Driver '%s' does not support image delete",
+ drv->format_name);
+ ret = -ENOTSUP;
+ goto out;
+ }
+
+ if (!bs) {
+ error_setg(errp, "Could not open image '%s' for erasing",
+ filename);
+ ret = -1;
+ goto out;
+ }
+
+ if (qemu_in_coroutine()) {
+ /* Fast-path if already in coroutine context */
+ bdrv_delete_co_entry(&dco);
+ } else {
+ co = qemu_coroutine_create(bdrv_delete_co_entry, &dco);
+ qemu_coroutine_enter(co);
+ while (dco.ret == NOT_DONE) {
+ aio_poll(qemu_get_aio_context(), true);
+ }
+ }
+
+ ret = dco.ret;
+ if (ret < 0) {
+ if (dco.err) {
+ error_propagate(errp, dco.err);
+ } else {
+ error_setg_errno(errp, -ret, "Could not delete image");
+ }
+ }
+
+out:
+ bdrv_unref(bs);
+ return ret;
+}
+
/**
* Try to get @bs's logical and physical block size.
* On success, store them in @bsz struct and return 0.
@@ -374,6 +374,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 bdrv_delete_file(const char *filename, Error **errp);
typedef struct BdrvCheckResult {
Using the new 'bdrv_co_delete_file' interface, bdrv_delete_file can be used in a way similar of the existing bdrv_create_file to to clean up a created file. The logic is also similar to what is already done in bdrv_create_file: a qemu_coroutine is created if needed, a specialized function bdrv_delete_co_entry is used to call the bdrv_co_delete_file co-routine of the driver, if the driver implements it. Suggested-by: Daniel P. Berrangé <berrange@redhat.com> Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com> --- block.c | 78 +++++++++++++++++++++++++++++++++++++++++++ include/block/block.h | 1 + 2 files changed, 79 insertions(+)