From patchwork Tue Mar 26 21:17:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Henrique Barboza X-Patchwork-Id: 10872191 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C641D1708 for ; Tue, 26 Mar 2019 21:22:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B27CA28CC2 for ; Tue, 26 Mar 2019 21:22:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A698F28CC9; Tue, 26 Mar 2019 21:22:26 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id AF4ED28CC2 for ; Tue, 26 Mar 2019 21:22:24 +0000 (UTC) Received: from localhost ([127.0.0.1]:38113 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h8tWZ-0002UB-VH for patchwork-qemu-devel@patchwork.kernel.org; Tue, 26 Mar 2019 17:22:24 -0400 Received: from eggs.gnu.org ([209.51.188.92]:58529) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h8tV6-0001Ob-Sn for qemu-devel@nongnu.org; Tue, 26 Mar 2019 17:20:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h8tSJ-000177-1w for qemu-devel@nongnu.org; Tue, 26 Mar 2019 17:18:00 -0400 Received: from mail-qt1-x842.google.com ([2607:f8b0:4864:20::842]:44786) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h8tSI-00016n-PG; Tue, 26 Mar 2019 17:17:58 -0400 Received: by mail-qt1-x842.google.com with SMTP id w5so16391434qtb.11; Tue, 26 Mar 2019 14:17:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=c5P7W8u4SI9IzsNzKkEt5fwljjlwnMVE0EbXSH1SCzo=; b=rg8qIK9tR4ZiQ6Rt4s5UrRLn63WprqSXP4S+uyKEzCZzwq0iloezikJCFflQhcoAeC BzGyOYlpWGYx5ne+WDIDgYHwJPDSaFxcp0ryWEWweYhPk6ztuhXSfEc7LzgGYCMk9COQ G/bMfI6cYM+nMwVY8CQdvGMj77R1vinfrsCbVP9FcFxNOYUao+wANTutVwdImmjCDoFF bSgSzlpqeMMg5ztD/EMdvOPMYfboc0mkvdD6UBQFWQgSoQpBUQlWkxW8GsmSvAQoAFLc ow/ajpXFmKm73rxF/bD+B4dqZRZLwBhAP8ZxFR8adFUDvYqx9pGz7lXgg4w62teN9lUz B1KA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=c5P7W8u4SI9IzsNzKkEt5fwljjlwnMVE0EbXSH1SCzo=; b=FxvdyDq/eieIAtszU5kncCvDyx9Fo2NA5SGTg6x0ghRfPbW/z5VB3sQ+Rvkowye678 3xFhrMw3RBqwQrxmb4JiJlz77wknUglFHgwT+ZGWcWukDV5bDhHmPMHVkvUcl1MlQC6a BneOQMcDfSjPI9v1GVvBEMRaWPW8z+RZcxuMtIPGTcMUQ0iaAHrNIc7Tst+N88++cJyO +EBWTXE0kTPUDa90nCFQg5gfqCHo9hDoX0zgrzn2eLMAgMbNS95xvUGJDQYoV06Zsnus Xel+z+rPAzn4IYUZrDfv3cPfy7IwqO0kcJPfuJilf4xgKsHua7WtXmv1wNE5YnVV69jp RLrQ== X-Gm-Message-State: APjAAAWe3jt0f4t5eze61sco/Kfo9MlUIXaGt4zoaZAouNa67spNcg2I pSvs3pPYkhpeElUSKANFASGvkET2TRY= X-Google-Smtp-Source: APXvYqz0VL+g9RUeJ1wJIvcFDtuN4k5l1FfAbGzqnWmBMmmpBzdFfxblvQiI3KbmVKx/HsgEP/sIbA== X-Received: by 2002:a0c:9651:: with SMTP id 17mr12874485qvy.59.1553635078146; Tue, 26 Mar 2019 14:17:58 -0700 (PDT) Received: from rekt.ibmmodules.com ([2804:431:f700:6d41:b488:ffd7:8d35:4aac]) by smtp.gmail.com with ESMTPSA id d21sm11735060qtc.91.2019.03.26.14.17.56 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 26 Mar 2019 14:17:57 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Date: Tue, 26 Mar 2019 18:17:41 -0300 Message-Id: <20190326211742.26140-3-danielhb413@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190326211742.26140-1-danielhb413@gmail.com> References: <20190326211742.26140-1-danielhb413@gmail.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::842 Subject: [Qemu-devel] [PATCH v3 2/3] block.c: adding bdrv_delete_file X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, Daniel Henrique Barboza , qemu-block@nongnu.org, mreitz@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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é Signed-off-by: Daniel Henrique Barboza --- block.c | 71 +++++++++++++++++++++++++++++++++++++++++++ include/block/block.h | 2 ++ 2 files changed, 73 insertions(+) diff --git a/block.c b/block.c index 227362b282..4eb9d27863 100644 --- a/block.c +++ b/block.c @@ -547,6 +547,77 @@ int bdrv_create_file(const char *filename, QemuOpts *opts, Error **errp) return ret; } +static void coroutine_fn bdrv_delete_co_entry(void *opaque) +{ + Error *local_err = NULL; + int ret; + + CreateCo *cco = opaque; + assert(cco->drv); + + ret = cco->drv->bdrv_co_delete_file(cco->filename, &local_err); + error_propagate(&cco->err, local_err); + cco->ret = ret; +} + +int bdrv_delete_file(const char *filename, Error **errp) +{ + + BlockDriver *drv = bdrv_find_protocol(filename, true, errp); + CreateCo cco = { + .drv = drv, + .filename = g_strdup(filename), + .ret = NOT_DONE, + .err = NULL, + }; + Coroutine *co; + int ret; + + if (!drv) { + error_setg(errp, "File '%s' has unknown format", filename); + ret = -ENOENT; + 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 (!drv->bdrv_co_delete_file) { + error_setg(errp, "Driver '%s' does not support image delete", + drv->format_name); + ret = -ENOTSUP; + goto out; + } + + if (qemu_in_coroutine()) { + /* Fast-path if already in coroutine context */ + bdrv_delete_co_entry(&cco); + } else { + co = qemu_coroutine_create(bdrv_delete_co_entry, &cco); + qemu_coroutine_enter(co); + while (cco.ret == NOT_DONE) { + aio_poll(qemu_get_aio_context(), true); + } + } + + ret = cco.ret; + if (ret < 0) { + if (cco.err) { + error_propagate(errp, cco.err); + } else { + error_setg_errno(errp, -ret, "Could not delete image"); + } + } + +out: + g_free(cco.filename); + return ret; +} + /** * Try to get @bs's logical and physical block size. * On success, store them in @bsz struct and return 0. diff --git a/include/block/block.h b/include/block/block.h index 820643f96d..76901a63de 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -364,6 +364,8 @@ int bdrv_freeze_backing_chain(BlockDriverState *bs, BlockDriverState *base, void bdrv_unfreeze_backing_chain(BlockDriverState *bs, BlockDriverState *base); bool bdrv_path_is_regular_file(const char *path); +int bdrv_delete_file(const char *filename, Error **errp); + typedef struct BdrvCheckResult { int corruptions;