From nobody Wed Feb 11 06:58:21 2026 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1621967131; cv=none; d=zohomail.com; s=zohoarc; b=cCP14hcGwFcG9fZSSdGwxLe+jge7nrxG95E1En4MgfpzrJFmfW+4bnH+eTp2LtkHsteaSWntZpRtmEAI4uSF1kKnTKN1ela9kjja8AgIjtoTIn9Mk8TxFpeR7mWGlIBOrkzigMlRC7vV2/N2nMRM5MgCK4hZu/2GMi6lxriHg9U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621967131; h=Content-Type:Content-Transfer-Encoding:Cc: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=+Z/9zdkU5R5PV3TumaS1cc/vrffuRsCOmuSJ/EkpnqM=; b=KFoKmJ4fjTvupPfe+UNxpGBy/U+x/7bh6xmC/PVbwRaNZQfVDc4kXkI9hMY4e8zZ8MfDJ2nk9gRURes6oWum6XMOMixIeZbXtWhtYFFHaKVBIV+rMtVLzvU+uejOhm0oJ5BydQ0oVtNazuLxaGTX40CzcnveNJKl+ptU8XIJ+RE= 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+importer2=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 162196713138584.19358594515984; Tue, 25 May 2021 11:25:31 -0700 (PDT) Received: from localhost ([::1]:45282 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1llbkA-0007CD-8V for importer2@patchew.org; Tue, 25 May 2021 14:25:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48794) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1llba8-0002c7-MD for qemu-devel@nongnu.org; Tue, 25 May 2021 14:15:09 -0400 Received: from mailout03.t-online.de ([194.25.134.81]:50930) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1llba5-0003gY-KL for qemu-devel@nongnu.org; Tue, 25 May 2021 14:15:08 -0400 Received: from fwd02.aul.t-online.de (fwd02.aul.t-online.de [172.20.26.148]) by mailout03.t-online.de (Postfix) with SMTP id 72BCD72226; Tue, 25 May 2021 20:15:04 +0200 (CEST) Received: from linpower.localnet (EqWspmZeYhQQEY2kLwTZsswmeWGOO55UGOvPgfmqGfpeut1VNd+uUxWbfTuJQFxZY8@[93.236.158.49]) by fwd02.t-online.de with (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384 encrypted) esmtp id 1llba3-0Z5NuC0; Tue, 25 May 2021 20:15:03 +0200 Received: by linpower.localnet (Postfix, from userid 1000) id 9744C200619; Tue, 25 May 2021 20:14:41 +0200 (CEST) From: =?UTF-8?q?Volker=20R=C3=BCmelin?= To: "Michael S. Tsirkin" , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Gerd Hoffmann Subject: [PATCH v4 09/12] pckbd: add function kbd_pending() Date: Tue, 25 May 2021 20:14:38 +0200 Message-Id: <20210525181441.27768-9-vr_qemu@t-online.de> X-Mailer: git-send-email 2.26.2 In-Reply-To: <79355790-0f6f-7a3f-3525-4846c88ba8e2@t-online.de> References: <79355790-0f6f-7a3f-3525-4846c88ba8e2@t-online.de> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ID: EqWspmZeYhQQEY2kLwTZsswmeWGOO55UGOvPgfmqGfpeut1VNd+uUxWbfTuJQFxZY8 X-TOI-EXPURGATEID: 150726::1621966503-0000AFC8-E6CC8708/0/0 CLEAN NORMAL X-TOI-MSGID: f03aeb4f-a2e1-4fd7-b63e-feb5ad9b064d 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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: none client-ip=194.25.134.81; envelope-from=volker.ruemelin@t-online.de; helo=mailout03.t-online.de 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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_NONE=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: , Cc: qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" Replace reads of the variable s->pending with a call to a new function kbd_pending() to ease the review of the next patch. There is no functional change. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Volker R=C3=BCmelin --- hw/input/pckbd.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/hw/input/pckbd.c b/hw/input/pckbd.c index 294b315901..e9905e1c6b 100644 --- a/hw/input/pckbd.c +++ b/hw/input/pckbd.c @@ -198,21 +198,28 @@ static void kbd_deassert_irq(KBDState *s) kbd_update_irq_lines(s); } =20 +static uint8_t kbd_pending(KBDState *s) +{ + return s->pending; +} + /* update irq and KBD_STAT_[MOUSE_]OBF */ static void kbd_update_irq(KBDState *s) { + uint8_t pending =3D kbd_pending(s); + s->status &=3D ~(KBD_STAT_OBF | KBD_STAT_MOUSE_OBF); s->outport &=3D ~(KBD_OUT_OBF | KBD_OUT_MOUSE_OBF); - if (s->pending) { + if (pending) { s->status |=3D KBD_STAT_OBF; s->outport |=3D KBD_OUT_OBF; - if (s->pending & KBD_PENDING_CTRL_KBD) { + if (pending & KBD_PENDING_CTRL_KBD) { s->obsrc =3D KBD_OBSRC_CTRL; - } else if (s->pending & KBD_PENDING_CTRL_AUX) { + } else if (pending & KBD_PENDING_CTRL_AUX) { s->status |=3D KBD_STAT_MOUSE_OBF; s->outport |=3D KBD_OUT_MOUSE_OBF; s->obsrc =3D KBD_OBSRC_CTRL; - } else if (s->pending & KBD_PENDING_KBD) { + } else if (pending & KBD_PENDING_KBD) { s->obsrc =3D KBD_OBSRC_KBD; } else { s->status |=3D KBD_STAT_MOUSE_OBF; @@ -236,7 +243,7 @@ static void kbd_safe_update_irq(KBDState *s) if (s->throttle_timer && timer_pending(s->throttle_timer)) { return; } - if (s->pending) { + if (kbd_pending(s)) { kbd_update_irq(s); } } @@ -269,7 +276,7 @@ static void kbd_throttle_timeout(void *opaque) { KBDState *s =3D opaque; =20 - if (s->pending) { + if (kbd_pending(s)) { kbd_update_irq(s); } } @@ -301,7 +308,7 @@ static uint8_t kbd_dequeue(KBDState *s) uint8_t b =3D s->cbdata; =20 s->pending &=3D ~KBD_PENDING_CTRL_KBD & ~KBD_PENDING_CTRL_AUX; - if (s->pending) { + if (kbd_pending(s)) { kbd_update_irq(s); } return b; --=20 2.26.2