diff mbox series

[v3,11/11] hw/intc/arm_gic: modernise the DPRINTF

Message ID 20170307155054.5833-12-alex.bennee@linaro.org
State Superseded
Headers show
Series MTTCG fix-ups for 2.9 | expand

Commit Message

Alex Bennée March 7, 2017, 3:50 p.m. UTC
While I was debugging the icount issues I realised a bunch of the
messages look quite similar. I've fixed this by including __func__ in
the debug print. At the same time I move the a modern if (GATE) style
printf which ensures the compiler can check for format string errors
even if the code gets optimised away in the non-DEBUG_GIC case.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>

---
 hw/intc/arm_gic.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

-- 
2.11.0

Comments

Philippe Mathieu-Daudé March 7, 2017, 5:53 p.m. UTC | #1
On 03/07/2017 12:50 PM, Alex Bennée wrote:
> While I was debugging the icount issues I realised a bunch of the

> messages look quite similar. I've fixed this by including __func__ in

> the debug print. At the same time I move the a modern if (GATE) style

> printf which ensures the compiler can check for format string errors

> even if the code gets optimised away in the non-DEBUG_GIC case.

>

> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

> Reviewed-by: Peter Maydell <peter.maydell@linaro.org>


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


> ---

>  hw/intc/arm_gic.c | 13 +++++++++----

>  1 file changed, 9 insertions(+), 4 deletions(-)

>

> diff --git a/hw/intc/arm_gic.c b/hw/intc/arm_gic.c

> index 8e5a9d8a3e..b305d9032a 100644

> --- a/hw/intc/arm_gic.c

> +++ b/hw/intc/arm_gic.c

> @@ -26,15 +26,20 @@

>  #include "qemu/log.h"

>  #include "trace.h"

>

> -//#define DEBUG_GIC

> +/* #define DEBUG_GIC */

>

>  #ifdef DEBUG_GIC

> -#define DPRINTF(fmt, ...) \

> -do { fprintf(stderr, "arm_gic: " fmt , ## __VA_ARGS__); } while (0)

> +#define DEBUG_GIC_GATE 1

>  #else

> -#define DPRINTF(fmt, ...) do {} while(0)

> +#define DEBUG_GIC_GATE 0

>  #endif

>

> +#define DPRINTF(fmt, ...) do {                                          \

> +        if (DEBUG_GIC_GATE) {                                           \

> +            fprintf(stderr, "%s: " fmt, __func__, ## __VA_ARGS__);      \

> +        }                                                               \

> +    } while (0)

> +

>  static const uint8_t gic_id_11mpcore[] = {

>      0x00, 0x00, 0x00, 0x00, 0x90, 0x13, 0x04, 0x00, 0x0d, 0xf0, 0x05, 0xb1

>  };

>
diff mbox series

Patch

diff --git a/hw/intc/arm_gic.c b/hw/intc/arm_gic.c
index 8e5a9d8a3e..b305d9032a 100644
--- a/hw/intc/arm_gic.c
+++ b/hw/intc/arm_gic.c
@@ -26,15 +26,20 @@ 
 #include "qemu/log.h"
 #include "trace.h"
 
-//#define DEBUG_GIC
+/* #define DEBUG_GIC */
 
 #ifdef DEBUG_GIC
-#define DPRINTF(fmt, ...) \
-do { fprintf(stderr, "arm_gic: " fmt , ## __VA_ARGS__); } while (0)
+#define DEBUG_GIC_GATE 1
 #else
-#define DPRINTF(fmt, ...) do {} while(0)
+#define DEBUG_GIC_GATE 0
 #endif
 
+#define DPRINTF(fmt, ...) do {                                          \
+        if (DEBUG_GIC_GATE) {                                           \
+            fprintf(stderr, "%s: " fmt, __func__, ## __VA_ARGS__);      \
+        }                                                               \
+    } while (0)
+
 static const uint8_t gic_id_11mpcore[] = {
     0x00, 0x00, 0x00, 0x00, 0x90, 0x13, 0x04, 0x00, 0x0d, 0xf0, 0x05, 0xb1
 };