From nobody Tue Nov 18 10:39:18 2025 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=1609343032; cv=none; d=zohomail.com; s=zohoarc; b=Z5pPvZ7qJ48fwK/SlZYMGMNwfeipSFUH+v5ITMJrhdpP0bolPNbKjmPbmVyjpzXYMLwuDMWRGdtylARO72WlNoAVwRczc55DiZgR8xcPw2NA7WFH7yGoEXmTXpW4RdcUZAvbeT4tmns8V+27DOVbrKx9HAVI7+YIK16vw/xN8Zw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1609343032; 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=Q1ytwQxlO0tGDHEJZ66a6LNDLSAUyYNL+IZ2H7sloiU=; b=miFbc9aVkT5fn21yy1Z8fliPVcGeaBRPfV8Do1fDv04LBWroqagecvASNKk6LmV6bKRdnVNtZM0qWkiDE4afI0x3EjM/xlbgT1Wz/j+CxxyXbLhkzbEydgOoE2Tjc+Zly+8Scc6CnUBSVxRI0yhOTUMhA15ik9s/9CgRPHIubqY= 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 1609343032729603.1570899653683; Wed, 30 Dec 2020 07:43:52 -0800 (PST) Received: from localhost ([::1]:53986 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kuddf-0006dG-Np for importer@patchew.org; Wed, 30 Dec 2020 10:43:51 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50890) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kudYF-00009T-4q for qemu-devel@nongnu.org; Wed, 30 Dec 2020 10:38:15 -0500 Received: from mail.ilande.co.uk ([2001:41c9:1:41f::167]:50734 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 1kudYD-0001xv-MR for qemu-devel@nongnu.org; Wed, 30 Dec 2020 10:38:14 -0500 Received: from host86-148-34-1.range86-148.btcentralplus.com ([86.148.34.1] 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 1kudY9-00070L-4u; Wed, 30 Dec 2020 15:38:16 +0000 From: Mark Cave-Ayland To: qemu-devel@nongnu.org, pbonzini@redhat.com, fam@euphon.net, laurent@vivier.eu Date: Wed, 30 Dec 2020 15:37:23 +0000 Message-Id: <20201230153745.30241-4-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201230153745.30241-1-mark.cave-ayland@ilande.co.uk> References: <20201230153745.30241-1-mark.cave-ayland@ilande.co.uk> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-SA-Exim-Connect-IP: 86.148.34.1 X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk Subject: [PATCH 03/25] esp: fix esp_reg_read() trace event 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" Move the trace event to the end of the function so that it correctly reports the returned value if it doesn't come directly from the rregs array. Signed-off-by: Mark Cave-Ayland Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/scsi/esp.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c index 5f2c352029..df15e3e7cf 100644 --- a/hw/scsi/esp.c +++ b/hw/scsi/esp.c @@ -595,9 +595,8 @@ static void parent_esp_reset(ESPState *s, int irq, int = level) =20 uint64_t esp_reg_read(ESPState *s, uint32_t saddr) { - uint32_t old_val; + uint32_t val; =20 - trace_esp_mem_readb(saddr, s->rregs[saddr]); switch (saddr) { case ESP_FIFO: if ((s->rregs[ESP_RSTAT] & STAT_PIO_MASK) =3D=3D 0) { @@ -612,13 +611,14 @@ uint64_t esp_reg_read(ESPState *s, uint32_t saddr) s->ti_rptr =3D 0; s->ti_wptr =3D 0; } + val =3D s->rregs[ESP_FIFO]; break; case ESP_RINTR: /* * Clear sequence step, interrupt register and all status bits * except TC */ - old_val =3D s->rregs[ESP_RINTR]; + val =3D s->rregs[ESP_RINTR]; s->rregs[ESP_RINTR] =3D 0; s->rregs[ESP_RSTAT] &=3D ~STAT_TC; s->rregs[ESP_RSEQ] =3D SEQ_CD; @@ -627,16 +627,22 @@ uint64_t esp_reg_read(ESPState *s, uint32_t saddr) esp_report_command_complete(s, s->deferred_status); s->deferred_complete =3D false; } - return old_val; + break; case ESP_TCHI: /* Return the unique id if the value has never been written */ if (!s->tchi_written) { - return s->chip_id; + val =3D s->chip_id; + } else { + val =3D s->rregs[saddr]; } + break; default: + val =3D s->rregs[saddr]; break; } - return s->rregs[saddr]; + + trace_esp_mem_readb(saddr, val); + return val; } =20 void esp_reg_write(ESPState *s, uint32_t saddr, uint64_t val) --=20 2.20.1