From nobody Tue May 21 12:03:22 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1615308162; cv=none; d=zohomail.com; s=zohoarc; b=Zjr8QfE9JveB4ukEkHI0PtTZ1gqox8D53cdJPvFKivoPO5MqM1ULcITDutBifa3pF7ZNV6RAP/0EepO6G5j2M/2PIXmSSrIwYROxvLsYBM6/Fn1EQ0CVpmCWQgWf2UpAxlo2DAS6gUslE/lEl7ja7PHwQSFux+K63GIUHtPDP3o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615308162; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=gEZOVEV48qXHptgFZbCe1jj6186jCJKc+b16CHmiWY8=; b=Vy3kWo2XzSligHus8ZzY4p9phYbiMXmbb+lzLLwr8atkIGikALaUK/6TRZ2q3tqzUZ6j7eZS937n3qDhJkUbUYgyPZEQzXt/E86B+rkxM0GSC5GDUCWCiuHHqKue9pv23TSuzkCci5oH1FaxRi1qcTVk9y32W+MA/OJWk2N/4PE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1615308162880337.7056434884587; Tue, 9 Mar 2021 08:42:42 -0800 (PST) Received: from localhost ([::1]:44872 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lJfRR-0001ny-Q8 for importer@patchew.org; Tue, 09 Mar 2021 11:42:41 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:38262) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lJekQ-00025s-VU for qemu-devel@nongnu.org; Tue, 09 Mar 2021 10:58:15 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:21467) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lJekO-0003Cv-TH for qemu-devel@nongnu.org; Tue, 09 Mar 2021 10:58:14 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-81-Fk9whXR6MT63tA5uFuu4vg-1; Tue, 09 Mar 2021 10:58:10 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 826842F7A0 for ; Tue, 9 Mar 2021 15:58:09 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-114-154.ams2.redhat.com [10.36.114.154]) by smtp.corp.redhat.com (Postfix) with ESMTP id 18A7D19C46; Tue, 9 Mar 2021 15:58:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1615305492; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gEZOVEV48qXHptgFZbCe1jj6186jCJKc+b16CHmiWY8=; b=WDaN4hG5l5qHSpv1anpa2ir0DDRJ8R5pZJ7zH3UpM0RGnOlgM4dl22/Aky6jg9ZET+jxLg MlCMn0K67gF9YWsQuV0yTzGF4uopbGFAglS2kdNRV6otQjBI8txcGv3KuYF+EFW8LRpAYd 6BZ2hpdV9Kda6cnWISKnfzbgEDO95+s= X-MC-Unique: Fk9whXR6MT63tA5uFuu4vg-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2] hw/input: expand trace info reported for ps2 device Date: Tue, 9 Mar 2021 15:58:04 +0000 Message-Id: <20210309155804.306051-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=berrange@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" 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=216.205.24.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.251, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) It is interesting to know if the PS2 keyboard is in translated mode, and which of the three scancode sets are in use. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Daniel P. Berrang=C3=A9 --- hw/input/ps2.c | 3 ++- hw/input/trace-events | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/input/ps2.c b/hw/input/ps2.c index 72cdb80ae1..5352e417a4 100644 --- a/hw/input/ps2.c +++ b/hw/input/ps2.c @@ -293,7 +293,8 @@ static void ps2_keyboard_event(DeviceState *dev, QemuCo= nsole *src, qcode =3D qemu_input_key_value_to_qcode(key->key); =20 mod =3D ps2_modifier_bit(qcode); - trace_ps2_keyboard_event(s, qcode, key->down, mod, s->modifiers); + trace_ps2_keyboard_event(s, qcode, key->down, mod, + s->modifiers, s->scancode_set, s->translate); if (key->down) { s->modifiers |=3D mod; } else { diff --git a/hw/input/trace-events b/hw/input/trace-events index 1dd8ad6018..49c70d544e 100644 --- a/hw/input/trace-events +++ b/hw/input/trace-events @@ -30,7 +30,7 @@ pckbd_kbd_write_data(uint64_t val) "0x%02"PRIx64 =20 # ps2.c ps2_put_keycode(void *opaque, int keycode) "%p keycode 0x%02x" -ps2_keyboard_event(void *opaque, int qcode, int down, unsigned int modifie= r, unsigned int modifiers) "%p qcode %d down %d modifier 0x%x modifiers 0x%= x" +ps2_keyboard_event(void *opaque, int qcode, int down, unsigned int modifie= r, unsigned int modifiers, int set, int xlate) "%p qcode %d down %d modifie= r 0x%x modifiers 0x%x set %d xlate %d" ps2_read_data(void *opaque) "%p" ps2_set_ledstate(void *s, int ledstate) "%p ledstate %d" ps2_reset_keyboard(void *s) "%p" --=20 2.29.2