1. Patchew
  2. QEMU
  3. View series

[PATCH] hw/isa/apm: Convert debug printf()s to trace events

Philippe Mathieu-Daudé posted 1 patch 3 years, 11 months ago
Test docker-mingw@fedora passed
Test checkpatch passed
Test asan passed
Test docker-quick@centos7 passed
Test FreeBSD passed
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20200524164806.12658-1-f4bug@amsat.org
hw/isa/apm.c        | 15 +++++----------
hw/isa/trace-events |  4 ++++
2 files changed, 9 insertions(+), 10 deletions(-)
[PATCH] hw/isa/apm: Convert debug printf()s to trace events
Posted by Philippe Mathieu-Daudé 3 years, 11 months ago 
Convert APM_DPRINTF() to trace events and remove ifdef'ry.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 hw/isa/apm.c        | 15 +++++----------
 hw/isa/trace-events |  4 ++++
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/hw/isa/apm.c b/hw/isa/apm.c
index 6300b1ba7a..bce266b957 100644
--- a/hw/isa/apm.c
+++ b/hw/isa/apm.c
@@ -24,14 +24,8 @@
 #include "hw/isa/apm.h"
 #include "hw/pci/pci.h"
 #include "migration/vmstate.h"
+#include "trace.h"
 
-//#define DEBUG
-
-#ifdef DEBUG
-# define APM_DPRINTF(format, ...)       printf(format, ## __VA_ARGS__)
-#else
-# define APM_DPRINTF(format, ...)       do { } while (0)
-#endif
 
 /* fixed I/O location */
 #define APM_STS_IOPORT  0xb3
@@ -41,8 +35,8 @@ static void apm_ioport_writeb(void *opaque, hwaddr addr, uint64_t val,
 {
     APMState *apm = opaque;
     addr &= 1;
-    APM_DPRINTF("apm_ioport_writeb addr=0x%" HWADDR_PRIx
-                " val=0x%02" PRIx64 "\n", addr, val);
+
+    trace_apm_io_write(addr, val);
     if (addr == 0) {
         apm->apmc = val;
 
@@ -65,7 +59,8 @@ static uint64_t apm_ioport_readb(void *opaque, hwaddr addr, unsigned size)
     } else {
         val = apm->apms;
     }
-    APM_DPRINTF("apm_ioport_readb addr=0x%" HWADDR_PRIx " val=0x%02x\n", addr, val);
+    trace_apm_io_read(addr, val);
+
     return val;
 }
 
diff --git a/hw/isa/trace-events b/hw/isa/trace-events
index 202f8938e7..3544c6213c 100644
--- a/hw/isa/trace-events
+++ b/hw/isa/trace-events
@@ -9,3 +9,7 @@ superio_create_ide(int id, uint16_t base, unsigned int irq) "id=%d, base 0x%03x,
 # pc87312.c
 pc87312_io_read(uint32_t addr, uint32_t val) "read addr=0x%x val=0x%x"
 pc87312_io_write(uint32_t addr, uint32_t val) "write addr=0x%x val=0x%x"
+
+# apm.c
+apm_io_read(uint8_t addr, uint8_t val) "read addr=0x%x val=0x%02x"
+apm_io_write(uint8_t addr, uint8_t val) "write addr=0x%x val=0x%02x"
-- 
2.21.3
Re: [PATCH] hw/isa/apm: Convert debug printf()s to trace events
Posted by Philippe Mathieu-Daudé 3 years, 10 months ago 
ping for review?

On 5/24/20 6:48 PM, Philippe Mathieu-Daudé wrote:
> Convert APM_DPRINTF() to trace events and remove ifdef'ry.
> 
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
>  hw/isa/apm.c        | 15 +++++----------
>  hw/isa/trace-events |  4 ++++
>  2 files changed, 9 insertions(+), 10 deletions(-)
> 
> diff --git a/hw/isa/apm.c b/hw/isa/apm.c
> index 6300b1ba7a..bce266b957 100644
> --- a/hw/isa/apm.c
> +++ b/hw/isa/apm.c
> @@ -24,14 +24,8 @@
>  #include "hw/isa/apm.h"
>  #include "hw/pci/pci.h"
>  #include "migration/vmstate.h"
> +#include "trace.h"
>  
> -//#define DEBUG
> -
> -#ifdef DEBUG
> -# define APM_DPRINTF(format, ...)       printf(format, ## __VA_ARGS__)
> -#else
> -# define APM_DPRINTF(format, ...)       do { } while (0)
> -#endif
>  
>  /* fixed I/O location */
>  #define APM_STS_IOPORT  0xb3
> @@ -41,8 +35,8 @@ static void apm_ioport_writeb(void *opaque, hwaddr addr, uint64_t val,
>  {
>      APMState *apm = opaque;
>      addr &= 1;
> -    APM_DPRINTF("apm_ioport_writeb addr=0x%" HWADDR_PRIx
> -                " val=0x%02" PRIx64 "\n", addr, val);
> +
> +    trace_apm_io_write(addr, val);
>      if (addr == 0) {
>          apm->apmc = val;
>  
> @@ -65,7 +59,8 @@ static uint64_t apm_ioport_readb(void *opaque, hwaddr addr, unsigned size)
>      } else {
>          val = apm->apms;
>      }
> -    APM_DPRINTF("apm_ioport_readb addr=0x%" HWADDR_PRIx " val=0x%02x\n", addr, val);
> +    trace_apm_io_read(addr, val);
> +
>      return val;
>  }
>  
> diff --git a/hw/isa/trace-events b/hw/isa/trace-events
> index 202f8938e7..3544c6213c 100644
> --- a/hw/isa/trace-events
> +++ b/hw/isa/trace-events
> @@ -9,3 +9,7 @@ superio_create_ide(int id, uint16_t base, unsigned int irq) "id=%d, base 0x%03x,
>  # pc87312.c
>  pc87312_io_read(uint32_t addr, uint32_t val) "read addr=0x%x val=0x%x"
>  pc87312_io_write(uint32_t addr, uint32_t val) "write addr=0x%x val=0x%x"
> +
> +# apm.c
> +apm_io_read(uint8_t addr, uint8_t val) "read addr=0x%x val=0x%02x"
> +apm_io_write(uint8_t addr, uint8_t val) "write addr=0x%x val=0x%02x"
>
Re: [PATCH] hw/isa/apm: Convert debug printf()s to trace events
Posted by Richard Henderson 3 years, 10 months ago 
On 5/24/20 9:48 AM, Philippe Mathieu-Daudé wrote:
> Convert APM_DPRINTF() to trace events and remove ifdef'ry.
> 
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
>  hw/isa/apm.c        | 15 +++++----------
>  hw/isa/trace-events |  4 ++++
>  2 files changed, 9 insertions(+), 10 deletions(-)

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>

r~
Re: [PATCH] hw/isa/apm: Convert debug printf()s to trace events
Posted by Laurent Vivier 3 years, 10 months ago 
Le 24/05/2020 à 18:48, Philippe Mathieu-Daudé a écrit :
> Convert APM_DPRINTF() to trace events and remove ifdef'ry.
> 
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
>  hw/isa/apm.c        | 15 +++++----------
>  hw/isa/trace-events |  4 ++++
>  2 files changed, 9 insertions(+), 10 deletions(-)
> 
> diff --git a/hw/isa/apm.c b/hw/isa/apm.c
> index 6300b1ba7a..bce266b957 100644
> --- a/hw/isa/apm.c
> +++ b/hw/isa/apm.c
> @@ -24,14 +24,8 @@
>  #include "hw/isa/apm.h"
>  #include "hw/pci/pci.h"
>  #include "migration/vmstate.h"
> +#include "trace.h"
>  
> -//#define DEBUG
> -
> -#ifdef DEBUG
> -# define APM_DPRINTF(format, ...)       printf(format, ## __VA_ARGS__)
> -#else
> -# define APM_DPRINTF(format, ...)       do { } while (0)
> -#endif
>  
>  /* fixed I/O location */
>  #define APM_STS_IOPORT  0xb3
> @@ -41,8 +35,8 @@ static void apm_ioport_writeb(void *opaque, hwaddr addr, uint64_t val,
>  {
>      APMState *apm = opaque;
>      addr &= 1;
> -    APM_DPRINTF("apm_ioport_writeb addr=0x%" HWADDR_PRIx
> -                " val=0x%02" PRIx64 "\n", addr, val);
> +
> +    trace_apm_io_write(addr, val);
>      if (addr == 0) {
>          apm->apmc = val;
>  
> @@ -65,7 +59,8 @@ static uint64_t apm_ioport_readb(void *opaque, hwaddr addr, unsigned size)
>      } else {
>          val = apm->apms;
>      }
> -    APM_DPRINTF("apm_ioport_readb addr=0x%" HWADDR_PRIx " val=0x%02x\n", addr, val);
> +    trace_apm_io_read(addr, val);
> +
>      return val;
>  }
>  
> diff --git a/hw/isa/trace-events b/hw/isa/trace-events
> index 202f8938e7..3544c6213c 100644
> --- a/hw/isa/trace-events
> +++ b/hw/isa/trace-events
> @@ -9,3 +9,7 @@ superio_create_ide(int id, uint16_t base, unsigned int irq) "id=%d, base 0x%03x,
>  # pc87312.c
>  pc87312_io_read(uint32_t addr, uint32_t val) "read addr=0x%x val=0x%x"
>  pc87312_io_write(uint32_t addr, uint32_t val) "write addr=0x%x val=0x%x"
> +
> +# apm.c
> +apm_io_read(uint8_t addr, uint8_t val) "read addr=0x%x val=0x%02x"
> +apm_io_write(uint8_t addr, uint8_t val) "write addr=0x%x val=0x%02x"
> 

Applied to my trivial-patches branch.

Thanks,
Laurent

Patchew 2.1-devel-0870f84

© 2016 - 2024 Red Hat, Inc.