From nobody Tue Feb 10 23:54:32 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1517654734718345.83080641707113; Sat, 3 Feb 2018 02:45:34 -0800 (PST) Received: from localhost ([::1]:39886 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ehvK6-0008TW-8x for importer@patchew.org; Sat, 03 Feb 2018 05:45:30 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50461) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ehvCj-00020Q-OG for qemu-devel@nongnu.org; Sat, 03 Feb 2018 05:37:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ehvCg-0008Tc-Ts for qemu-devel@nongnu.org; Sat, 03 Feb 2018 05:37:53 -0500 Received: from chuckie.co.uk ([82.165.15.123]:36248 helo=s16892447.onlinehome-server.info) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ehvCg-0008RR-Ko for qemu-devel@nongnu.org; Sat, 03 Feb 2018 05:37:50 -0500 Received: from host86-175-243-217.range86-175.btcentralplus.com ([86.175.243.217] helo=kentang.home) by s16892447.onlinehome-server.info with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1ehvCl-0000hl-Vm; Sat, 03 Feb 2018 10:37:56 +0000 From: Mark Cave-Ayland To: qemu-devel@nongnu.org, lvivier@redhat.com Date: Sat, 3 Feb 2018 10:37:21 +0000 Message-Id: <20180203103727.26457-5-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180203103727.26457-1-mark.cave-ayland@ilande.co.uk> References: <20180203103727.26457-1-mark.cave-ayland@ilande.co.uk> X-SA-Exim-Connect-IP: 86.175.243.217 X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk X-SA-Exim-Version: 4.2.1 (built Sun, 08 Jan 2012 02:45:44 +0000) X-SA-Exim-Scanned: Yes (on s16892447.onlinehome-server.info) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 82.165.15.123 Subject: [Qemu-devel] [PATCH 04/10] cuda: introduce CUDAState parameter to get_counter() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 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-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This will be required shortly and also happens to match nicely with the corresponding signature for set_counter(). Signed-off-by: Mark Cave-Ayland Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/misc/macio/cuda.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/hw/misc/macio/cuda.c b/hw/misc/macio/cuda.c index ba14dbeacd..f036e8d7e1 100644 --- a/hw/misc/macio/cuda.c +++ b/hw/misc/macio/cuda.c @@ -150,7 +150,7 @@ static uint64_t get_tb(uint64_t time, uint64_t freq) return muldiv64(time, freq, NANOSECONDS_PER_SECOND); } =20 -static unsigned int get_counter(CUDATimer *ti) +static unsigned int get_counter(CUDAState *s, CUDATimer *ti) { int64_t d; unsigned int counter; @@ -295,12 +295,12 @@ static uint64_t cuda_read(void *opaque, hwaddr addr, = unsigned size) val =3D s->dira; break; case CUDA_REG_T1CL: - val =3D get_counter(&s->timers[0]) & 0xff; + val =3D get_counter(s, &s->timers[0]) & 0xff; s->ifr &=3D ~T1_INT; cuda_update_irq(s); break; case CUDA_REG_T1CH: - val =3D get_counter(&s->timers[0]) >> 8; + val =3D get_counter(s, &s->timers[0]) >> 8; cuda_update_irq(s); break; case CUDA_REG_T1LL: @@ -311,12 +311,12 @@ static uint64_t cuda_read(void *opaque, hwaddr addr, = unsigned size) val =3D (s->timers[0].latch >> 8) & 0xff; break; case CUDA_REG_T2CL: - val =3D get_counter(&s->timers[1]) & 0xff; + val =3D get_counter(s, &s->timers[1]) & 0xff; s->ifr &=3D ~T2_INT; cuda_update_irq(s); break; case CUDA_REG_T2CH: - val =3D get_counter(&s->timers[1]) >> 8; + val =3D get_counter(s, &s->timers[1]) >> 8; break; case CUDA_REG_SR: val =3D s->sr; --=20 2.11.0