From nobody Wed Nov 12 02:02:24 2025 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=1567458185; cv=none; d=zoho.com; s=zohoarc; b=gz+9GoO6mfcaMFfa/2sMyfcUnXD2bhcIYMOP92gw4p0d0XH5WolAyMr5HejihvRX6PLFuDxjlUDOThkob7po7qfKubc/VhcWHenFTr4a70lQ6EjG2TnMA2Oy02FlDJO1VrcqZAcCmLeL1kwfYz6ilLK4kRIVMdPqyf8D70IlJDE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1567458185; 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=RkpF/3bkRRxXIQKIG0bVJK8VOHWsiINFvPG77fhS7YE=; b=O9oOAS4GmwQKiziisRvJpXjs8jQbUGIcR1/QL6itQhW8+khxUgx8kN14mDTwvkRdfShnpyfpLmi+GoKEyAPgQn/p3ajlhGg5C7LEgzhWKSjLsu0mwCllIeon/xEM47E7tMIx0e/SXiApq6V+RZo5ZnZzbPIvwv7Uf8hVgU6FBcg= 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 1567458185620778.7807698295786; Mon, 2 Sep 2019 14:03:05 -0700 (PDT) Received: from localhost ([::1]:39992 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4tTX-0000Kk-CG for importer@patchew.org; Mon, 02 Sep 2019 17:02:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33419) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4tPe-0005r3-EG for qemu-devel@nongnu.org; Mon, 02 Sep 2019 16:58:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i4tPc-0004KB-6U for qemu-devel@nongnu.org; Mon, 02 Sep 2019 16:58:58 -0400 Received: from mail-qk1-x742.google.com ([2607:f8b0:4864:20::742]:35789) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i4tPc-0004J7-1v for qemu-devel@nongnu.org; Mon, 02 Sep 2019 16:58:56 -0400 Received: by mail-qk1-x742.google.com with SMTP id d26so6037372qkk.2 for ; Mon, 02 Sep 2019 13:58:56 -0700 (PDT) Received: from rekt.ibmuc.com ([2804:431:c7c6:9589:1351:c7eb:87b:c9d5]) by smtp.gmail.com with ESMTPSA id w80sm4604038qka.62.2019.09.02.13.58.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Sep 2019 13:58:55 -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=RkpF/3bkRRxXIQKIG0bVJK8VOHWsiINFvPG77fhS7YE=; b=JQ2CAku9rwLhcVOoSOuGKFgND/LqavPa0Rb4px+UhJHaYPfsWNmaCyLQye03zJOVSm o8Er1lOpzGtGaM1QrQvtyrkuEY6yVSpyB5XE633FQtSHNnKsdb/PvMQ4N1anA448wTxA nstkAjbun0cmPhXjCbwJ3mJnx71Lz3R2j9NAdwiz3Y3YWTHQqI1/iA3QMFoDVVXlnbxV y/itJ+elcMODhjqZMDaqKJQVuAcSF4b5pTgMExa1OBNkodArURVNiGx8mLSpIuBouPYs +EkVFvuYdfL9kCX59sKGJOuRR/p48pfipwyOIMuKrKXywYPGD+6qtbPs0EkltbApw8ZE q7nQ== 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=RkpF/3bkRRxXIQKIG0bVJK8VOHWsiINFvPG77fhS7YE=; b=UBZBjBTW23MgihZSAxSS1PzcCWReAxQ2Ed/AJ1LMpRVltSoc1W40DxDQucCP34eSDi GIIG857T2TNbRdYPX3hmBtlDko+V8tOeSioS50caYVpuHDOMRNbMyLtMtWQL1IWfgx6w pCYSX4Jbv5ANx06Ra4H01ghAfUpwuAmmjhuNhcDY0SB7i8TCepNWiIAetpojiinI4aAu pskJ67aWhihFn7TRibAHeFcHNFKAA/Cv6XWWjmnlfGsVzXWRhADrjoTcLlnPUCok9GdN fwMxIgHtpzO1+ofW9FR4HFvlGXlcQErmNqx0pVyl/jcvuQxXVOhKW9nnoxSseReewqbD 2xFA== X-Gm-Message-State: APjAAAW5pBZB04s7EhVT5az2PYydDnQj/N/b78i4AxOGcyzGlof7R8oN ZnvijNKTWsPCzeekHGpARqDNlD97 X-Google-Smtp-Source: APXvYqzBfD+7w24+bOMM/U4CBluY8YG9UuKj3XU9hlRW37Sxn7dnI79zQSz9QU8x+XuLwotWLCBCsw== X-Received: by 2002:ae9:e648:: with SMTP id x8mr30511276qkl.247.1567457935488; Mon, 02 Sep 2019 13:58:55 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Date: Mon, 2 Sep 2019 17:58:40 -0300 Message-Id: <20190902205842.1884-3-danielhb413@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190902205842.1884-1-danielhb413@gmail.com> References: <20190902205842.1884-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::742 Subject: [Qemu-devel] [PATCH v6 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, =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Daniel Henrique Barboza , jsnow@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 | 78 +++++++++++++++++++++++++++++++++++++++++++ include/block/block.h | 1 + 2 files changed, 79 insertions(+) diff --git a/block.c b/block.c index 874a29a983..75212d873a 100644 --- a/block.c +++ b/block.c @@ -548,6 +548,84 @@ int bdrv_create_file(const char *filename, QemuOpts *o= pts, Error **errp) return ret; } =20 +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 =3D NULL; + DeleteCo *dco =3D opaque; + + assert(dco->bs); + + dco->ret =3D 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 =3D bdrv_find_protocol(filename, true, NULL); + BlockDriverState *bs =3D bdrv_open(filename, NULL, NULL, + BDRV_O_RDWR | BDRV_O_PROTOCOL, + NULL); + DeleteCo dco =3D { + .drv =3D drv, + .bs =3D bs, + .ret =3D NOT_DONE, + .err =3D NULL, + }; + Coroutine *co; + int ret; + + if (!drv) { + error_setg(errp, "File '%s' has unknown format", filename); + ret =3D -ENOMEDIUM; + 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 (!bs) { + error_setg(errp, "Could not open image '%s' for erasing", + filename); + ret =3D -1; + goto out; + } + + if (qemu_in_coroutine()) { + /* Fast-path if already in coroutine context */ + bdrv_delete_co_entry(&dco); + } else { + co =3D qemu_coroutine_create(bdrv_delete_co_entry, &dco); + qemu_coroutine_enter(co); + while (dco.ret =3D=3D NOT_DONE) { + aio_poll(qemu_get_aio_context(), true); + } + } + + ret =3D 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. diff --git a/include/block/block.h b/include/block/block.h index 124ad40809..dbe737202b 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -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 *b= ase); +int bdrv_delete_file(const char *filename, Error **errp); =20 =20 typedef struct BdrvCheckResult { --=20 2.21.0