From nobody Tue Feb 10 03:16:20 2026 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=1621078889; cv=none; d=zohomail.com; s=zohoarc; b=k8eLiAVR9udqriarV0Tt4OSch1osXEiGRQmLiSNqSCLSREuC/0x1t5g3pN+IUv9l1a+7cT1ewH4sYmzuDsEtfnP6WbWWQQsHvmQOfw/wRr2P/oOC6yMVZv/vitCrJcACNMR0LW7xaonrtv8IfCDKkyA4yKaFHRqHaKEXiMrSSNY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621078889; 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=lzmo4qV06YaXhQTkLbF7C9giS023UWUeL8np/4ZKflA=; b=gScVhFk245sgqyLu61Yxs6WsBlUehDsdrFfZCh14xDBZlgw+j6FUF0sDNSKD9Xpc9pyELTtLATEQtdxS5b9WTT9hKQuMDbINwWQ8rHYdMi8+19NIQyfQPWh5Eirt07Msk5nxHjAXaunDSJR3VwhcJmsHXjz/g2KGO3wD8gH93F8= 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 1621078889564474.79801806581315; Sat, 15 May 2021 04:41:29 -0700 (PDT) Received: from localhost ([::1]:36696 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lhsfg-0005Tj-IO for importer@patchew.org; Sat, 15 May 2021 07:41:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46528) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lhsXt-0004Wd-HO for qemu-devel@nongnu.org; Sat, 15 May 2021 07:33:25 -0400 Received: from mailout05.t-online.de ([194.25.134.82]:50456) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lhsXr-0003U3-Rq for qemu-devel@nongnu.org; Sat, 15 May 2021 07:33:25 -0400 Received: from fwd34.aul.t-online.de (fwd34.aul.t-online.de [172.20.26.145]) by mailout05.t-online.de (Postfix) with SMTP id B9A2B641C0; Sat, 15 May 2021 13:33:22 +0200 (CEST) Received: from linpower.localnet (bKYWmoZeYhFnUefgADweDEM+5sV8gKfaeNdzIwxm0isnHP1oXIfxdo+LbvIgD9hQRd@[79.208.18.63]) by fwd34.t-online.de with (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384 encrypted) esmtp id 1lhsXk-3rUUts0; Sat, 15 May 2021 13:33:16 +0200 Received: by linpower.localnet (Postfix, from userid 1000) id B35D920062E; Sat, 15 May 2021 13:32:54 +0200 (CEST) From: =?UTF-8?q?Volker=20R=C3=BCmelin?= To: "Michael S. Tsirkin" , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3 09/11] pckbd: add function kbd_pending() Date: Sat, 15 May 2021 13:32:52 +0200 Message-Id: <20210515113254.6245-9-vr_qemu@t-online.de> X-Mailer: git-send-email 2.26.2 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ID: bKYWmoZeYhFnUefgADweDEM+5sV8gKfaeNdzIwxm0isnHP1oXIfxdo+LbvIgD9hQRd X-TOI-EXPURGATEID: 150726::1621078396-000126A7-235C9E0D/0/0 CLEAN NORMAL X-TOI-MSGID: 7633e56a-bd2d-4b76-9931-59d192553f67 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: none client-ip=194.25.134.82; envelope-from=volker.ruemelin@t-online.de; helo=mailout05.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+importer=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 e9523e164f..199367dcab 100644 --- a/hw/input/pckbd.c +++ b/hw/input/pckbd.c @@ -195,21 +195,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; @@ -233,7 +240,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); } } @@ -266,7 +273,7 @@ static void kbd_throttle_timeout(void *opaque) { KBDState *s =3D opaque; =20 - if (s->pending) { + if (kbd_pending(s)) { kbd_update_irq(s); } } @@ -294,7 +301,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