[Qemu-devel] [PATCH 0/3] ppc: replace debug printf with trace points

[Qemu-devel] [PATCH 0/3] ppc: replace debug printf with trace points

[Laurent Vivier]

This series replaces the remaining DPRINTF()
found under hw/ppc and replace them with trace
points.

Laurent Vivier (3):
  mac99: replace debug printf with trace points
  ppc4xx: replace debug printf with trace points
  spapr: replace debug printf with trace points

 hw/ppc/mac_newworld.c | 15 +++------------
 hw/ppc/ppc4xx_pci.c   | 13 +++----------
 hw/ppc/spapr_ovec.c   | 17 +++--------------
 hw/ppc/trace-events   | 12 ++++++++++++
 4 files changed, 21 insertions(+), 36 deletions(-)

-- 
2.9.3

[Qemu-devel] [PATCH 1/3] mac99: replace debug printf with trace points

[Laurent Vivier]

Signed-off-by: Laurent Vivier <lvivier@redhat.com>
---
 hw/ppc/mac_newworld.c | 15 +++------------
 hw/ppc/trace-events   |  4 ++++
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c
index 2bfdb64..3702dd1 100644
--- a/hw/ppc/mac_newworld.c
+++ b/hw/ppc/mac_newworld.c
@@ -72,6 +72,7 @@
 #include "exec/address-spaces.h"
 #include "hw/sysbus.h"
 #include "qemu/cutils.h"
+#include "trace.h"
 
 #define MAX_IDE_BUS 2
 #define CFG_ADDR 0xf0000510
@@ -79,21 +80,11 @@
 #define CLOCKFREQ (266UL * 1000UL * 1000UL)
 #define BUSFREQ (100UL * 1000UL * 1000UL)
 
-/* debug UniNorth */
-//#define DEBUG_UNIN
-
-#ifdef DEBUG_UNIN
-#define UNIN_DPRINTF(fmt, ...)                                  \
-    do { printf("UNIN: " fmt , ## __VA_ARGS__); } while (0)
-#else
-#define UNIN_DPRINTF(fmt, ...)
-#endif
-
 /* UniN device */
 static void unin_write(void *opaque, hwaddr addr, uint64_t value,
                        unsigned size)
 {
-    UNIN_DPRINTF("write addr " TARGET_FMT_plx " val %"PRIx64"\n", addr, value);
+    trace_mac99_uninorth_write(addr, value);
     if (addr == 0x0) {
         *(int*)opaque = value;
     }
@@ -109,7 +100,7 @@ static uint64_t unin_read(void *opaque, hwaddr addr, unsigned size)
         value = *(int*)opaque;
     }
 
-    UNIN_DPRINTF("readl addr " TARGET_FMT_plx " val %x\n", addr, value);
+    trace_mac99_uninorth_read(addr, value);
 
     return value;
 }
diff --git a/hw/ppc/trace-events b/hw/ppc/trace-events
index f46995c..6122a12 100644
--- a/hw/ppc/trace-events
+++ b/hw/ppc/trace-events
@@ -85,3 +85,7 @@ rs6000mc_presence_read(uint32_t addr, uint32_t val) "read addr=%x val=%x"
 rs6000mc_size_read(uint32_t addr, uint32_t val) "read addr=%x val=%x"
 rs6000mc_size_write(uint32_t addr, uint32_t val) "write addr=%x val=%x"
 rs6000mc_parity_read(uint32_t addr, uint32_t val) "read addr=%x val=%x"
+
+# hw/ppc/mac_newworld.c
+mac99_uninorth_write(uint64_t addr, uint64_t value) "addr=0x%" PRIx64 " val=0x%"PRIx64
+mac99_uninorth_read(uint64_t addr, uint64_t value) "addr=0x%" PRIx64 " val=0x%"PRIx64
-- 
2.9.3

Re: [Qemu-devel] [PATCH 1/3] mac99: replace debug printf with trace points

[Philippe Mathieu-Daudé]

On 02/10/2017 06:27 AM, Laurent Vivier wrote:
> Signed-off-by: Laurent Vivier <lvivier@redhat.com>

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

> ---
>  hw/ppc/mac_newworld.c | 15 +++------------
>  hw/ppc/trace-events   |  4 ++++
>  2 files changed, 7 insertions(+), 12 deletions(-)
>
> diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c
> index 2bfdb64..3702dd1 100644
> --- a/hw/ppc/mac_newworld.c
> +++ b/hw/ppc/mac_newworld.c
> @@ -72,6 +72,7 @@
>  #include "exec/address-spaces.h"
>  #include "hw/sysbus.h"
>  #include "qemu/cutils.h"
> +#include "trace.h"
>
>  #define MAX_IDE_BUS 2
>  #define CFG_ADDR 0xf0000510
> @@ -79,21 +80,11 @@
>  #define CLOCKFREQ (266UL * 1000UL * 1000UL)
>  #define BUSFREQ (100UL * 1000UL * 1000UL)
>
> -/* debug UniNorth */
> -//#define DEBUG_UNIN
> -
> -#ifdef DEBUG_UNIN
> -#define UNIN_DPRINTF(fmt, ...)                                  \
> -    do { printf("UNIN: " fmt , ## __VA_ARGS__); } while (0)
> -#else
> -#define UNIN_DPRINTF(fmt, ...)
> -#endif
> -
>  /* UniN device */
>  static void unin_write(void *opaque, hwaddr addr, uint64_t value,
>                         unsigned size)
>  {
> -    UNIN_DPRINTF("write addr " TARGET_FMT_plx " val %"PRIx64"\n", addr, value);
> +    trace_mac99_uninorth_write(addr, value);
>      if (addr == 0x0) {
>          *(int*)opaque = value;
>      }
> @@ -109,7 +100,7 @@ static uint64_t unin_read(void *opaque, hwaddr addr, unsigned size)
>          value = *(int*)opaque;
>      }
>
> -    UNIN_DPRINTF("readl addr " TARGET_FMT_plx " val %x\n", addr, value);
> +    trace_mac99_uninorth_read(addr, value);
>
>      return value;
>  }
> diff --git a/hw/ppc/trace-events b/hw/ppc/trace-events
> index f46995c..6122a12 100644
> --- a/hw/ppc/trace-events
> +++ b/hw/ppc/trace-events
> @@ -85,3 +85,7 @@ rs6000mc_presence_read(uint32_t addr, uint32_t val) "read addr=%x val=%x"
>  rs6000mc_size_read(uint32_t addr, uint32_t val) "read addr=%x val=%x"
>  rs6000mc_size_write(uint32_t addr, uint32_t val) "write addr=%x val=%x"
>  rs6000mc_parity_read(uint32_t addr, uint32_t val) "read addr=%x val=%x"
> +
> +# hw/ppc/mac_newworld.c
> +mac99_uninorth_write(uint64_t addr, uint64_t value) "addr=0x%" PRIx64 " val=0x%"PRIx64
> +mac99_uninorth_read(uint64_t addr, uint64_t value) "addr=0x%" PRIx64 " val=0x%"PRIx64
>

[Qemu-devel] [PATCH 2/3] ppc4xx: replace debug printf with trace points

[Laurent Vivier]

Signed-off-by: Laurent Vivier <lvivier@redhat.com>
---
 hw/ppc/ppc4xx_pci.c | 13 +++----------
 hw/ppc/trace-events |  4 ++++
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/hw/ppc/ppc4xx_pci.c b/hw/ppc/ppc4xx_pci.c
index 683218e..dc19682 100644
--- a/hw/ppc/ppc4xx_pci.c
+++ b/hw/ppc/ppc4xx_pci.c
@@ -26,13 +26,7 @@
 #include "hw/pci/pci.h"
 #include "hw/pci/pci_host.h"
 #include "exec/address-spaces.h"
-
-#undef DEBUG
-#ifdef DEBUG
-#define DPRINTF(fmt, ...) do { printf(fmt, ## __VA_ARGS__); } while (0)
-#else
-#define DPRINTF(fmt, ...)
-#endif /* DEBUG */
+#include "trace.h"
 
 struct PCIMasterMap {
     uint32_t la;
@@ -249,8 +243,7 @@ static int ppc4xx_pci_map_irq(PCIDevice *pci_dev, int irq_num)
 {
     int slot = pci_dev->devfn >> 3;
 
-    DPRINTF("%s: devfn %x irq %d -> %d\n", __func__,
-            pci_dev->devfn, irq_num, slot);
+    trace_ppc4xx_pci_map_irq(pci_dev->devfn, irq_num, slot);
 
     return slot - 1;
 }
@@ -259,7 +252,7 @@ static void ppc4xx_pci_set_irq(void *opaque, int irq_num, int level)
 {
     qemu_irq *pci_irqs = opaque;
 
-    DPRINTF("%s: PCI irq %d\n", __func__, irq_num);
+    trace_ppc4xx_pci_set_irq(irq_num);
     if (irq_num < 0) {
         fprintf(stderr, "%s: PCI irq %d\n", __func__, irq_num);
         return;
diff --git a/hw/ppc/trace-events b/hw/ppc/trace-events
index 6122a12..f04bb1d 100644
--- a/hw/ppc/trace-events
+++ b/hw/ppc/trace-events
@@ -89,3 +89,7 @@ rs6000mc_parity_read(uint32_t addr, uint32_t val) "read addr=%x val=%x"
 # hw/ppc/mac_newworld.c
 mac99_uninorth_write(uint64_t addr, uint64_t value) "addr=0x%" PRIx64 " val=0x%"PRIx64
 mac99_uninorth_read(uint64_t addr, uint64_t value) "addr=0x%" PRIx64 " val=0x%"PRIx64
+
+# hw/ppc/ppc4xx_pci.c
+ppc4xx_pci_map_irq(int32_t devfn, int irq_num, int slot) "devfn %x irq %d -> %d"
+ppc4xx_pci_set_irq(int irq_num) "PCI irq %d"
-- 
2.9.3

Re: [Qemu-devel] [PATCH 2/3] ppc4xx: replace debug printf with trace points

[Philippe Mathieu-Daudé]

On 02/10/2017 06:27 AM, Laurent Vivier wrote:
> Signed-off-by: Laurent Vivier <lvivier@redhat.com>

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

> ---
>  hw/ppc/ppc4xx_pci.c | 13 +++----------
>  hw/ppc/trace-events |  4 ++++
>  2 files changed, 7 insertions(+), 10 deletions(-)
>
> diff --git a/hw/ppc/ppc4xx_pci.c b/hw/ppc/ppc4xx_pci.c
> index 683218e..dc19682 100644
> --- a/hw/ppc/ppc4xx_pci.c
> +++ b/hw/ppc/ppc4xx_pci.c
> @@ -26,13 +26,7 @@
>  #include "hw/pci/pci.h"
>  #include "hw/pci/pci_host.h"
>  #include "exec/address-spaces.h"
> -
> -#undef DEBUG
> -#ifdef DEBUG
> -#define DPRINTF(fmt, ...) do { printf(fmt, ## __VA_ARGS__); } while (0)
> -#else
> -#define DPRINTF(fmt, ...)
> -#endif /* DEBUG */
> +#include "trace.h"
>
>  struct PCIMasterMap {
>      uint32_t la;
> @@ -249,8 +243,7 @@ static int ppc4xx_pci_map_irq(PCIDevice *pci_dev, int irq_num)
>  {
>      int slot = pci_dev->devfn >> 3;
>
> -    DPRINTF("%s: devfn %x irq %d -> %d\n", __func__,
> -            pci_dev->devfn, irq_num, slot);
> +    trace_ppc4xx_pci_map_irq(pci_dev->devfn, irq_num, slot);
>
>      return slot - 1;
>  }
> @@ -259,7 +252,7 @@ static void ppc4xx_pci_set_irq(void *opaque, int irq_num, int level)
>  {
>      qemu_irq *pci_irqs = opaque;
>
> -    DPRINTF("%s: PCI irq %d\n", __func__, irq_num);
> +    trace_ppc4xx_pci_set_irq(irq_num);
>      if (irq_num < 0) {
>          fprintf(stderr, "%s: PCI irq %d\n", __func__, irq_num);
>          return;
> diff --git a/hw/ppc/trace-events b/hw/ppc/trace-events
> index 6122a12..f04bb1d 100644
> --- a/hw/ppc/trace-events
> +++ b/hw/ppc/trace-events
> @@ -89,3 +89,7 @@ rs6000mc_parity_read(uint32_t addr, uint32_t val) "read addr=%x val=%x"
>  # hw/ppc/mac_newworld.c
>  mac99_uninorth_write(uint64_t addr, uint64_t value) "addr=0x%" PRIx64 " val=0x%"PRIx64
>  mac99_uninorth_read(uint64_t addr, uint64_t value) "addr=0x%" PRIx64 " val=0x%"PRIx64
> +
> +# hw/ppc/ppc4xx_pci.c
> +ppc4xx_pci_map_irq(int32_t devfn, int irq_num, int slot) "devfn %x irq %d -> %d"
> +ppc4xx_pci_set_irq(int irq_num) "PCI irq %d"
>

[Qemu-devel] [PATCH 3/3] spapr: replace debug printf with trace points

[Laurent Vivier]

Signed-off-by: Laurent Vivier <lvivier@redhat.com>
---
 hw/ppc/spapr_ovec.c | 17 +++--------------
 hw/ppc/trace-events |  4 ++++
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/hw/ppc/spapr_ovec.c b/hw/ppc/spapr_ovec.c
index 3eb1d59..02ed740 100644
--- a/hw/ppc/spapr_ovec.c
+++ b/hw/ppc/spapr_ovec.c
@@ -16,18 +16,9 @@
 #include "qemu/bitmap.h"
 #include "exec/address-spaces.h"
 #include "qemu/error-report.h"
+#include "trace.h"
 #include <libfdt.h>
 
-/* #define DEBUG_SPAPR_OVEC */
-
-#ifdef DEBUG_SPAPR_OVEC
-#define DPRINTFN(fmt, ...) \
-    do { fprintf(stderr, fmt "\n", ## __VA_ARGS__); } while (0)
-#else
-#define DPRINTFN(fmt, ...) \
-    do { } while (0)
-#endif
-
 #define OV_MAXBYTES 256 /* not including length byte */
 #define OV_MAXBITS (OV_MAXBYTES * BITS_PER_BYTE)
 
@@ -210,8 +201,7 @@ sPAPROptionVector *spapr_ovec_parse_vector(target_ulong table_addr, int vector)
     for (i = 0; i < vector_len; i++) {
         uint8_t entry = ldub_phys(&address_space_memory, addr + i);
         if (entry) {
-            DPRINTFN("read guest vector %2d, byte %3d / %3d: 0x%.2x",
-                     vector, i + 1, vector_len, entry);
+            trace_spapr_ovec_parse_vector(vector, i + 1, vector_len, entry);
             guest_byte_to_bitmap(entry, ov->bitmap, i * BITS_PER_BYTE);
         }
     }
@@ -245,8 +235,7 @@ int spapr_ovec_populate_dt(void *fdt, int fdt_offset,
     for (i = 1; i < vec_len + 1; i++) {
         vec[i] = guest_byte_from_bitmap(ov->bitmap, (i - 1) * BITS_PER_BYTE);
         if (vec[i]) {
-            DPRINTFN("encoding guest vector byte %3d / %3d: 0x%.2x",
-                     i, vec_len, vec[i]);
+            trace_spapr_ovec_populate_dt(i, vec_len, vec[i]);
         }
     }
 
diff --git a/hw/ppc/trace-events b/hw/ppc/trace-events
index f04bb1d..43d265f 100644
--- a/hw/ppc/trace-events
+++ b/hw/ppc/trace-events
@@ -56,6 +56,10 @@ spapr_drc_realize_child(uint32_t index, char *childname) "drc: 0x%"PRIx32", chil
 spapr_drc_realize_complete(uint32_t index) "drc: 0x%"PRIx32
 spapr_drc_unrealize(uint32_t index) "drc: 0x%"PRIx32
 
+# hw/ppc/spapr_ovec.c
+spapr_ovec_parse_vector(int vector, int byte, uint16_t vec_len, uint8_t entry) "read guest vector %2d, byte %3d / %3d: 0x%.2x"
+spapr_ovec_populate_dt(int byte, uint16_t vec_len, uint8_t entry) "encoding guest vector byte %3d / %3d: 0x%.2x"
+
 # hw/ppc/spapr_rtas.c
 spapr_rtas_set_indicator_invalid(uint32_t index) "sensor index: 0x%"PRIx32
 spapr_rtas_set_indicator_not_supported(uint32_t index, uint32_t type) "sensor index: 0x%"PRIx32", type: %"PRIu32
-- 
2.9.3

Re: [Qemu-devel] [PATCH 3/3] spapr: replace debug printf with trace points

[Philippe Mathieu-Daudé]

On 02/10/2017 06:27 AM, Laurent Vivier wrote:
> Signed-off-by: Laurent Vivier <lvivier@redhat.com>

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

> ---
>  hw/ppc/spapr_ovec.c | 17 +++--------------
>  hw/ppc/trace-events |  4 ++++
>  2 files changed, 7 insertions(+), 14 deletions(-)
>
> diff --git a/hw/ppc/spapr_ovec.c b/hw/ppc/spapr_ovec.c
> index 3eb1d59..02ed740 100644
> --- a/hw/ppc/spapr_ovec.c
> +++ b/hw/ppc/spapr_ovec.c
> @@ -16,18 +16,9 @@
>  #include "qemu/bitmap.h"
>  #include "exec/address-spaces.h"
>  #include "qemu/error-report.h"
> +#include "trace.h"
>  #include <libfdt.h>
>
> -/* #define DEBUG_SPAPR_OVEC */
> -
> -#ifdef DEBUG_SPAPR_OVEC
> -#define DPRINTFN(fmt, ...) \
> -    do { fprintf(stderr, fmt "\n", ## __VA_ARGS__); } while (0)
> -#else
> -#define DPRINTFN(fmt, ...) \
> -    do { } while (0)
> -#endif
> -
>  #define OV_MAXBYTES 256 /* not including length byte */
>  #define OV_MAXBITS (OV_MAXBYTES * BITS_PER_BYTE)
>
> @@ -210,8 +201,7 @@ sPAPROptionVector *spapr_ovec_parse_vector(target_ulong table_addr, int vector)
>      for (i = 0; i < vector_len; i++) {
>          uint8_t entry = ldub_phys(&address_space_memory, addr + i);
>          if (entry) {
> -            DPRINTFN("read guest vector %2d, byte %3d / %3d: 0x%.2x",
> -                     vector, i + 1, vector_len, entry);
> +            trace_spapr_ovec_parse_vector(vector, i + 1, vector_len, entry);
>              guest_byte_to_bitmap(entry, ov->bitmap, i * BITS_PER_BYTE);
>          }
>      }
> @@ -245,8 +235,7 @@ int spapr_ovec_populate_dt(void *fdt, int fdt_offset,
>      for (i = 1; i < vec_len + 1; i++) {
>          vec[i] = guest_byte_from_bitmap(ov->bitmap, (i - 1) * BITS_PER_BYTE);
>          if (vec[i]) {
> -            DPRINTFN("encoding guest vector byte %3d / %3d: 0x%.2x",
> -                     i, vec_len, vec[i]);
> +            trace_spapr_ovec_populate_dt(i, vec_len, vec[i]);
>          }
>      }
>
> diff --git a/hw/ppc/trace-events b/hw/ppc/trace-events
> index f04bb1d..43d265f 100644
> --- a/hw/ppc/trace-events
> +++ b/hw/ppc/trace-events
> @@ -56,6 +56,10 @@ spapr_drc_realize_child(uint32_t index, char *childname) "drc: 0x%"PRIx32", chil
>  spapr_drc_realize_complete(uint32_t index) "drc: 0x%"PRIx32
>  spapr_drc_unrealize(uint32_t index) "drc: 0x%"PRIx32
>
> +# hw/ppc/spapr_ovec.c
> +spapr_ovec_parse_vector(int vector, int byte, uint16_t vec_len, uint8_t entry) "read guest vector %2d, byte %3d / %3d: 0x%.2x"
> +spapr_ovec_populate_dt(int byte, uint16_t vec_len, uint8_t entry) "encoding guest vector byte %3d / %3d: 0x%.2x"
> +
>  # hw/ppc/spapr_rtas.c
>  spapr_rtas_set_indicator_invalid(uint32_t index) "sensor index: 0x%"PRIx32
>  spapr_rtas_set_indicator_not_supported(uint32_t index, uint32_t type) "sensor index: 0x%"PRIx32", type: %"PRIu32
>

Re: [Qemu-devel] [PATCH 0/3] ppc: replace debug printf with trace points

[no-reply]

Hi,

Your series failed automatic build test. Please find the testing commands and
their output below. If you have docker installed, you can probably reproduce it
locally.

Subject: [Qemu-devel] [PATCH 0/3] ppc: replace debug printf with trace points
Message-id: 20170210092724.6470-1-lvivier@redhat.com
Type: series

=== TEST SCRIPT BEGIN ===
#!/bin/bash
set -e
git submodule update --init dtc
# Let docker tests dump environment info
export SHOW_ENV=1
export J=16
make docker-test-quick@centos6
make docker-test-mingw@fedora
make docker-test-build@min-glib
=== TEST SCRIPT END ===

Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
Switched to a new branch 'test'
72c23c4 spapr: replace debug printf with trace points
19a5179 ppc4xx: replace debug printf with trace points
63a95bd mac99: replace debug printf with trace points

=== OUTPUT BEGIN ===
Submodule 'dtc' (git://git.qemu-project.org/dtc.git) registered for path 'dtc'
fatal: read error: Connection reset by peer
Cloning into 'dtc'...
Clone of 'git://git.qemu-project.org/dtc.git' into submodule path 'dtc' failed
=== OUTPUT END ===

Test command exited with code: 1


---
Email generated automatically by Patchew [http://patchew.org/].
Please send your feedback to patchew-devel@freelists.org

Re: [Qemu-devel] [PATCH 0/3] ppc: replace debug printf with trace points

[David Gibson]

[-- Attachment #1: Type: text/plain, Size: 832 bytes --]

On Fri, Feb 10, 2017 at 10:27:21AM +0100, Laurent Vivier wrote:
> This series replaces the remaining DPRINTF()
> found under hw/ppc and replace them with trace
> points.
> 
> Laurent Vivier (3):
>   mac99: replace debug printf with trace points
>   ppc4xx: replace debug printf with trace points
>   spapr: replace debug printf with trace points
> 
>  hw/ppc/mac_newworld.c | 15 +++------------
>  hw/ppc/ppc4xx_pci.c   | 13 +++----------
>  hw/ppc/spapr_ovec.c   | 17 +++--------------
>  hw/ppc/trace-events   | 12 ++++++++++++
>  4 files changed, 21 insertions(+), 36 deletions(-)

Applied to ppc-for-2.9, thanks.


-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]