From patchwork Fri Jun 28 19:45:10 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: 11023421 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 21A5F138B for ; Fri, 28 Jun 2019 19:48:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1C5B32844E for ; Fri, 28 Jun 2019 19:48:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 10369287CD; Fri, 28 Jun 2019 19:48:27 +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=-5.0 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 9E61728703 for ; Fri, 28 Jun 2019 19:48:26 +0000 (UTC) Received: from localhost ([::1]:35970 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hgwrB-0002R9-K2 for patchwork-qemu-devel@patchwork.kernel.org; Fri, 28 Jun 2019 15:48:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34393) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hgwoP-0000cH-Gr for qemu-devel@nongnu.org; Fri, 28 Jun 2019 15:45:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hgwoM-0000wJ-Oa for qemu-devel@nongnu.org; Fri, 28 Jun 2019 15:45:33 -0400 Received: from mail-qt1-x842.google.com ([2607:f8b0:4864:20::842]:45857) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hgwoL-0000uB-7T for qemu-devel@nongnu.org; Fri, 28 Jun 2019 15:45:30 -0400 Received: by mail-qt1-x842.google.com with SMTP id j19so7638145qtr.12 for ; Fri, 28 Jun 2019 12:45:28 -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=3dRB10KTGUHWpNRks8/1E0ikbIsIwvHCZ00Qw4pSDZU=; b=GZZbvRGqduvOz3B9qUnr4TnV05HDz4oUZMXERzuYI+jMa0QsF+3rMdcwGUHw34NHXd lITomlurNAGYbloUnSdKrHusUO+Cg4BexV4Lbj/cYUhqZPLc8ENS9QinY0RVwlrNqHRq hLH+VjaLa8Zov6MgbP6gA9I3fGturZrDpkFLzgBwn1o7t0byCgdueS9KuL1pH7FFV7PP wzUFhID0KnPPgWehA0Mnsi5ICBtEshGqJ71k2MA06I4h7HZoevjqPU/7+4fGO/Lhx6Wi kieA+kYP2K4wl7xJkK34/V8TmxtVgNxWdOK4UaucVWVxoS0GWWAGLBR9vjpH4OfGdE61 4TYg== 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=3dRB10KTGUHWpNRks8/1E0ikbIsIwvHCZ00Qw4pSDZU=; b=r9LD6YCpwiEXYnVOQf6FBYm7vWTZfJ2YQJaPcQYpxZY9BUCH6iqx1iImo2wH1QBhPv 171VL2oaMIzsU/B/CWT0D5AImyHoLYEIGl0yz7S8X7t1hgh/rnAvnWOkRuz0vQMm+Q70 0+ZpFhtr85fsuWPFojO94T6IngOfKSW7HXv4qNrIEJ6H0Hj8wcRzcN55B40lnozxd0bf qwoEUvVuYWbvylnqEo4uhO/xgvBxUFoEg1WcBZWFxVxF8jDgWcAPFbOk61ownNj6Y8Zb 7NubmFduPauHsG3D6x6z+2n8uREgxoWF9dRqKgYmzsd9Q3W3QKiYwbBKzNUwjDCXs8jB lD0g== X-Gm-Message-State: APjAAAWdrQPLGF0lV3btersjCXRKUmwuF3WSMoGDZws6Y+qLF09sKguO poW+7X7U7Po865A9Xmql/EdazU3C X-Google-Smtp-Source: APXvYqwQ+hvlU5il0QFnGfKApgU/hDkHqjUSCX1vzQvPS4L8x3YU65SOQJLOsP/td+9LPaUr/xYp/Q== X-Received: by 2002:ac8:2dcf:: with SMTP id q15mr9785228qta.170.1561751127617; Fri, 28 Jun 2019 12:45:27 -0700 (PDT) Received: from rekt.ibmuc.com ([2804:431:c7c6:927e:501b:7135:21ca:8a87]) by smtp.gmail.com with ESMTPSA id b69sm1602288qkg.105.2019.06.28.12.45.26 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Fri, 28 Jun 2019 12:45:27 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Date: Fri, 28 Jun 2019 16:45:10 -0300 Message-Id: <20190628194512.21311-3-danielhb413@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190628194512.21311-1-danielhb413@gmail.com> References: <20190628194512.21311-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 v4 2/4] block.c: adding bdrv_delete_file X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, jsnow@redhat.com, Daniel Henrique Barboza , berrange@redhat.com, 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 6e2b0f528d..11675cfcee 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 d287eaa9a6..5747f2a060 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -371,6 +371,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;