From nobody Tue Feb 10 20:49:51 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1646087542796613.0119883446529; Mon, 28 Feb 2022 14:32:22 -0800 (PST) Received: from localhost ([::1]:36444 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nOoYz-0006sH-HD for importer@patchew.org; Mon, 28 Feb 2022 17:32:17 -0500 Received: from eggs.gnu.org ([209.51.188.92]:48068) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nOoT7-0004Km-PB for qemu-devel@nongnu.org; Mon, 28 Feb 2022 17:26:14 -0500 Received: from [2001:41c9:1:41f::167] (port=51182 helo=mail.default.ilande.bv.iomart.io) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nOoT5-0003RW-TI for qemu-devel@nongnu.org; Mon, 28 Feb 2022 17:26:13 -0500 Received: from [2a00:23c4:8ba0:ca00:d4eb:dbd5:5a41:aefe] (helo=kentang.home) by mail.default.ilande.bv.iomart.io with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1nOoST-0004GN-7V; Mon, 28 Feb 2022 22:25:33 +0000 From: Mark Cave-Ayland To: laurent@vivier.eu, pbonzini@redhat.com, fam@euphon.net, qemu-devel@nongnu.org Date: Mon, 28 Feb 2022 22:25:27 +0000 Message-Id: <20220228222527.8234-11-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220228222527.8234-1-mark.cave-ayland@ilande.co.uk> References: <20220228222527.8234-1-mark.cave-ayland@ilande.co.uk> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-SA-Exim-Connect-IP: 2a00:23c4:8ba0:ca00:d4eb:dbd5:5a41:aefe X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk Subject: [PATCH 10/10] esp: recreate ESPState current_req after migration 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.bv.iomart.io) X-Host-Lookup-Failed: Reverse DNS lookup failed for 2001:41c9:1:41f::167 (failed) 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.bv.iomart.io X-Spam_score_int: -10 X-Spam_score: -1.1 X-Spam_bar: - X-Spam_report: (-1.1 / 5.0 requ) BAYES_00=-1.9, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 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" X-ZM-MESSAGEID: 1646087543902100001 Content-Type: text/plain; charset="utf-8" Since PDMA reads/writes are driven by the guest, it is possible that migrat= ion can occur whilst a SCSIRequest is still active. Fortunately active SCSIRequ= ests are already included in the migration stream and restarted post migration b= ut this still leaves the reference in ESPState uninitialised. Implement the SCSIBusInfo .load_request callback to obtain a reference to t= he currently active SCSIRequest and use it to recreate ESPState current_req after migration. Suggested-by: Paolo Bonzini Signed-off-by: Mark Cave-Ayland --- hw/scsi/esp.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c index 7998dcfb97..b232af4224 100644 --- a/hw/scsi/esp.c +++ b/hw/scsi/esp.c @@ -1342,6 +1342,15 @@ static uint64_t sysbus_esp_pdma_read(void *opaque, h= waddr addr, return val; } =20 +static void *esp_load_request(QEMUFile *f, SCSIRequest *req) +{ + ESPState *s =3D container_of(req->bus, ESPState, bus); + + scsi_req_ref(req); + s->current_req =3D req; + return s; +} + static const MemoryRegionOps sysbus_esp_pdma_ops =3D { .read =3D sysbus_esp_pdma_read, .write =3D sysbus_esp_pdma_write, @@ -1357,6 +1366,7 @@ static const struct SCSIBusInfo esp_scsi_info =3D { .max_target =3D ESP_MAX_DEVS, .max_lun =3D 7, =20 + .load_request =3D esp_load_request, .transfer_data =3D esp_transfer_data, .complete =3D esp_command_complete, .cancel =3D esp_request_cancelled --=20 2.20.1