From nobody Wed Nov 5 17:22:32 2025 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.zoho.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 1496748181802379.7382906575426; Tue, 6 Jun 2017 04:23:01 -0700 (PDT) Received: from localhost ([::1]:37609 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dICZe-00069H-Dd for importer@patchew.org; Tue, 06 Jun 2017 07:22:58 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42133) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dICY0-0004ua-9i for qemu-devel@nongnu.org; Tue, 06 Jun 2017 07:21:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dICXv-0000Gm-Ba for qemu-devel@nongnu.org; Tue, 06 Jun 2017 07:21:16 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42924) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dICXv-0000GG-6U for qemu-devel@nongnu.org; Tue, 06 Jun 2017 07:21:11 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2EC98C0587CD for ; Tue, 6 Jun 2017 11:21:10 +0000 (UTC) Received: from nilsson.home.kraxel.org (ovpn-116-106.ams2.redhat.com [10.36.116.106]) by smtp.corp.redhat.com (Postfix) with ESMTP id 48A9C17D63; Tue, 6 Jun 2017 11:21:08 +0000 (UTC) Received: by nilsson.home.kraxel.org (Postfix, from userid 500) id 33B2D80F3B; Tue, 6 Jun 2017 13:21:07 +0200 (CEST) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 2EC98C0587CD Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=kraxel@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 2EC98C0587CD From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Tue, 6 Jun 2017 13:21:04 +0200 Message-Id: <20170606112105.13331-3-kraxel@redhat.com> In-Reply-To: <20170606112105.13331-1-kraxel@redhat.com> References: <20170606112105.13331-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Tue, 06 Jun 2017 11:21:10 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 2/3] ps2: add ps2_reset_queue 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: , Cc: Gerd Hoffmann 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" Factor out ps2 queue reset to a separate function. No functional change. Signed-off-by: Gerd Hoffmann --- hw/input/ps2.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/hw/input/ps2.c b/hw/input/ps2.c index 37f8cb842e..2416b58cc0 100644 --- a/hw/input/ps2.c +++ b/hw/input/ps2.c @@ -551,6 +551,15 @@ static uint8_t translate_table[256] =3D { 0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff, }; =20 +static void ps2_reset_queue(PS2State *s) +{ + PS2Queue *q =3D &s->queue; + + q->rptr =3D 0; + q->wptr =3D 0; + q->count =3D 0; +} + void ps2_queue(PS2State *s, int b) { PS2Queue *q =3D &s->queue; @@ -1079,12 +1088,8 @@ void ps2_write_mouse(void *opaque, int val) =20 static void ps2_common_reset(PS2State *s) { - PS2Queue *q; s->write_cmd =3D -1; - q =3D &s->queue; - q->rptr =3D 0; - q->wptr =3D 0; - q->count =3D 0; + ps2_reset_queue(s); s->update_irq(s->update_arg, 0); } =20 --=20 2.9.3