From nobody Tue Feb 10 02:12:52 2026 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=ilande.co.uk Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1712240817662213.4708405990715; Thu, 4 Apr 2024 07:26:57 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rsO35-0004ce-9s; Thu, 04 Apr 2024 10:26:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rsO33-0004Wq-JU for qemu-devel@nongnu.org; Thu, 04 Apr 2024 10:26:37 -0400 Received: from mail.ilande.co.uk ([2001:41c9:1:41f::167]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rsO31-000689-BX for qemu-devel@nongnu.org; Thu, 04 Apr 2024 10:26:36 -0400 Received: from [2a02:8012:c93d:0:260e:bf57:a4e9:8142] (helo=cheesecake.fritz.box) by mail.ilande.co.uk with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1rsO24-000Bmt-Vc; Thu, 04 Apr 2024 15:25:38 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=ilande.co.uk; s=20220518; h=Subject:Content-Transfer-Encoding:Content-Type: MIME-Version:References:In-Reply-To:Message-Id:Date:To:From:Sender:Reply-To: Cc:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=h31Zpv7yg0qEAoRsfBy+KqmU//6SKT+ar2XpdfNd3Ho=; b=c340n4rFrTSVIfq1Zzp8IygWAB VVcgQ3XrdgPOlCy94C+A+i3pKyXDrYGv0sNoxhz6PcZnXzEdO9qNI90AAirIrRWI0viKXQ5wH4Nu/ k1nf1RuhifqndZQVe6vX46z1gudRSDdvjeRpW8hns4TBdq9hOyXN3/RJAzwfjKVRJiXZlIJPsND6+ CQ2s/TXnKKB160qK/fI3jClLI1W1bzTZT2Jag+0g8BwSsSlugdpbPzbt9qCXdPf7IIV2n5m73jIJD VVbXpmW5WD7kwuPL8O3sQ3E5olkdtFdxjwA9ucijT3JmJ69TRi94giHRKu41e9nmLDHD6LYB+n4Qu Vl7Wnb5nZmQnesj3AOSr/lPYytAHX0CfFc+oNc/wI6mu4jfFdkNImmTOp7HVCB+tUqWOkzmgOlJuv MYIQ8cAkcZtsiaMo22LiRTt+qnVhqhZor/WJoYy56aHfeWSbOAh+8NeIcz6oU0+6pEQX9Of+LigDm lnyUhm0pvRRQDJFBeT+kZntZGXafnYtw+k9h8bEYdf9wfkfxAU3ohJk9LCY6llYnpXD5qfc44pgMZ t6QlBVE0kGH3A9MVio4KP51z8vrdZ851mgZKy2FU08Iddc+5czQAe2B+x6rMfaVVccTKLBDEFt5Q8 /zqW8vlgNfRNU/v3dwd2lt9mj65fPZiIZluxpVuHk=; From: Mark Cave-Ayland To: peter.maydell@linaro.org, qemu-devel@nongnu.org Date: Thu, 4 Apr 2024 15:25:33 +0100 Message-Id: <20240404142539.711134-12-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240404142539.711134-1-mark.cave-ayland@ilande.co.uk> References: <20240404142539.711134-1-mark.cave-ayland@ilande.co.uk> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-SA-Exim-Connect-IP: 2a02:8012:c93d:0:260e:bf57:a4e9:8142 X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk Subject: [PULL 11/17] esp.c: rework esp_cdb_length() into esp_cdb_ready() X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on mail.ilande.co.uk) 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.ilande.co.uk X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, 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.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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1712240818644100006 The esp_cdb_length() function is only used as part of a calculation to dete= rmine whether the cmdfifo contains an entire SCSI CDB. Rework esp_cdb_length() in= to a new esp_cdb_ready() function which both enables us to handle the case where scsi_cdb_length() returns -1, plus simplify the logic for its callers. Suggested-by: Paolo Bonzini Signed-off-by: Mark Cave-Ayland Reviewed-by: Paolo Bonzini Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20240324191707.623175-12-mark.cave-ayland@ilande.co.uk> Signed-off-by: Mark Cave-Ayland --- hw/scsi/esp.c | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c index f3aa5364cf..f47abc36d6 100644 --- a/hw/scsi/esp.c +++ b/hw/scsi/esp.c @@ -425,20 +425,20 @@ static void write_response(ESPState *s) } } =20 -static int esp_cdb_length(ESPState *s) +static bool esp_cdb_ready(ESPState *s) { + int len =3D fifo8_num_used(&s->cmdfifo) - s->cmdfifo_cdb_offset; const uint8_t *pbuf; - int cmdlen, len; + int cdblen; =20 - cmdlen =3D fifo8_num_used(&s->cmdfifo); - if (cmdlen < s->cmdfifo_cdb_offset) { - return 0; + if (len <=3D 0) { + return false; } =20 - pbuf =3D fifo8_peek_buf(&s->cmdfifo, cmdlen, NULL); - len =3D scsi_cdb_length((uint8_t *)&pbuf[s->cmdfifo_cdb_offset]); + pbuf =3D fifo8_peek_buf(&s->cmdfifo, len, NULL); + cdblen =3D scsi_cdb_length((uint8_t *)&pbuf[s->cmdfifo_cdb_offset]); =20 - return len; + return cdblen < 0 ? false : (len >=3D cdblen); } =20 static void esp_dma_ti_check(ESPState *s) @@ -806,10 +806,9 @@ static void esp_do_nodma(ESPState *s) trace_esp_handle_ti_cmd(cmdlen); =20 /* CDB may be transferred in one or more TI commands */ - if (esp_cdb_length(s) && esp_cdb_length(s) =3D=3D - fifo8_num_used(&s->cmdfifo) - s->cmdfifo_cdb_offset) { - /* Command has been received */ - do_cmd(s); + if (esp_cdb_ready(s)) { + /* Command has been received */ + do_cmd(s); } else { /* * If data was transferred from the FIFO then raise bus @@ -832,10 +831,9 @@ static void esp_do_nodma(ESPState *s) fifo8_push_all(&s->cmdfifo, buf, len); =20 /* Handle when DMA transfer is terminated by non-DMA FIFO writ= e */ - if (esp_cdb_length(s) && esp_cdb_length(s) =3D=3D - fifo8_num_used(&s->cmdfifo) - s->cmdfifo_cdb_offset) { - /* Command has been received */ - do_cmd(s); + if (esp_cdb_ready(s)) { + /* Command has been received */ + do_cmd(s); } break; =20 --=20 2.39.2