From nobody Thu May 16 02:59:03 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.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=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1588169595; cv=none; d=zohomail.com; s=zohoarc; b=X2XZSeReZogXQ16cf6krOT1lwtDzmVKGBaXPkkSx9rai4MyHXfDs8L/2VsoPVanFSOi6+T8GPe13YbGTlnli+nW1nV62mSvSkbV1xsYeUKBD7F9k5LcRWoAyeZ50+K4J4+wS7z1b2R2ZvPimYxzkPVCjpxl8aYvl3HQlVpsi1IE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588169595; 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; bh=FQKFlGPfdHV/T7NfahVMwoaWj+cSCQ1SVe+ijrXL3rg=; b=SkvIoIOHwtR/chSvCnj0OYTCAnVJHRNyY6v/go5nn+T1D+a/yMSsxc8d3FRnMcxF4iavVS/uyy4yEWHxNteEYaSJ1r77IQK2jBYiBXsX1aAepSdaOoxXIJp4xNDit7t0Cuw9D7dAo5jgmuVUXes85tHrLgN8DorITdbpAFoB1H0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.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 (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1588169595485530.940961629643; Wed, 29 Apr 2020 07:13:15 -0700 (PDT) Received: from localhost ([::1]:45386 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTnSb-00069x-Ps for importer@patchew.org; Wed, 29 Apr 2020 10:13:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44560) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTnR9-0004EV-HH for qemu-devel@nongnu.org; Wed, 29 Apr 2020 10:11:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jTnR7-0003oX-Rn for qemu-devel@nongnu.org; Wed, 29 Apr 2020 10:11:43 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:47129 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jTnR7-0003nk-C7 for qemu-devel@nongnu.org; Wed, 29 Apr 2020 10:11:41 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-96-rRQztMSCNl-09LJIAtdX2g-1; Wed, 29 Apr 2020 10:11:38 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5AAF918FE894; Wed, 29 Apr 2020 14:11:30 +0000 (UTC) Received: from localhost (ovpn-113-19.ams2.redhat.com [10.36.113.19]) by smtp.corp.redhat.com (Postfix) with ESMTPS id EC60A1E4; Wed, 29 Apr 2020 14:11:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1588169500; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=FQKFlGPfdHV/T7NfahVMwoaWj+cSCQ1SVe+ijrXL3rg=; b=XVPEc3nikVDduR09PvJntAbYq75FwyZaUwSxPWlH1XzDLr9rOl54+hEOsJF6UDwMIpTtzd MT9E4XaoRTuXoc78WL4sGz0sO1A7UuV17G2fJ7HZWTDIVt6o5aaZoIuebxV1wdJoWKY7cS rA7z7lNxMjP0fIyd3U6V7XjhIX2Aptc= X-MC-Unique: rRQztMSCNl-09LJIAtdX2g-1 From: Max Reitz To: qemu-block@nongnu.org Subject: [PATCH v2 1/4] block: Add bdrv_make_empty() Date: Wed, 29 Apr 2020 16:11:23 +0200 Message-Id: <20200429141126.85159-2-mreitz@redhat.com> In-Reply-To: <20200429141126.85159-1-mreitz@redhat.com> References: <20200429141126.85159-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=205.139.110.120; envelope-from=mreitz@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/04/29 01:42:37 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.120 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: Kevin Wolf , qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Right now, all users of bdrv_make_empty() call the BlockDriver method directly. That is not only bad style, it is also wrong, unless the caller has a BdrvChild with a WRITE or WRITE_UNCHANGED permission. (WRITE_UNCHANGED suffices, because callers generally use this function to clear a node with a backing file after a commit operation.) Introduce bdrv_make_empty() that verifies that it does. Signed-off-by: Max Reitz Reviewed-by: Eric Blake --- include/block/block.h | 1 + block.c | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/include/block/block.h b/include/block/block.h index 8b62429aa4..1dee50419c 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -352,6 +352,7 @@ BlockMeasureInfo *bdrv_measure(BlockDriver *drv, QemuOp= ts *opts, void bdrv_get_geometry(BlockDriverState *bs, uint64_t *nb_sectors_ptr); void bdrv_refresh_limits(BlockDriverState *bs, Error **errp); int bdrv_commit(BlockDriverState *bs); +int bdrv_make_empty(BdrvChild *c, Error **errp); int bdrv_change_backing_file(BlockDriverState *bs, const char *backing_file, const char *backing_fmt); void bdrv_register(BlockDriver *bdrv); diff --git a/block.c b/block.c index 03cc5813a2..d6580db0e2 100644 --- a/block.c +++ b/block.c @@ -6792,3 +6792,26 @@ void bdrv_del_child(BlockDriverState *parent_bs, Bdr= vChild *child, Error **errp) =20 parent_bs->drv->bdrv_del_child(parent_bs, child, errp); } + +int bdrv_make_empty(BdrvChild *c, Error **errp) +{ + BlockDriver *drv =3D c->bs->drv; + int ret; + + assert(c->perm & (BLK_PERM_WRITE | BLK_PERM_WRITE_UNCHANGED)); + + if (!drv->bdrv_make_empty) { + error_setg(errp, "%s does not support emptying nodes", + drv->format_name); + return -ENOTSUP; + } + + ret =3D drv->bdrv_make_empty(c->bs); + if (ret < 0) { + error_setg_errno(errp, -ret, "Failed to empty %s", + c->bs->filename); + return ret; + } + + return 0; +} --=20 2.25.4 From nobody Thu May 16 02:59:03 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.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=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1588169594; cv=none; d=zohomail.com; s=zohoarc; b=Rak83AewUEzBTMIfFuqhOMFSxJUhbSdELM9816onxYUnB1UeMVzdrf6QyfeVWyWKFFP7WV9++IRqIvn212C3gpnbZcowjiMHiMe2NK4KJ/w5Iz+NUuQRd+qYN4XowHVDM7xFHunm2mdRrR0tQhUsAQM0/9PC0xa/pff68493UAQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588169594; 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; bh=apBcOFWD2uRliMp77K+UWvEH/xort9oA7Zb3Jz6Hh8g=; b=Qpn47zqNoeLlJwnjMr+5jfp68Y2EX5A6b+qdATQKSscHIrrB9203XYsYdVn08eRasMQ8EKj5aIABTqrAIwMd1lXnnjZJMPvZQK5ey2vmcPYYB40ZKtkWQlefOpR7EIq2ES+SFCU4+4tfRdm9nvHwECO1ivp3yGv3yU9d/bUFyJk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.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 (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1588169594327303.02011459479047; Wed, 29 Apr 2020 07:13:14 -0700 (PDT) Received: from localhost ([::1]:45288 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTnSa-00066b-GQ for importer@patchew.org; Wed, 29 Apr 2020 10:13:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44544) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTnR8-0004CW-A9 for qemu-devel@nongnu.org; Wed, 29 Apr 2020 10:11:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jTnR7-0003oS-R7 for qemu-devel@nongnu.org; Wed, 29 Apr 2020 10:11:42 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:53543 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jTnR7-0003nH-Bd for qemu-devel@nongnu.org; Wed, 29 Apr 2020 10:11:41 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-481-IU7izZ1TOSiMMQNEubjOVA-1; Wed, 29 Apr 2020 10:11:38 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 65B03106B784; Wed, 29 Apr 2020 14:11:32 +0000 (UTC) Received: from localhost (ovpn-113-19.ams2.redhat.com [10.36.113.19]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0ACDE5D9C9; Wed, 29 Apr 2020 14:11:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1588169499; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=apBcOFWD2uRliMp77K+UWvEH/xort9oA7Zb3Jz6Hh8g=; b=NVnME+zwtEpk8MB8NGR5aZGCpjmtys092U8TY8yE+us6naQqlggz66qoKna3rBaJT2RhAe Ipcgm/R3FyQkUdlIEgAoN8JmqMDOoeBR1kPAT/roV9F66dCyjta+y90keZdXo7ZZeZi9v9 oeEgPOOOzoSDx8IAYvVU3mCaK9v81AQ= X-MC-Unique: IU7izZ1TOSiMMQNEubjOVA-1 From: Max Reitz To: qemu-block@nongnu.org Subject: [PATCH v2 2/4] block: Use bdrv_make_empty() where possible Date: Wed, 29 Apr 2020 16:11:24 +0200 Message-Id: <20200429141126.85159-3-mreitz@redhat.com> In-Reply-To: <20200429141126.85159-1-mreitz@redhat.com> References: <20200429141126.85159-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=207.211.31.120; envelope-from=mreitz@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/04/29 01:18:10 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.120 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: Kevin Wolf , qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Signed-off-by: Max Reitz Reviewed-by: Eric Blake Reviewed-by: Kevin Wolf --- block/replication.c | 6 ++---- block/vvfat.c | 4 +--- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/block/replication.c b/block/replication.c index da013c2041..cc6a40d577 100644 --- a/block/replication.c +++ b/block/replication.c @@ -331,9 +331,8 @@ static void secondary_do_checkpoint(BDRVReplicationStat= e *s, Error **errp) return; } =20 - ret =3D s->active_disk->bs->drv->bdrv_make_empty(s->active_disk->bs); + ret =3D bdrv_make_empty(s->active_disk, errp); if (ret < 0) { - error_setg(errp, "Cannot make active disk empty"); return; } =20 @@ -343,9 +342,8 @@ static void secondary_do_checkpoint(BDRVReplicationStat= e *s, Error **errp) return; } =20 - ret =3D s->hidden_disk->bs->drv->bdrv_make_empty(s->hidden_disk->bs); + ret =3D bdrv_make_empty(s->hidden_disk, errp); if (ret < 0) { - error_setg(errp, "Cannot make hidden disk empty"); return; } } diff --git a/block/vvfat.c b/block/vvfat.c index 6d5c090dec..34c121c07a 100644 --- a/block/vvfat.c +++ b/block/vvfat.c @@ -2960,9 +2960,7 @@ static int do_commit(BDRVVVFATState* s) return ret; } =20 - if (s->qcow->bs->drv && s->qcow->bs->drv->bdrv_make_empty) { - s->qcow->bs->drv->bdrv_make_empty(s->qcow->bs); - } + bdrv_make_empty(s->qcow, NULL); =20 memset(s->used_clusters, 0, sector2cluster(s, s->sector_count)); =20 --=20 2.25.4 From nobody Thu May 16 02:59:03 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.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=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1588169715; cv=none; d=zohomail.com; s=zohoarc; b=dG5biHPonzlg4zcSzpYfVaom1O4UacQTAAzfBTvi3Kf9a2QE3Ev/ZRkZWKP96peA21k7MS/FNItzEjqYMDn2MayZQZ2NX87Pi9oID9QESLEql9VuiNmeTblnouWgrkUJF+mPueJaaukHt85TnQ/SdeZO5utfTR+RnUGYicDXV6Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588169715; 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; bh=+JfwS4rDpAdfjq6rnTazzWwBEOj7DlcLQ3maGcEHnmo=; b=ZpHW8dSq1+EkvRqNCvsne2TnuJQYbqfgQiqRTyoOnUvvtF5ExZgoIOP3BQjNzXz1dB6e4bk5GrLN+yY9vQEzNgkKFQJyn2Du4s7FIG0bqvlXhHbhyA5hIegCIsUCgo8r4lh7u7O9jJ67n5hBoShK1vgcVw+nltM8WwXsPtYe3UM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.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 (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1588169715463956.6061706714172; Wed, 29 Apr 2020 07:15:15 -0700 (PDT) Received: from localhost ([::1]:54590 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTnUX-0002Dp-Pn for importer@patchew.org; Wed, 29 Apr 2020 10:15:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44612) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTnRH-0004ZC-DO for qemu-devel@nongnu.org; Wed, 29 Apr 2020 10:11:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jTnRH-00045M-0S for qemu-devel@nongnu.org; Wed, 29 Apr 2020 10:11:51 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:57055 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jTnRG-00045E-IU for qemu-devel@nongnu.org; Wed, 29 Apr 2020 10:11:50 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-328-oxTgmQrXOtKL2VwXh0QJ2g-1; Wed, 29 Apr 2020 10:11:35 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7AACF100CCE4; Wed, 29 Apr 2020 14:11:34 +0000 (UTC) Received: from localhost (ovpn-113-19.ams2.redhat.com [10.36.113.19]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1DA7B1001281; Wed, 29 Apr 2020 14:11:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1588169509; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+JfwS4rDpAdfjq6rnTazzWwBEOj7DlcLQ3maGcEHnmo=; b=Lg5MZ530CuQtTmIk0j0jvxFW7lOzUHW7VlDwW/zoK8S+NYVzAcHZtPGYLOHQ9R/dqtaAb5 fFAM/B7La2q37Yrba4r3EI809/kwzYfC8t3nz6xVqefrT66+Yv/i89N6qp3FXJTXDlhmeL NBmAHR/CK7PPen28th4DkjBVg+AQ7+o= X-MC-Unique: oxTgmQrXOtKL2VwXh0QJ2g-1 From: Max Reitz To: qemu-block@nongnu.org Subject: [PATCH v2 3/4] block: Add blk_make_empty() Date: Wed, 29 Apr 2020 16:11:25 +0200 Message-Id: <20200429141126.85159-4-mreitz@redhat.com> In-Reply-To: <20200429141126.85159-1-mreitz@redhat.com> References: <20200429141126.85159-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=205.139.110.120; envelope-from=mreitz@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/04/29 01:42:37 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.120 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: Kevin Wolf , qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Two callers of BlockDriver.bdrv_make_empty() remain that should not call this method directly. Both do not have access to a BdrvChild, but they can use a BlockBackend, so we add this function that lets them use it. Signed-off-by: Max Reitz Reviewed-by: Eric Blake --- include/sysemu/block-backend.h | 2 ++ block/block-backend.c | 10 ++++++++++ 2 files changed, 12 insertions(+) diff --git a/include/sysemu/block-backend.h b/include/sysemu/block-backend.h index 0917663d89..8203d7f6f9 100644 --- a/include/sysemu/block-backend.h +++ b/include/sysemu/block-backend.h @@ -266,4 +266,6 @@ int coroutine_fn blk_co_copy_range(BlockBackend *blk_in= , int64_t off_in, =20 const BdrvChild *blk_root(BlockBackend *blk); =20 +int blk_make_empty(BlockBackend *blk, Error **errp); + #endif diff --git a/block/block-backend.c b/block/block-backend.c index f4944861fa..47bd56244d 100644 --- a/block/block-backend.c +++ b/block/block-backend.c @@ -2402,3 +2402,13 @@ const BdrvChild *blk_root(BlockBackend *blk) { return blk->root; } + +int blk_make_empty(BlockBackend *blk, Error **errp) +{ + if (!blk_is_available(blk)) { + error_setg(errp, "No medium inserted"); + return -ENOMEDIUM; + } + + return bdrv_make_empty(blk->root, errp); +} --=20 2.25.4 From nobody Thu May 16 02:59:03 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.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=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1588169934; cv=none; d=zohomail.com; s=zohoarc; b=XvTLPsPzVsmvwxINoTSw8aUhNWSj5HIqepnnIl1yJvuDnqJWGIatOCApMJ0fTLTlV/k/nyXvkSGDY7AsQryLClFZjdbNenrVYXhyFg5VL1NIdwlRbsOI4X1BtfV6VGOgEFoxur81lxC/7vuMXjXP1lFz3bjXETdHsfliIu2t05c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588169934; 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; bh=3iFJA1sE2IUTsGX+c99KkPhxahWSl8oT3iPtXyqjU3E=; b=Wo9EaKOBghXH5q9pa9HvdVv8toAVnT2NOLCcz7fxndgbJDptZYg1fxYGMufO3PqFxBRpIiSE5UJ4upRUPCqN1Bapgw0GQ0n5Q/HnpX520VKkfKUQazxJQxXS65yckKCYxX1gEBnmqYyVA+G+DQkF3mDqLDWvXrpbQ4ycEIfJfyk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.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 (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1588169934082195.0823199235673; Wed, 29 Apr 2020 07:18:54 -0700 (PDT) Received: from localhost ([::1]:38150 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTnY4-0007KZ-Aq for importer@patchew.org; Wed, 29 Apr 2020 10:18:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44600) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTnRF-0004SY-9y for qemu-devel@nongnu.org; Wed, 29 Apr 2020 10:11:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jTnRE-0003zx-M5 for qemu-devel@nongnu.org; Wed, 29 Apr 2020 10:11:49 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:59465 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jTnRE-0003vH-5Z for qemu-devel@nongnu.org; Wed, 29 Apr 2020 10:11:48 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-485-3iY82_NmPWiulTm8jaQQxg-1; Wed, 29 Apr 2020 10:11:45 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 97182100A8D1; Wed, 29 Apr 2020 14:11:36 +0000 (UTC) Received: from localhost (ovpn-113-19.ams2.redhat.com [10.36.113.19]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 347411002388; Wed, 29 Apr 2020 14:11:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1588169507; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3iFJA1sE2IUTsGX+c99KkPhxahWSl8oT3iPtXyqjU3E=; b=MdNzf1OFTziZSjDvNIJP+vHrWT64dZfhmLm5FSBUDYmvnM7B+Rbr9mGicKLvAGQnBPnpgP Ae6x3nLS2qD0o3Wd2AOIpy8x2EUIr3HMMfol3tYln1Oes2rCawAh0W12SWeZwirrwGqqtk qamfT7NxuXavzZQdjB7wyH+z2cdZTYY= X-MC-Unique: 3iY82_NmPWiulTm8jaQQxg-1 From: Max Reitz To: qemu-block@nongnu.org Subject: [PATCH v2 4/4] block: Use blk_make_empty() after commits Date: Wed, 29 Apr 2020 16:11:26 +0200 Message-Id: <20200429141126.85159-5-mreitz@redhat.com> In-Reply-To: <20200429141126.85159-1-mreitz@redhat.com> References: <20200429141126.85159-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=207.211.31.120; envelope-from=mreitz@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/04/29 01:18:10 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.120 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: Kevin Wolf , qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" bdrv_commit() already has a BlockBackend pointing to the BDS that we want to empty, it just has the wrong permissions. qemu-img commit has no BlockBackend pointing to the old backing file yet, but introducing one is simple. After this commit, bdrv_make_empty() is the only remaining caller of BlockDriver.bdrv_make_empty(). Signed-off-by: Max Reitz Reviewed-by: Eric Blake --- block/commit.c | 16 +++++++++------- qemu-img.c | 19 ++++++++++++++----- 2 files changed, 23 insertions(+), 12 deletions(-) diff --git a/block/commit.c b/block/commit.c index 87f6096d90..ba60fb7955 100644 --- a/block/commit.c +++ b/block/commit.c @@ -414,7 +414,9 @@ int bdrv_commit(BlockDriverState *bs) } =20 ctx =3D bdrv_get_aio_context(bs); - src =3D blk_new(ctx, BLK_PERM_CONSISTENT_READ, BLK_PERM_ALL); + /* WRITE_UNCHANGED is required for bdrv_make_empty() */ + src =3D blk_new(ctx, BLK_PERM_CONSISTENT_READ | BLK_PERM_WRITE_UNCHANG= ED, + BLK_PERM_ALL); backing =3D blk_new(ctx, BLK_PERM_WRITE | BLK_PERM_RESIZE, BLK_PERM_AL= L); =20 ret =3D blk_insert_bs(src, bs, &local_err); @@ -492,14 +494,14 @@ int bdrv_commit(BlockDriverState *bs) } } =20 - if (drv->bdrv_make_empty) { - ret =3D drv->bdrv_make_empty(bs); - if (ret < 0) { - goto ro_cleanup; - } - blk_flush(src); + ret =3D blk_make_empty(src, NULL); + /* Ignore -ENOTSUP */ + if (ret < 0 && ret !=3D -ENOTSUP) { + goto ro_cleanup; } =20 + blk_flush(src); + /* * Make sure all data we wrote to the backing device is actually * stable on disk. diff --git a/qemu-img.c b/qemu-img.c index 7f52742ef2..77f3575538 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -1065,11 +1065,20 @@ static int img_commit(int argc, char **argv) goto unref_backing; } =20 - if (!drop && bs->drv->bdrv_make_empty) { - ret =3D bs->drv->bdrv_make_empty(bs); - if (ret) { - error_setg_errno(&local_err, -ret, "Could not empty %s", - filename); + if (!drop) { + BlockBackend *old_backing_blk; + + old_backing_blk =3D blk_new_with_bs(bs, BLK_PERM_WRITE, BLK_PERM_A= LL, + &local_err); + if (!old_backing_blk) { + goto unref_backing; + } + ret =3D blk_make_empty(old_backing_blk, &local_err); + blk_unref(old_backing_blk); + if (ret =3D=3D -ENOTSUP) { + error_free(local_err); + local_err =3D NULL; + } else if (ret < 0) { goto unref_backing; } } --=20 2.25.4