From nobody Sun Oct 5 19:25:48 2025 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=1613161754; cv=none; d=zohomail.com; s=zohoarc; b=nGsAatoEhiOhfdBe/Oo+2C+DAMktic9uvF6P81ETELitvZHPVwki9uq3y3CW0vBuKtWA8vIvayN2Z6EQeHT7JL2msW/pj/oyLRxHJLBiSOsNb1GriCBLk74cbRgz1LIFUmnV4gsiJ0ommp8id/Gc4GRzQWNyeu5XgTzjYb65scQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1613161754; 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=uDMWf/HvEi/wk1Ifayydj4NfnlHyn1DPR3IotdzmBek=; b=iuGIqNN1VjheU9S1bD/zy+c9X1rrgAbYSZbGfp2F8SyQ0t+NPBMRAu6CFVE12rzHLU1xIlrWBBmw8Vq52BsA5Rf2cNKkaSEWZptzYkV0rKwMhp37CcliPzWhzUwZQNfR6bm4os/AgPeCISDsCz/JyIf/udk2N/avS0Lrl+Z/4pc= 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 1613161754328437.07461539866597; Fri, 12 Feb 2021 12:29:14 -0800 (PST) Received: from localhost ([::1]:48698 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lAf3u-0002rH-6C for importer@patchew.org; Fri, 12 Feb 2021 15:29:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58184) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lAero-0004Jx-1B for qemu-devel@nongnu.org; Fri, 12 Feb 2021 15:16:40 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:53036) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lAerj-0003su-A0 for qemu-devel@nongnu.org; Fri, 12 Feb 2021 15:16:39 -0500 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-43-bZKiwFUAMh6M1vqdDEGzSw-1; Fri, 12 Feb 2021 15:16:31 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B141C801977; Fri, 12 Feb 2021 20:16:30 +0000 (UTC) Received: from blue.redhat.com (ovpn-114-150.phx2.redhat.com [10.3.114.150]) by smtp.corp.redhat.com (Postfix) with ESMTP id 448F66E528; Fri, 12 Feb 2021 20:16:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1613160994; 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=uDMWf/HvEi/wk1Ifayydj4NfnlHyn1DPR3IotdzmBek=; b=M1wgAHIPTRDtniOzvHPpC+Pq5jzmFz8oHLfvgjrZBBw4vTUylmil7UmgoLLs2VjmvHNbK2 l7E9uPp2sDeaK0K3JvVy4q6FJEK+PbznScbBOUVpEGoRtmjLC8QF3kdUXKS8k9sB4q63/H YAgPEGcDhktcqUha+ypC/1qt4v5cgyQ= X-MC-Unique: bZKiwFUAMh6M1vqdDEGzSw-1 From: Eric Blake To: qemu-devel@nongnu.org Subject: [PULL 07/14] block/raw-format: implement .bdrv_cancel_in_flight handler Date: Fri, 12 Feb 2021 14:16:12 -0600 Message-Id: <20210212201619.1388255-8-eblake@redhat.com> In-Reply-To: <20210212201619.1388255-1-eblake@redhat.com> References: <20210212201619.1388255-1-eblake@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=eblake@redhat.com 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=216.205.24.124; envelope-from=eblake@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -33 X-Spam_score: -3.4 X-Spam_bar: --- X-Spam_report: (-3.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.569, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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 , Vladimir Sementsov-Ogievskiy , "open list:raw" , 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" From: Vladimir Sementsov-Ogievskiy We are going to cancel in-flight requests on mirror nbd target on job cancel. Still nbd is often used not directly but as raw-format child. So, add pass-through handler here. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Eric Blake Message-Id: <20210205163720.887197-4-vsementsov@virtuozzo.com> Signed-off-by: Eric Blake --- block/raw-format.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/block/raw-format.c b/block/raw-format.c index 42ec50802bcd..7717578ed6ab 100644 --- a/block/raw-format.c +++ b/block/raw-format.c @@ -575,6 +575,11 @@ static const char *const raw_strong_runtime_opts[] =3D= { NULL }; +static void raw_cancel_in_flight(BlockDriverState *bs) +{ + bdrv_cancel_in_flight(bs->file->bs); +} + BlockDriver bdrv_raw =3D { .format_name =3D "raw", .instance_size =3D sizeof(BDRVRawState), @@ -608,6 +613,7 @@ BlockDriver bdrv_raw =3D { .bdrv_has_zero_init =3D &raw_has_zero_init, .strong_runtime_opts =3D raw_strong_runtime_opts, .mutable_opts =3D mutable_opts, + .bdrv_cancel_in_flight =3D raw_cancel_in_flight, }; static void bdrv_raw_init(void) --=20 2.30.1