From nobody Sun Feb 8 08:43:17 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1561751359; cv=none; d=zoho.com; s=zohoarc; b=LUIjMya0JnXmwwY1I79RTFQGZK6Rx9P+PIHUi/dt6wh3uveH8IFmh09XqBIlO5N517ntXbgN/qeIukgqn1EzX6MQFpY7yVE7v3DlQstsCUBgn2GJDn/hjKrypD/60hPJsFrwpK0zDjvRvn+wvZcMKApjRNFN426mE+PLKO2PhX8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1561751359; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=3dRB10KTGUHWpNRks8/1E0ikbIsIwvHCZ00Qw4pSDZU=; b=AKZZn5b5zSQFNEwQSBl7mZIIzpjqm3AANHHhZO7qsUr4jA8hu2An/0OxrOVRXJbioB1tBmITFPfU+q5qxgONnDrcPhe7Cb25UTO5369rKtWFMnSLyI6Y0kPCdjNdA3dpJ2osidmLyGh+m/mAXNpBdNLGyoXJcPRlREaPqvBJ3VY= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1561751359884252.58558955023113; Fri, 28 Jun 2019 12:49:19 -0700 (PDT) Received: from localhost ([::1]:35970 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hgwru-0002R9-Er for importer@patchew.org; Fri, 28 Jun 2019 15:49:10 -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) 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) 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) 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) 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=C3=A9 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 *o= pts, Error **errp) return ret; } =20 +static void coroutine_fn bdrv_delete_co_entry(void *opaque) +{ + Error *local_err =3D NULL; + int ret; + + CreateCo *cco =3D opaque; + assert(cco->drv); + + ret =3D cco->drv->bdrv_co_delete_file(cco->filename, &local_err); + error_propagate(&cco->err, local_err); + cco->ret =3D ret; +} + +int bdrv_delete_file(const char *filename, Error **errp) +{ + + BlockDriver *drv =3D bdrv_find_protocol(filename, true, errp); + CreateCo cco =3D { + .drv =3D drv, + .filename =3D g_strdup(filename), + .ret =3D NOT_DONE, + .err =3D NULL, + }; + Coroutine *co; + int ret; + + if (!drv) { + error_setg(errp, "File '%s' has unknown format", filename); + ret =3D -ENOENT; + goto out; + } + + if (!drv->bdrv_co_delete_file) { + error_setg(errp, "Driver '%s' does not support image delete", + drv->format_name); + ret =3D -ENOTSUP; + goto out; + } + + if (!drv->bdrv_co_delete_file) { + error_setg(errp, "Driver '%s' does not support image delete", + drv->format_name); + ret =3D -ENOTSUP; + goto out; + } + + if (qemu_in_coroutine()) { + /* Fast-path if already in coroutine context */ + bdrv_delete_co_entry(&cco); + } else { + co =3D qemu_coroutine_create(bdrv_delete_co_entry, &cco); + qemu_coroutine_enter(co); + while (cco.ret =3D=3D NOT_DONE) { + aio_poll(qemu_get_aio_context(), true); + } + } + + ret =3D 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, Blo= ckDriverState *base, void bdrv_unfreeze_backing_chain(BlockDriverState *bs, BlockDriverState *b= ase); =20 bool bdrv_path_is_regular_file(const char *path); +int bdrv_delete_file(const char *filename, Error **errp); + =20 typedef struct BdrvCheckResult { int corruptions; --=20 2.20.1