From patchwork Wed May 4 20:01:21 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wink Saville X-Patchwork-Id: 9018171 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id B5E0E9F30C for ; Wed, 4 May 2016 20:02:14 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 18C1E203E6 for ; Wed, 4 May 2016 20:02:14 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 442C8203DC for ; Wed, 4 May 2016 20:02:13 +0000 (UTC) Received: from localhost ([::1]:49927 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ay2zp-0001fP-GE for patchwork-qemu-devel@patchwork.kernel.org; Wed, 04 May 2016 16:02:09 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40754) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ay2zc-0001R2-OX for qemu-devel@nongnu.org; Wed, 04 May 2016 16:02:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ay2zR-0005Tt-4h for qemu-devel@nongnu.org; Wed, 04 May 2016 16:01:51 -0400 Received: from mail-pf0-x22b.google.com ([2607:f8b0:400e:c00::22b]:36296) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ay2zP-0005JZ-S6 for qemu-devel@nongnu.org; Wed, 04 May 2016 16:01:45 -0400 Received: by mail-pf0-x22b.google.com with SMTP id c189so29867459pfb.3 for ; Wed, 04 May 2016 13:01:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=saville-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=uXKKVLds6hGX1MlV93YO9FxeJWHOSpGM92gIzeK7l4g=; b=u/esmGAfISSz949KY5TEzh5Sc5UFLuvG/GQBlWdZnr5015opMpXz2pO4bekhOB8vuW UnbJFWTsCtXMEP/A1bxwfBPW/pOtHFK56IUtjXIX0Vztky/eYWHTY0VnQ/Wng6UxD2ZB yDMe7L0GZINb3NlchsZKaSghm9sjtX6kDAAK5SO8SdPHTE4bWaXkE05GRfCdESmApUJi y07/PQbbyAELsqnU19HxyvHcX//vUeORvcSaGOi+VXW+1smf2jF3XTZVbftGZc8Da+MW KXn638dvQCgLXkWx0kfFAPqEYO470vYK+vkfBz/6hgxUYl0XuVzobJ1WH3uSH8XB5eR8 HrEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=uXKKVLds6hGX1MlV93YO9FxeJWHOSpGM92gIzeK7l4g=; b=k+s/aVV3H5UDunP/9LvNUf0GHSaZJgdwoh/tQTepMTwlwHnD/pfFfBICtkwupP4bJJ wnBrVEm11stG2e7NGXx/zxXl7JQPqV4qxqpwwUONGmKq6XMrK6eAzU9DIWM9bHbDLtYn YbukJoiGPX3NrpWotRxkOHmoVhLcDCtAENPlP3LkelZsu6scRuvxZQmOFpwJ/2Uvsos6 6g4TLrFUPGChfKzAJ5iFzmiJ3f2kt8cbU5CLB56p6VkKK0aBFJSwN4+edvV6jadVi+QV XhtESzWSr1GVOsZv1wBCqHr/a7ataOHDUyygmEMEi8F3yyZj7kk8ZRAvZWSgjditAVF1 EOwQ== X-Gm-Message-State: AOPr4FUB0ddXYjZFhuWWmslV+ots4SiB7W/KsIyl7FpuOMSVBbdGIudYjcKL/klyOA3ygw== X-Received: by 10.98.7.135 with SMTP id 7mr14585735pfh.124.1462392085913; Wed, 04 May 2016 13:01:25 -0700 (PDT) Received: from wink-desktop.localdomain (c-73-223-182-2.hsd1.ca.comcast.net. [73.223.182.2]) by smtp.gmail.com with ESMTPSA id zs16sm8055226pab.13.2016.05.04.13.01.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 04 May 2016 13:01:25 -0700 (PDT) From: Wink Saville To: qemu-devel@nongnu.org Date: Wed, 4 May 2016 13:01:21 -0700 Message-Id: <04cf1dc7e693c1e7d6d157cdb015009ca3c07193.1462389348.git.wink@saville.com> X-Mailer: git-send-email 2.8.2 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:400e:c00::22b Subject: [Qemu-devel] [PATCH] ps2-keyboard: Add val to trace_ps2_read_data 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: dkoch@verizon.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP To make the trace output more useful print the value returned by ps2_read_data. Signed-off-by: Wink Saville --- hw/input/ps2.c | 2 +- trace-events | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/input/ps2.c b/hw/input/ps2.c index a8aa36f..e27d8e4 100644 --- a/hw/input/ps2.c +++ b/hw/input/ps2.c @@ -199,7 +199,6 @@ uint32_t ps2_read_data(void *opaque) PS2Queue *q; int val, index; - trace_ps2_read_data(opaque); q = &s->queue; if (q->count == 0) { /* NOTE: if no data left, we return the last keyboard one @@ -219,6 +218,7 @@ uint32_t ps2_read_data(void *opaque) /* reassert IRQs if data left */ s->update_irq(s->update_arg, q->count != 0); } + trace_ps2_read_data(opaque, val); return val; } diff --git a/trace-events b/trace-events index 8350743..4a5d056 100644 --- a/trace-events +++ b/trace-events @@ -229,7 +229,7 @@ slavio_set_timer_irq_cpu(int cpu, int level) "Set cpu %d local timer level %d" # hw/input/ps2.c ps2_put_keycode(void *opaque, int keycode) "%p keycode %d" -ps2_read_data(void *opaque) "%p" +ps2_read_data(void *opaque, int val) "%p val %d" ps2_set_ledstate(void *s, int ledstate) "%p ledstate %d" ps2_reset_keyboard(void *s) "%p" ps2_write_keyboard(void *opaque, int val) "%p val %d"