From nobody Tue Feb 10 14:44:01 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; 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 ARC-Seal: i=1; a=rsa-sha256; t=1617826339; cv=none; d=zohomail.com; s=zohoarc; b=iotuJVM7Nwvkq9IAQtmpcBTgjsdunGFwWUH+IOxYxtRXZXy+sThkTUyHXkkEncWg8iYQVzBr6KDztYNb35f94Z4NkvFdUzaqBjPbaWHmNU3QiqwFMFgpYu0CrO0oMHpfPy1LOIdR5NBcKxwb/Ce+PeVYIbPg3Aev3zMHHkfg608= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617826339; h=Content-Transfer-Encoding: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=fxFMrY6RqKMntR8b9zOH3VRlF2Nwql2gYPwyiLHLmsY=; b=JoWKGgT7jbgMBTw/kAgGqWqcAUsuzHm3h0KDHqCuVTvpLT0VT59Ear0nauj++so13wXRFRxK7jyMsqhLIHna51hEDLrZh8mrrvIbhREfi/cRjLH22UHAEqR2oERzQ8UbdXF4VJl+iOA7Lijp4p/mR7b4eZtiJqZxSIUQBOHmzVw= ARC-Authentication-Results: i=1; mx.zohomail.com; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1617826339151897.0740543498222; Wed, 7 Apr 2021 13:12:19 -0700 (PDT) Received: from localhost ([::1]:42922 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lUEXC-0002mF-1k for importer@patchew.org; Wed, 07 Apr 2021 16:12:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51746) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lUEKS-0007jk-Gs for qemu-devel@nongnu.org; Wed, 07 Apr 2021 15:59:08 -0400 Received: from mail.ilande.co.uk ([2001:41c9:1:41f::167]:37814 helo=mail.default.ilande.uk0.bigv.io) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lUEKQ-0007ZY-Dp for qemu-devel@nongnu.org; Wed, 07 Apr 2021 15:59:08 -0400 Received: from host86-148-103-9.range86-148.btcentralplus.com ([86.148.103.9] helo=kentang.home) by mail.default.ilande.uk0.bigv.io with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1lUEKZ-00073W-7S; Wed, 07 Apr 2021 20:59:19 +0100 From: Mark Cave-Ayland To: qemu-devel@nongnu.org, alxndr@bu.edu, laurent@vivier.eu, pbonzini@redhat.com Date: Wed, 7 Apr 2021 20:57:59 +0100 Message-Id: <20210407195801.685-11-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210407195801.685-1-mark.cave-ayland@ilande.co.uk> References: <20210407195801.685-1-mark.cave-ayland@ilande.co.uk> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-SA-Exim-Connect-IP: 86.148.103.9 X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk Subject: [PATCH v4 for-6.0 10/12] esp: don't reset async_len directly in esp_select() if cancelling request X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on mail.default.ilande.uk0.bigv.io) 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=2001:41c9:1:41f::167; envelope-from=mark.cave-ayland@ilande.co.uk; helo=mail.default.ilande.uk0.bigv.io X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Instead let the SCSI layer invoke the .cancel callback itself to cancel and reset the request state. Signed-off-by: Mark Cave-Ayland Tested-by: Alexander Bulekov Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/scsi/esp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c index 782c6ee357..3b9037e4f4 100644 --- a/hw/scsi/esp.c +++ b/hw/scsi/esp.c @@ -95,6 +95,7 @@ void esp_request_cancelled(SCSIRequest *req) scsi_req_unref(s->current_req); s->current_req =3D NULL; s->current_dev =3D NULL; + s->async_len =3D 0; } } =20 @@ -206,7 +207,6 @@ static int esp_select(ESPState *s) if (s->current_req) { /* Started a new command before the old one finished. Cancel it. = */ scsi_req_cancel(s->current_req); - s->async_len =3D 0; } =20 s->current_dev =3D scsi_device_find(&s->bus, 0, target, 0); --=20 2.20.1