From nobody Sat Apr 11 23:04:17 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1772748619; cv=none; d=zohomail.com; s=zohoarc; b=kdfi60eP38T7HKTqVXFHpKDQeZ3hNx06LvZr3u7BUcnoKhUIlGjFD7MgmkI81w/bMB32iUvX3cBqG9r7euatafRK2semi/Ll7zGCh4T7/wU//lo5mkpQJdSXwCIdEGNMbNE3CaSXuujIVVN8UiRMvJDQOsG1NiRzq+KUj9hF4EQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772748619; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=TykOcg42N3v23e/MxBmcDCzlMjizZHJY8EyEUhsuAq4=; b=V8uh5/BCFmuuG7fGoIOLCE+9+6A7u8b/7/r9/tmxuosgvwBmPD1uEzoqXlcdymInVUc+ZYn0MeYT6lLGWdNzz9LKoXu2NPz0vIvPlMW446r557eZS7nBdeYYBDhB4thzEQAvB6acGU5E8dYTp3OyovXoHQOegcJEsKEwpAQP564= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1772748619381499.29481578389164; Thu, 5 Mar 2026 14:10:19 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vyGt1-00019C-23; Thu, 05 Mar 2026 17:09:39 -0500 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 1vyGst-000120-Lo for qemu-devel@nongnu.org; Thu, 05 Mar 2026 17:09:33 -0500 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vyGss-0002Fz-6I for qemu-devel@nongnu.org; Thu, 05 Mar 2026 17:09:31 -0500 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-4807068eacbso71740365e9.2 for ; Thu, 05 Mar 2026 14:09:29 -0800 (PST) Received: from Provence.localdomain (dynamic-2a02-3100-2989-c400-0219-99ff-feb2-2458.310.pool.telefonica.de. [2a02:3100:2989:c400:219:99ff:feb2:2458]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4851fa87e56sm67419615e9.0.2026.03.05.14.09.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Mar 2026 14:09:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1772748568; x=1773353368; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=TykOcg42N3v23e/MxBmcDCzlMjizZHJY8EyEUhsuAq4=; b=e0ldzxZnCme52frgyph/bGunUu4MMnvc9J0N5+R3QuuWNeZ+tojt/OEGhM2P/4jl7f v1FGV6oO7pFtZuiK53MuRLXG+qdwymsDCunJIpxhGRQ+D6Pm9ALMV3842w2Z5l0KEpr8 OIClau/PWNsRH5CjVyF85efGxFylvU/P+/Lb/Y0r33HEGcQmuy8k6J9WPxJFUzMKTuxL TREOgxwQJu7O1Pp1Usyi3tcO7M056gR4z+dGq+1YJkXL1RhGkwd4dTVNM/Q70VYsjiub CjADtCAdyfOU3orcjVd+QVQXLx1FccjQokVnNoMuRTPdRdQqyhE1f0/48H55nzfFlDjS IYHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772748568; x=1773353368; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=TykOcg42N3v23e/MxBmcDCzlMjizZHJY8EyEUhsuAq4=; b=RUj/PDbuRDFLyXfJCMiikiiEj2iWrH4C3jKy4kUxMk7HWSWsaG0KbzAr8AtsPWHA+j MvJh0YFljZwGFbdysrbQ8XG0pwqydrOuMXEQbF3vfJXyz2Ll/63nP9+DHV3fN86Ba1ow /odifb7WuAYUP5aWLDmksAMitThw2qxPSt/HBk314ba41FVsAUY4S2rBrqkEiD9sc/V3 q9lRbApTDazmI9tQTZppjPBmVt0RWMx1s0Y9oTipdAmp/CLkcgsDtlfU5YYrK8UFC+TN Udryk21Am44G/y9A2s0E4dahNBErYowxPBRa6WC5c1IzNNvS5H3jwXisCvLDdMhpDrN7 wkjg== X-Gm-Message-State: AOJu0Yz7tIJlnygaJoPJrt9/SoGPqSJQ8jnFo33I5PvJB+cmf+nGFR0n qnCdv1l5pt+CLXryj/m7hbcvDe1X3tbQ5EtLd6HaX1GCakhaTbGW9ucz4vFbWw== X-Gm-Gg: ATEYQzwmfpNVq5DlLML86HCa99qKgXjaKY/LWLz2GhI6efOk4uLgVAzKHq9xPucV747 jG/82d77qASsvcv+BbNz3vuUEpQnR+Xg16Kc8YffZnO1rjD8dxPUaNyb+ZFJQjUK7LPN5EtLpO1 s5j3cxb1VbbwarmYNrhZOs8g6+T6eTdwGZ4tod5kp5nt1/Ta+DcZ5z+jL++X/G4jlppImA7b5oS /d/gdoKyeAGauqGP9omPeav3mm7bBBtDNA8JmhcgVfbXmnwzFADzxiQFqNcQrAwWgdRz1u1L0xL CfFaGifiWOhatT9YJkEZ/YzNvTGIJWCND8CbzzEjY+ys14Z5XHYo0O+OIBA0wmwzY+rKpWaUhow 0dSuRQ4bx/zX9wlqiESNiTeO/vpy25BXN+Q+igp+aposTkI4Ft9hy3ODx9rjr7gWZVsf1X7Xws2 ush1ojO6NWh666fY0y5Ijej0DgtFre2HdwMcZRYB/DL6rqCCSrbOIGT8ba6muDsL6iy+vGIMKi4 uoBSghLwLxpS8FpNMS0+U0vuZdV+IDLzt0G5SbW2css/Zw= X-Received: by 2002:a05:600c:6388:b0:47a:7fd0:9eea with SMTP id 5b1f17b1804b1-4852359313emr16847145e9.3.1772748567966; Thu, 05 Mar 2026 14:09:27 -0800 (PST) From: Bernhard Beschow To: qemu-devel@nongnu.org Cc: Richard Henderson , "Michael S. Tsirkin" , Mark Cave-Ayland , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Troy Lee , Joel Stanley , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Paolo Bonzini , Peter Maydell , Andrew Jeffery , Steven Lee , Jamin Lin , qemu-arm@nongnu.org, Helge Deller , Bernhard Beschow Subject: [PATCH v3 07/14] hw/char/serial: Reuse fifo8_num_used() Date: Thu, 5 Mar 2026 23:09:04 +0100 Message-ID: <20260305220911.131508-8-shentey@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260305220911.131508-1-shentey@gmail.com> References: <20260305220911.131508-1-shentey@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=2a00:1450:4864:20::332; envelope-from=shentey@gmail.com; helo=mail-wm1-x332.google.com 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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, 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: qemu development 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: pass (identity @gmail.com) X-ZM-MESSAGEID: 1772748621700154100 Content-Type: text/plain; charset="utf-8" Avoids accessing private fields of struct Fifo8. Now, TYPE_SERIAL only accesses struct Fifo8 through its methods. Signed-off-by: Bernhard Beschow Reviewed-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/char/serial.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/char/serial.c b/hw/char/serial.c index 20f68fd2f8..2c558cb9fc 100644 --- a/hw/char/serial.c +++ b/hw/char/serial.c @@ -128,7 +128,7 @@ static void serial_update_irq(SerialState *s) tmp_iir =3D UART_IIR_CTI; } else if ((s->ier & UART_IER_RDI) && (s->lsr & UART_LSR_DR) && (!(s->fcr & UART_FCR_FE) || - s->recv_fifo.num >=3D s->recv_fifo_itl)) { + fifo8_num_used(&s->recv_fifo) >=3D s->recv_fifo_itl)) { tmp_iir =3D UART_IIR_RDI; } else if ((s->ier & UART_IER_THRI) && s->thr_ipending) { tmp_iir =3D UART_IIR_THRI; @@ -563,8 +563,8 @@ static int serial_can_receive(SerialState *s) * the guest has a chance to respond, effectively overriding t= he ITL * that the guest has set. */ - return (s->recv_fifo.num <=3D s->recv_fifo_itl) ? - s->recv_fifo_itl - s->recv_fifo.num : 1; + return (fifo8_num_used(&s->recv_fifo) <=3D s->recv_fifo_itl) ? + s->recv_fifo_itl - fifo8_num_used(&s->recv_fifo) := 1; } else { return 0; } --=20 2.53.0