From nobody Fri Oct 25 19:32:29 2024 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=1614897221; cv=none; d=zohomail.com; s=zohoarc; b=KF+3vJXMazdWyeCycNwKqT23Olm3zlVtm81Y+D3S/WaVb6GhvBNskI2oD28iBEYzcDFvum0dSy1Q81Sr1wNtCZm8eMqoZPiQbnaLm5m0RRg2xmw7TezLHTy89lwqqrC+81AFq1DZjq5InJhTjNQSxDSB+mFaHUVq8zG4y7ti5+8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614897221; h=Content-Type: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=fzHaUvJyVIL+jtonxu/bAH/GvB5p3lyJ3YEBX1m/r5Q=; b=TEMIaadnnnAZyvY2ISVa8HyrptPm2pdOQ55jm5jsOkcXKWdxTh6F/+I4ZWqPGf7LBim5RB/xHsmNg26iTLXaQNq+v3rmHBpeAYXaK93OJPqBCAmvRx0ZtX7qhxxFjBc2s09iMhLdGFvqOK6LWbGCoz4Wu8mFH0QQNAkrAmaIvfU= 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 1614897221166325.2152485615321; Thu, 4 Mar 2021 14:33:41 -0800 (PST) Received: from localhost ([::1]:42710 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lHwXM-0002uQ-69 for importer@patchew.org; Thu, 04 Mar 2021 17:33:40 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:53614) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lHwDK-0006ja-7l for qemu-devel@nongnu.org; Thu, 04 Mar 2021 17:12:58 -0500 Received: from mail.ilande.co.uk ([2001:41c9:1:41f::167]:40084 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 1lHwDI-000695-3t for qemu-devel@nongnu.org; Thu, 04 Mar 2021 17:12:58 -0500 Received: from host86-148-34-47.range86-148.btcentralplus.com ([86.148.34.47] 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 1lHwDB-0008MJ-UD; Thu, 04 Mar 2021 22:12:54 +0000 From: Mark Cave-Ayland To: qemu-devel@nongnu.org, pbonzini@redhat.com, fam@euphon.net, laurent@vivier.eu Date: Thu, 4 Mar 2021 22:10:40 +0000 Message-Id: <20210304221103.6369-20-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210304221103.6369-1-mark.cave-ayland@ilande.co.uk> References: <20210304221103.6369-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: 86.148.34.47 X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk Subject: [PATCH v3 19/42] esp: remove buf parameter from do_cmd() 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" Now that all SCSI commands are accumulated in cmdbuf, remove the buf parame= ter from do_cmd() since this always points to cmdbuf. Signed-off-by: Mark Cave-Ayland Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Laurent Vivier --- hw/scsi/esp.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c index 66caa95815..8ebf5e8d4b 100644 --- a/hw/scsi/esp.c +++ b/hw/scsi/esp.c @@ -297,8 +297,9 @@ static void do_busid_cmd(ESPState *s, uint8_t *buf, uin= t8_t busid) esp_raise_irq(s); } =20 -static void do_cmd(ESPState *s, uint8_t *buf) +static void do_cmd(ESPState *s) { + uint8_t *buf =3D s->cmdbuf; uint8_t busid =3D buf[0]; =20 do_busid_cmd(s, &buf[1], busid); @@ -311,7 +312,7 @@ static void satn_pdma_cb(ESPState *s) } s->do_cmd =3D 0; if (s->cmdlen) { - do_cmd(s, s->cmdbuf); + do_cmd(s); } } =20 @@ -324,7 +325,7 @@ static void handle_satn(ESPState *s) s->pdma_cb =3D satn_pdma_cb; s->cmdlen =3D get_cmd(s, s->cmdbuf, sizeof(s->cmdbuf)); if (s->cmdlen) { - do_cmd(s, s->cmdbuf); + do_cmd(s); } else { s->do_cmd =3D 1; } @@ -445,7 +446,7 @@ static void do_dma_pdma_cb(ESPState *s) s->ti_size =3D 0; s->cmdlen =3D 0; s->do_cmd =3D 0; - do_cmd(s, s->cmdbuf); + do_cmd(s); return; } s->async_buf +=3D len; @@ -497,7 +498,7 @@ static void esp_do_dma(ESPState *s) s->ti_size =3D 0; s->cmdlen =3D 0; s->do_cmd =3D 0; - do_cmd(s, s->cmdbuf); + do_cmd(s); return; } if (s->async_len =3D=3D 0) { @@ -627,7 +628,7 @@ static void handle_ti(ESPState *s) s->ti_size =3D 0; s->cmdlen =3D 0; s->do_cmd =3D 0; - do_cmd(s, s->cmdbuf); + do_cmd(s); } } =20 --=20 2.20.1