qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Marc Marí" <marc.mari.barcelo@gmail.com>
To: qemu-devel@nongnu.org
Cc: "Marc Marí" <marc.mari.barcelo@gmail.com>,
	"Stefan Hajnoczi" <stefanha@gmail.com>,
	"Peter Crosthwaite" <peter.crosthwaite@xilinx.com>,
	"Andreas Färber" <afaerber@suse.de>
Subject: [Qemu-devel] [PATCH v3 08/16] stellaris: Convert debug printfs to QEMU_DPRINTF
Date: Sun, 18 May 2014 01:03:35 +0200	[thread overview]
Message-ID: <1400367823-32610-9-git-send-email-marc.mari.barcelo@gmail.com> (raw)
In-Reply-To: <1400367823-32610-1-git-send-email-marc.mari.barcelo@gmail.com>

Modify debug macros to have the same format through the codebase and use regular
ifs instead of ifdef.

Signed-off-by: Marc Marí <marc.mari.barcelo@gmail.com>
---
 hw/net/stellaris_enet.c |   21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/hw/net/stellaris_enet.c b/hw/net/stellaris_enet.c
index c9ee5d3..ea2b150 100644
--- a/hw/net/stellaris_enet.c
+++ b/hw/net/stellaris_enet.c
@@ -13,16 +13,23 @@
 //#define DEBUG_STELLARIS_ENET 1
 
 #ifdef DEBUG_STELLARIS_ENET
-#define DPRINTF(fmt, ...) \
-do { printf("stellaris_enet: " fmt , ## __VA_ARGS__); } while (0)
-#define BADF(fmt, ...) \
-do { fprintf(stderr, "stellaris_enet: error: " fmt , ## __VA_ARGS__); exit(1);} while (0)
+#define DEBUG_STELLARIS_ENET_ENABLED 1
 #else
-#define DPRINTF(fmt, ...) do {} while(0)
-#define BADF(fmt, ...) \
-do { fprintf(stderr, "stellaris_enet: error: " fmt , ## __VA_ARGS__);} while (0)
+#define DEBUG_STELLARIS_ENET_ENABLED 0
 #endif
 
+#define DPRINTF(fmt, ...) \
+    QEMU_DPRINTF(DEBUG_STELLARIS_ENET_ENABLED, \
+                "stellaris_enet", fmt, ## __VA_ARGS__)
+
+#define BADF(fmt, ...) \
+    do { \
+        QEMU_DPRINTF(1, "stellaris_enet error", fmt, ## __VA_ARGS__); \
+        if (DEBUG_STELLARIS_ENET_ENABLED) { \
+            exit(1); \
+        }\
+    } while (0)
+
 #define SE_INT_RX       0x01
 #define SE_INT_TXER     0x02
 #define SE_INT_TXEMP    0x04
-- 
1.7.10.4

  parent reply	other threads:[~2014-05-17 23:05 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-05-17 23:03 [Qemu-devel] [PATCH v3 00/16] Convert debug printfs to QEMU_DPRINTF Marc Marí
2014-05-17 23:03 ` [Qemu-devel] [PATCH v3 01/16] include/qemu-common.h: Add QEMU_DPRINTF macro Marc Marí
2014-05-19 15:28   ` Eric Blake
2014-05-17 23:03 ` [Qemu-devel] [PATCH v3 02/16] x86: Convert debug printfs to QEMU_DPRINTF Marc Marí
2014-05-19 15:48   ` Eric Blake
2014-05-17 23:03 ` [Qemu-devel] [PATCH v3 03/16] s390: " Marc Marí
2014-05-18  9:37   ` Peter Crosthwaite
2014-05-19 11:50     ` Alexander Graf
2014-05-19 16:45     ` Marc Marí
2014-05-19 16:50       ` Richard Henderson
2014-05-19 20:33         ` Peter Crosthwaite
2014-05-19 20:34           ` Alexander Graf
2014-05-17 23:03 ` [Qemu-devel] [PATCH v3 04/16] scsi: " Marc Marí
2014-05-17 23:03 ` [Qemu-devel] [PATCH v3 05/16] highbank: " Marc Marí
2014-05-17 23:03 ` [Qemu-devel] [PATCH v3 06/16] xilinx: " Marc Marí
2014-05-17 23:03 ` [Qemu-devel] [PATCH v3 07/16] spapr: " Marc Marí
2014-05-17 23:03 ` Marc Marí [this message]
2014-05-17 23:03 ` [Qemu-devel] [PATCH v3 09/16] i82374: " Marc Marí
2014-05-17 23:03 ` [Qemu-devel] [PATCH v3 10/16] i8257: " Marc Marí
2014-05-17 23:03 ` [Qemu-devel] [PATCH v3 11/16] rc4030: " Marc Marí
2014-05-17 23:03 ` [Qemu-devel] [PATCH v3 12/16] sd: " Marc Marí
2014-05-19 21:05   ` Eric Blake
2014-05-17 23:03 ` [Qemu-devel] [PATCH v3 13/16] isa: " Marc Marí
2014-05-19 21:07   ` Eric Blake
2014-05-20  6:39     ` Marc Marí
2014-05-17 23:03 ` [Qemu-devel] [PATCH v3 14/16] lan9118: " Marc Marí
2014-05-17 23:03 ` [Qemu-devel] [PATCH v3 15/16] pci-host: " Marc Marí
2014-05-17 23:03 ` [Qemu-devel] [PATCH v3 16/16] common: " Marc Marí

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1400367823-32610-9-git-send-email-marc.mari.barcelo@gmail.com \
    --to=marc.mari.barcelo@gmail.com \
    --cc=afaerber@suse.de \
    --cc=peter.crosthwaite@xilinx.com \
    --cc=qemu-devel@nongnu.org \
    --cc=stefanha@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).