From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60636) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bkcw7-0006nc-6y for qemu-devel@nongnu.org; Thu, 15 Sep 2016 16:07:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bkcw3-000393-M5 for qemu-devel@nongnu.org; Thu, 15 Sep 2016 16:07:06 -0400 Received: from smtp2-g21.free.fr ([212.27.42.2]:47514) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bkcw3-00038o-EY for qemu-devel@nongnu.org; Thu, 15 Sep 2016 16:07:03 -0400 From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Date: Thu, 15 Sep 2016 22:06:27 +0200 Message-Id: <1473969987-5890-6-git-send-email-hpoussin@reactos.org> In-Reply-To: <1473969987-5890-1-git-send-email-hpoussin@reactos.org> References: <1473969987-5890-1-git-send-email-hpoussin@reactos.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v2 5/5] ps2: do not generate invalid key codes for unknown keys List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: "Michael S. Tsirkin" , Gerd Hoffmann , =?UTF-8?q?Herv=C3=A9=20Poussineau?= Instead, print a warning message. Signed-off-by: Herv=C3=A9 Poussineau --- hw/input/ps2.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/hw/input/ps2.c b/hw/input/ps2.c index 98da984..0d14de0 100644 --- a/hw/input/ps2.c +++ b/hw/input/ps2.c @@ -22,6 +22,7 @@ * THE SOFTWARE. */ #include "qemu/osdep.h" +#include "qemu/log.h" #include "hw/hw.h" #include "hw/input/ps2.h" #include "ui/console.h" @@ -621,7 +622,8 @@ static void ps2_keyboard_event(DeviceState *dev, Qemu= Console *src, } ps2_put_keycode(s, keycode & 0xff); } else { - ps2_queue(&s->common, key->down ? 0x00 : 0x80); + qemu_log_mask(LOG_UNIMP, + "ps2: ignoring key with qcode %d\n", qcode= ); } } } else if (s->scancode_set =3D=3D 2) { @@ -660,13 +662,9 @@ static void ps2_keyboard_event(DeviceState *dev, Qem= uConsole *src, ps2_put_keycode(s, 0xf0); } ps2_put_keycode(s, keycode & 0xff); - } else if (key->down) { - ps2_queue(&s->common, 0x00); - } else if (s->translate) { - ps2_queue(&s->common, 0x80); } else { - ps2_queue(&s->common, 0xf0); - ps2_queue(&s->common, 0x00); + qemu_log_mask(LOG_UNIMP, + "ps2: ignoring key with qcode %d\n", qcode= ); } } } else if (s->scancode_set =3D=3D 3) { @@ -677,13 +675,9 @@ static void ps2_keyboard_event(DeviceState *dev, Qem= uConsole *src, ps2_put_keycode(s, 0xf0); } ps2_put_keycode(s, keycode); - } else if (key->down) { - ps2_queue(&s->common, 0x00); - } else if (s->translate) { - ps2_queue(&s->common, 0x80); } else { - ps2_queue(&s->common, 0xf0); - ps2_queue(&s->common, 0x00); + qemu_log_mask(LOG_UNIMP, + "ps2: ignoring key with qcode %d\n", qcode); } } } --=20 2.1.4