From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B8A22C83006 for ; Tue, 28 Apr 2020 13:29:18 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 86581206D6 for ; Tue, 28 Apr 2020 13:29:18 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="flW1/jty" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 86581206D6 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:57714 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTQIX-0008I3-Hw for qemu-devel@archiver.kernel.org; Tue, 28 Apr 2020 09:29:17 -0400 Received: from eggs.gnu.org ([209.51.188.92]:35180) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTQG2-0003BY-KA for qemu-devel@nongnu.org; Tue, 28 Apr 2020 09:26:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jTQG0-0001o1-W1 for qemu-devel@nongnu.org; Tue, 28 Apr 2020 09:26:42 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:39298 helo=us-smtp-delivery-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 1jTQG0-0001nc-Gj for qemu-devel@nongnu.org; Tue, 28 Apr 2020 09:26:40 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1588080399; 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=SsHLhS49WH24+Z/XU/jsCtHVgNxsldj+VAx19rqxs08=; b=flW1/jtyMtm4H1zdExx/w0/H9Hc/CZm6dzAwmrp5YRxQEk7J31qKEuRc8qluY+wNpizGPY j8WCpOdkgV1ifhl0WOiLZ1At5R/d26gfRtkUsS39QM9tefbKgqpwtbusxzISWalC+iIJ2b tsnh7HiL7d4G2nDMcsj2PSVhLuqJb+0= 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-92-IbfqFWYWPL2-TG5DHqLKog-1; Tue, 28 Apr 2020 09:26:38 -0400 X-MC-Unique: IbfqFWYWPL2-TG5DHqLKog-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 55DDD107ACF8; Tue, 28 Apr 2020 13:26:37 +0000 (UTC) Received: from localhost (ovpn-112-143.ams2.redhat.com [10.36.112.143]) by smtp.corp.redhat.com (Postfix) with ESMTPS id ECCDB60CD3; Tue, 28 Apr 2020 13:26:36 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Subject: [PATCH 3/4] block: Add blk_make_empty() Date: Tue, 28 Apr 2020 15:26:28 +0200 Message-Id: <20200428132629.796753-4-mreitz@redhat.com> In-Reply-To: <20200428132629.796753-1-mreitz@redhat.com> References: <20200428132629.796753-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Received-SPF: pass client-ip=205.139.110.61; envelope-from=mreitz@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/04/28 02:06:42 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.61 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" 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 --- include/sysemu/block-backend.h | 2 ++ block/block-backend.c | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/include/sysemu/block-backend.h b/include/sysemu/block-backend.= h index d37c1244dd..14338b76dc 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 3592066b42..5d36efd32f 100644 --- a/block/block-backend.c +++ b/block/block-backend.c @@ -2402,3 +2402,8 @@ const BdrvChild *blk_root(BlockBackend *blk) { return blk->root; } + +int blk_make_empty(BlockBackend *blk, Error **errp) +{ + return bdrv_make_empty(blk->root, errp); +} --=20 2.25.4