From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35119) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gX8LB-0006yU-Hp for qemu-devel@nongnu.org; Wed, 12 Dec 2018 12:30:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gX8L6-000122-Go for qemu-devel@nongnu.org; Wed, 12 Dec 2018 12:30:33 -0500 From: Laurent Vivier Date: Wed, 12 Dec 2018 18:30:03 +0100 Message-Id: <20181212173007.11407-3-lvivier@redhat.com> In-Reply-To: <20181212173007.11407-1-lvivier@redhat.com> References: <20181212173007.11407-1-lvivier@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 2/6] hw/dma/puv3_gpio: Convert from DPRINTF() macro to trace event List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-trivial@nongnu.org, Guan Xuetao , Michael Tokarev , Laurent Vivier Signed-off-by: Laurent Vivier --- Makefile.objs | 1 + hw/gpio/puv3_gpio.c | 15 +++++++-------- hw/gpio/trace-events | 6 ++++++ 3 files changed, 14 insertions(+), 8 deletions(-) create mode 100644 hw/gpio/trace-events diff --git a/Makefile.objs b/Makefile.objs index 1e1ff387d7..fbc3bad1e1 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -243,6 +243,7 @@ trace-events-subdirs +=3D hw/vfio trace-events-subdirs +=3D hw/virtio trace-events-subdirs +=3D hw/watchdog trace-events-subdirs +=3D hw/xen +trace-events-subdirs +=3D hw/gpio trace-events-subdirs +=3D io trace-events-subdirs +=3D linux-user trace-events-subdirs +=3D migration diff --git a/hw/gpio/puv3_gpio.c b/hw/gpio/puv3_gpio.c index 445afccf9f..1b52b2c291 100644 --- a/hw/gpio/puv3_gpio.c +++ b/hw/gpio/puv3_gpio.c @@ -11,9 +11,8 @@ #include "qemu/osdep.h" #include "hw/hw.h" #include "hw/sysbus.h" - -#undef DEBUG_PUV3 #include "hw/unicore32/puv3.h" +#include "trace.h" =20 #define TYPE_PUV3_GPIO "puv3_gpio" #define PUV3_GPIO(obj) OBJECT_CHECK(PUV3GPIOState, (obj), TYPE_PUV3_GPIO= ) @@ -46,9 +45,9 @@ static uint64_t puv3_gpio_read(void *opaque, hwaddr off= set, ret =3D s->reg_GPIR; break; default: - DPRINTF("Bad offset 0x%x\n", offset); + trace_puv3_gpio_read_bad(offset); } - DPRINTF("offset 0x%x, value 0x%x\n", offset, ret); + trace_puv3_gpio_read(offset, ret); =20 return ret; } @@ -58,7 +57,7 @@ static void puv3_gpio_write(void *opaque, hwaddr offset= , { PUV3GPIOState *s =3D opaque; =20 - DPRINTF("offset 0x%x, value 0x%x\n", offset, value); + trace_puv3_gpio_write(offset, value); switch (offset) { case 0x04: s->reg_GPDR =3D value; @@ -67,14 +66,14 @@ static void puv3_gpio_write(void *opaque, hwaddr offs= et, if (s->reg_GPDR & value) { s->reg_GPLR |=3D value; } else { - DPRINTF("Write gpio input port error!"); + trace_puv3_gpio_write_error(); } break; case 0x0c: if (s->reg_GPDR & value) { s->reg_GPLR &=3D ~value; } else { - DPRINTF("Write gpio input port error!"); + trace_puv3_gpio_write_error(); } break; case 0x10: /* GRER */ @@ -85,7 +84,7 @@ static void puv3_gpio_write(void *opaque, hwaddr offset= , s->reg_GPIR =3D value; break; default: - DPRINTF("Bad offset 0x%x\n", offset); + trace_puv3_gpio_write_bad(offset); } } =20 diff --git a/hw/gpio/trace-events b/hw/gpio/trace-events new file mode 100644 index 0000000000..5708899a79 --- /dev/null +++ b/hw/gpio/trace-events @@ -0,0 +1,6 @@ +# hw/gpio/puv3_gpio.c +puv3_gpio_read_bad(unsigned offset) "Bad offset 0x%x" +puv3_gpio_read(unsigned offset, uint32_t value) "offset 0x%x, value 0x%x= " +puv3_gpio_write(unsigned offset, uint64_t value) "offset 0x%x, value 0x%= " PRIx64 +puv3_gpio_write_error(void) "Write gpio input port error!" +puv3_gpio_write_bad(unsigned offset) "Bad offset 0x%x" --=20 2.19.2