* [PATCH] hw/nvram/mac_nvram: Convert debug printf()s to trace events
@ 2020-05-24 16:51 Philippe Mathieu-Daudé
2020-05-25 5:07 ` David Gibson
2020-05-25 9:16 ` Mark Cave-Ayland
0 siblings, 2 replies; 3+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-05-24 16:51 UTC (permalink / raw)
To: qemu-devel
Cc: qemu-trivial, Mark Cave-Ayland, qemu-ppc,
Philippe Mathieu-Daudé, David Gibson
Convert NVR_DPRINTF() to trace events and remove ifdef'ry.
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
hw/nvram/mac_nvram.c | 17 +++--------------
hw/nvram/trace-events | 4 ++++
2 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/hw/nvram/mac_nvram.c b/hw/nvram/mac_nvram.c
index ff5db03e6b..beec1c4e4d 100644
--- a/hw/nvram/mac_nvram.c
+++ b/hw/nvram/mac_nvram.c
@@ -30,18 +30,9 @@
#include "migration/vmstate.h"
#include "qemu/cutils.h"
#include "qemu/module.h"
+#include "trace.h"
#include <zlib.h>
-/* debug NVR */
-//#define DEBUG_NVR
-
-#ifdef DEBUG_NVR
-#define NVR_DPRINTF(fmt, ...) \
- do { printf("NVR: " fmt , ## __VA_ARGS__); } while (0)
-#else
-#define NVR_DPRINTF(fmt, ...)
-#endif
-
#define DEF_SYSTEM_SIZE 0xc10
/* macio style NVRAM device */
@@ -51,9 +42,8 @@ static void macio_nvram_writeb(void *opaque, hwaddr addr,
MacIONVRAMState *s = opaque;
addr = (addr >> s->it_shift) & (s->size - 1);
+ trace_macio_nvram_write(addr, value);
s->data[addr] = value;
- NVR_DPRINTF("writeb addr %04" HWADDR_PRIx " val %" PRIx64 "\n",
- addr, value);
}
static uint64_t macio_nvram_readb(void *opaque, hwaddr addr,
@@ -64,8 +54,7 @@ static uint64_t macio_nvram_readb(void *opaque, hwaddr addr,
addr = (addr >> s->it_shift) & (s->size - 1);
value = s->data[addr];
- NVR_DPRINTF("readb addr %04" HWADDR_PRIx " val %" PRIx32 "\n",
- addr, value);
+ trace_macio_nvram_read(addr, value);
return value;
}
diff --git a/hw/nvram/trace-events b/hw/nvram/trace-events
index 0dea9260ce..e023193295 100644
--- a/hw/nvram/trace-events
+++ b/hw/nvram/trace-events
@@ -13,3 +13,7 @@ fw_cfg_add_string(uint16_t key_value, const char *key_name, const char *value) "
fw_cfg_add_i16(uint16_t key_value, const char *key_name, uint16_t value) "key 0x%04" PRIx16 " '%s', value 0x%" PRIx16
fw_cfg_add_i32(uint16_t key_value, const char *key_name, uint32_t value) "key 0x%04" PRIx16 " '%s', value 0x%" PRIx32
fw_cfg_add_i64(uint16_t key_value, const char *key_name, uint64_t value) "key 0x%04" PRIx16 " '%s', value 0x%" PRIx64
+
+# mac_nvram.c
+macio_nvram_read(uint32_t addr, uint8_t val) "read addr=0x%04"PRIx32" val=0x%02x"
+macio_nvram_write(uint32_t addr, uint8_t val) "write addr=0x%04"PRIx32" val=0x%02x"
--
2.21.3
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] hw/nvram/mac_nvram: Convert debug printf()s to trace events
2020-05-24 16:51 [PATCH] hw/nvram/mac_nvram: Convert debug printf()s to trace events Philippe Mathieu-Daudé
@ 2020-05-25 5:07 ` David Gibson
2020-05-25 9:16 ` Mark Cave-Ayland
1 sibling, 0 replies; 3+ messages in thread
From: David Gibson @ 2020-05-25 5:07 UTC (permalink / raw)
To: Philippe Mathieu-Daudé; +Cc: qemu-trivial, qemu-ppc, qemu-devel
[-- Attachment #1: Type: text/plain, Size: 2859 bytes --]
On Sun, May 24, 2020 at 06:51:26PM +0200, Philippe Mathieu-Daudé wrote:
> Convert NVR_DPRINTF() to trace events and remove ifdef'ry.
>
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Applied to ppc-for-5.1, thanks.
> ---
> hw/nvram/mac_nvram.c | 17 +++--------------
> hw/nvram/trace-events | 4 ++++
> 2 files changed, 7 insertions(+), 14 deletions(-)
>
> diff --git a/hw/nvram/mac_nvram.c b/hw/nvram/mac_nvram.c
> index ff5db03e6b..beec1c4e4d 100644
> --- a/hw/nvram/mac_nvram.c
> +++ b/hw/nvram/mac_nvram.c
> @@ -30,18 +30,9 @@
> #include "migration/vmstate.h"
> #include "qemu/cutils.h"
> #include "qemu/module.h"
> +#include "trace.h"
> #include <zlib.h>
>
> -/* debug NVR */
> -//#define DEBUG_NVR
> -
> -#ifdef DEBUG_NVR
> -#define NVR_DPRINTF(fmt, ...) \
> - do { printf("NVR: " fmt , ## __VA_ARGS__); } while (0)
> -#else
> -#define NVR_DPRINTF(fmt, ...)
> -#endif
> -
> #define DEF_SYSTEM_SIZE 0xc10
>
> /* macio style NVRAM device */
> @@ -51,9 +42,8 @@ static void macio_nvram_writeb(void *opaque, hwaddr addr,
> MacIONVRAMState *s = opaque;
>
> addr = (addr >> s->it_shift) & (s->size - 1);
> + trace_macio_nvram_write(addr, value);
> s->data[addr] = value;
> - NVR_DPRINTF("writeb addr %04" HWADDR_PRIx " val %" PRIx64 "\n",
> - addr, value);
> }
>
> static uint64_t macio_nvram_readb(void *opaque, hwaddr addr,
> @@ -64,8 +54,7 @@ static uint64_t macio_nvram_readb(void *opaque, hwaddr addr,
>
> addr = (addr >> s->it_shift) & (s->size - 1);
> value = s->data[addr];
> - NVR_DPRINTF("readb addr %04" HWADDR_PRIx " val %" PRIx32 "\n",
> - addr, value);
> + trace_macio_nvram_read(addr, value);
>
> return value;
> }
> diff --git a/hw/nvram/trace-events b/hw/nvram/trace-events
> index 0dea9260ce..e023193295 100644
> --- a/hw/nvram/trace-events
> +++ b/hw/nvram/trace-events
> @@ -13,3 +13,7 @@ fw_cfg_add_string(uint16_t key_value, const char *key_name, const char *value) "
> fw_cfg_add_i16(uint16_t key_value, const char *key_name, uint16_t value) "key 0x%04" PRIx16 " '%s', value 0x%" PRIx16
> fw_cfg_add_i32(uint16_t key_value, const char *key_name, uint32_t value) "key 0x%04" PRIx16 " '%s', value 0x%" PRIx32
> fw_cfg_add_i64(uint16_t key_value, const char *key_name, uint64_t value) "key 0x%04" PRIx16 " '%s', value 0x%" PRIx64
> +
> +# mac_nvram.c
> +macio_nvram_read(uint32_t addr, uint8_t val) "read addr=0x%04"PRIx32" val=0x%02x"
> +macio_nvram_write(uint32_t addr, uint8_t val) "write addr=0x%04"PRIx32" val=0x%02x"
--
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: 833 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] hw/nvram/mac_nvram: Convert debug printf()s to trace events
2020-05-24 16:51 [PATCH] hw/nvram/mac_nvram: Convert debug printf()s to trace events Philippe Mathieu-Daudé
2020-05-25 5:07 ` David Gibson
@ 2020-05-25 9:16 ` Mark Cave-Ayland
1 sibling, 0 replies; 3+ messages in thread
From: Mark Cave-Ayland @ 2020-05-25 9:16 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-devel
Cc: qemu-trivial, qemu-ppc, David Gibson
On 24/05/2020 17:51, Philippe Mathieu-Daudé wrote:
> Convert NVR_DPRINTF() to trace events and remove ifdef'ry.
>
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
> hw/nvram/mac_nvram.c | 17 +++--------------
> hw/nvram/trace-events | 4 ++++
> 2 files changed, 7 insertions(+), 14 deletions(-)
>
> diff --git a/hw/nvram/mac_nvram.c b/hw/nvram/mac_nvram.c
> index ff5db03e6b..beec1c4e4d 100644
> --- a/hw/nvram/mac_nvram.c
> +++ b/hw/nvram/mac_nvram.c
> @@ -30,18 +30,9 @@
> #include "migration/vmstate.h"
> #include "qemu/cutils.h"
> #include "qemu/module.h"
> +#include "trace.h"
> #include <zlib.h>
>
> -/* debug NVR */
> -//#define DEBUG_NVR
> -
> -#ifdef DEBUG_NVR
> -#define NVR_DPRINTF(fmt, ...) \
> - do { printf("NVR: " fmt , ## __VA_ARGS__); } while (0)
> -#else
> -#define NVR_DPRINTF(fmt, ...)
> -#endif
> -
> #define DEF_SYSTEM_SIZE 0xc10
>
> /* macio style NVRAM device */
> @@ -51,9 +42,8 @@ static void macio_nvram_writeb(void *opaque, hwaddr addr,
> MacIONVRAMState *s = opaque;
>
> addr = (addr >> s->it_shift) & (s->size - 1);
> + trace_macio_nvram_write(addr, value);
> s->data[addr] = value;
> - NVR_DPRINTF("writeb addr %04" HWADDR_PRIx " val %" PRIx64 "\n",
> - addr, value);
> }
>
> static uint64_t macio_nvram_readb(void *opaque, hwaddr addr,
> @@ -64,8 +54,7 @@ static uint64_t macio_nvram_readb(void *opaque, hwaddr addr,
>
> addr = (addr >> s->it_shift) & (s->size - 1);
> value = s->data[addr];
> - NVR_DPRINTF("readb addr %04" HWADDR_PRIx " val %" PRIx32 "\n",
> - addr, value);
> + trace_macio_nvram_read(addr, value);
>
> return value;
> }
> diff --git a/hw/nvram/trace-events b/hw/nvram/trace-events
> index 0dea9260ce..e023193295 100644
> --- a/hw/nvram/trace-events
> +++ b/hw/nvram/trace-events
> @@ -13,3 +13,7 @@ fw_cfg_add_string(uint16_t key_value, const char *key_name, const char *value) "
> fw_cfg_add_i16(uint16_t key_value, const char *key_name, uint16_t value) "key 0x%04" PRIx16 " '%s', value 0x%" PRIx16
> fw_cfg_add_i32(uint16_t key_value, const char *key_name, uint32_t value) "key 0x%04" PRIx16 " '%s', value 0x%" PRIx32
> fw_cfg_add_i64(uint16_t key_value, const char *key_name, uint64_t value) "key 0x%04" PRIx16 " '%s', value 0x%" PRIx64
> +
> +# mac_nvram.c
> +macio_nvram_read(uint32_t addr, uint8_t val) "read addr=0x%04"PRIx32" val=0x%02x"
> +macio_nvram_write(uint32_t addr, uint8_t val) "write addr=0x%04"PRIx32" val=0x%02x"
Looks good to me.
Reviewed-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
ATB,
Mark.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-05-25 9:17 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-05-24 16:51 [PATCH] hw/nvram/mac_nvram: Convert debug printf()s to trace events Philippe Mathieu-Daudé
2020-05-25 5:07 ` David Gibson
2020-05-25 9:16 ` Mark Cave-Ayland
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).