[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-trivial] [PULL 08/14] pckbd: Convert DPRINTF->trace
From: |
Laurent Vivier |
Subject: |
[Qemu-trivial] [PULL 08/14] pckbd: Convert DPRINTF->trace |
Date: |
Thu, 14 Feb 2019 11:47:11 +0100 |
From: "Dr. David Alan Gilbert" <address@hidden>
Signed-off-by: Dr. David Alan Gilbert <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Laurent Vivier <address@hidden>
---
hw/input/pckbd.c | 19 ++++++-------------
hw/input/trace-events | 7 +++++++
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/hw/input/pckbd.c b/hw/input/pckbd.c
index 72e7d5f6cc50..47a606f5e3a0 100644
--- a/hw/input/pckbd.c
+++ b/hw/input/pckbd.c
@@ -30,14 +30,7 @@
#include "hw/input/i8042.h"
#include "sysemu/sysemu.h"
-/* debug PC keyboard */
-//#define DEBUG_KBD
-#ifdef DEBUG_KBD
-#define DPRINTF(fmt, ...) \
- do { printf("KBD: " fmt , ## __VA_ARGS__); } while (0)
-#else
-#define DPRINTF(fmt, ...)
-#endif
+#include "trace.h"
/* Keyboard Controller Commands */
#define KBD_CCMD_READ_MODE 0x20 /* Read mode bits */
@@ -210,7 +203,7 @@ static uint64_t kbd_read_status(void *opaque, hwaddr addr,
KBDState *s = opaque;
int val;
val = s->status;
- DPRINTF("kbd: read status=0x%02x\n", val);
+ trace_pckbd_kbd_read_status(val);
return val;
}
@@ -224,7 +217,7 @@ static void kbd_queue(KBDState *s, int b, int aux)
static void outport_write(KBDState *s, uint32_t val)
{
- DPRINTF("kbd: write outport=0x%02x\n", val);
+ trace_pckbd_outport_write(val);
s->outport = val;
qemu_set_irq(s->a20_out, (val >> 1) & 1);
if (!(val & 1)) {
@@ -237,7 +230,7 @@ static void kbd_write_command(void *opaque, hwaddr addr,
{
KBDState *s = opaque;
- DPRINTF("kbd: write cmd=0x%02" PRIx64 "\n", val);
+ trace_pckbd_kbd_write_command(val);
/* Bits 3-0 of the output port P2 of the keyboard controller may be pulsed
* low for approximately 6 micro seconds. Bits 3-0 of the KBD_CCMD_PULSE
@@ -326,7 +319,7 @@ static uint64_t kbd_read_data(void *opaque, hwaddr addr,
else
val = ps2_read_data(s->kbd);
- DPRINTF("kbd: read data=0x%02x\n", val);
+ trace_pckbd_kbd_read_data(val);
return val;
}
@@ -335,7 +328,7 @@ static void kbd_write_data(void *opaque, hwaddr addr,
{
KBDState *s = opaque;
- DPRINTF("kbd: write data=0x%02" PRIx64 "\n", val);
+ trace_pckbd_kbd_write_data(val);
switch(s->write_cmd) {
case 0:
diff --git a/hw/input/trace-events b/hw/input/trace-events
index 3965a842aee5..8e53ae5bbf15 100644
--- a/hw/input/trace-events
+++ b/hw/input/trace-events
@@ -14,6 +14,13 @@ adb_mouse_readreg(int reg, uint8_t val0, uint8_t val1) "reg
%d obuf[0] 0x%2.2x o
adb_mouse_request_change_addr(int devaddr) "change addr to 0x%x"
adb_mouse_request_change_addr_and_handler(int devaddr, int handler) "change
addr and handler to 0x%x, 0x%x"
+# hw/input/pckbd.c
+pckbd_kbd_read_data(uint32_t val) "0x%02x"
+pckbd_kbd_read_status(int status) "0x%02x"
+pckbd_outport_write(uint32_t val) "0x%02x"
+pckbd_kbd_write_command(uint64_t val) "0x%02"PRIx64
+pckbd_kbd_write_data(uint64_t val) "0x%02"PRIx64
+
# hw/input/ps2.c
ps2_put_keycode(void *opaque, int keycode) "%p keycode 0x%02x"
ps2_keyboard_event(void *opaque, int qcode, int down, unsigned int modifier,
unsigned int modifiers) "%p qcode %d down %d modifier 0x%x modifiers 0x%x"
--
2.20.1
- [Qemu-trivial] [PULL 00/14] Trivial branch patches, Laurent Vivier, 2019/02/14
- [Qemu-trivial] [PULL 04/14] configure: remove handling of "wav" audio driver, Laurent Vivier, 2019/02/14
- [Qemu-trivial] [PULL 06/14] configure: Add HAX support in NetBSD, Laurent Vivier, 2019/02/14
- [Qemu-trivial] [PULL 13/14] hw/sparc64: Explicitly set default_display = "std", Laurent Vivier, 2019/02/14
- [Qemu-trivial] [PULL 03/14] qemu-options: Remove deprecated option -clock, Laurent Vivier, 2019/02/14
- [Qemu-trivial] [PULL 05/14] configure: fix qemu-img name, Laurent Vivier, 2019/02/14
- [Qemu-trivial] [PULL 07/14] configure: Make -Waddress-of-packed-member warnings be errors, Laurent Vivier, 2019/02/14
- [Qemu-trivial] [PULL 11/14] wavcapture: Convert to error_report, Laurent Vivier, 2019/02/14
- [Qemu-trivial] [PULL 08/14] pckbd: Convert DPRINTF->trace,
Laurent Vivier <=
- [Qemu-trivial] [PULL 12/14] hw/dma/i8257: Use qemu_log_mask(UNIMP) instead of fprintf, Laurent Vivier, 2019/02/14
- [Qemu-trivial] [PULL 09/14] HMP: Prepend errors with 'Error:', Laurent Vivier, 2019/02/14
- [Qemu-trivial] [PULL 02/14] qemu-deprecated: Remove -virtioconsole and -no-frame for good, Laurent Vivier, 2019/02/14
- [Qemu-trivial] [PULL 01/14] qapi: Fix qcow2 encryption doc typo, Laurent Vivier, 2019/02/14
- [Qemu-trivial] [PULL 14/14] configure: improve usbfs check, Laurent Vivier, 2019/02/14
- [Qemu-trivial] [PULL 10/14] kvm: Add kvm_set_ioeventfd* traces, Laurent Vivier, 2019/02/14
- Re: [Qemu-trivial] [Qemu-devel] [PULL 00/14] Trivial branch patches, Peter Maydell, 2019/02/14