From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37229) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wlnez-0006kH-LO for qemu-devel@nongnu.org; Sat, 17 May 2014 19:05:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wlneq-00045v-Fp for qemu-devel@nongnu.org; Sat, 17 May 2014 19:04:57 -0400 Received: from mail-we0-x233.google.com ([2a00:1450:400c:c03::233]:35009) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wlneq-00045r-AJ for qemu-devel@nongnu.org; Sat, 17 May 2014 19:04:48 -0400 Received: by mail-we0-f179.google.com with SMTP id q59so3990842wes.38 for ; Sat, 17 May 2014 16:04:47 -0700 (PDT) From: =?UTF-8?q?Marc=20Mar=C3=AD?= Date: Sun, 18 May 2014 01:03:39 +0200 Message-Id: <1400367823-32610-13-git-send-email-marc.mari.barcelo@gmail.com> In-Reply-To: <1400367823-32610-1-git-send-email-marc.mari.barcelo@gmail.com> References: <1400367823-32610-1-git-send-email-marc.mari.barcelo@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PATCH v3 12/16] sd: Convert debug printfs to QEMU_DPRINTF List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Marc=20Mar=C3=AD?= , Stefan Hajnoczi , Peter Crosthwaite , =?UTF-8?q?Andreas=20F=C3=A4rber?= Modify debug macros to have the same format through the codebase and use regular ifs instead of ifdef. Signed-off-by: Marc Marí --- hw/sd/sd.c | 8 +++++--- hw/sd/ssi-sd.c | 19 ++++++++++++------- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 4502ad1..46ad8f4 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -37,12 +37,14 @@ //#define DEBUG_SD 1 #ifdef DEBUG_SD -#define DPRINTF(fmt, ...) \ -do { fprintf(stderr, "SD: " fmt , ## __VA_ARGS__); } while (0) +#define DEBUG_SD_ENABLED 1 #else -#define DPRINTF(fmt, ...) do {} while(0) +#define DEBUG_SD_ENABLED 0 #endif +#define DPRINTF(fmt, ...) \ + QEMU_DPRINTF(DEBUG_SD_ENABLED, "SD", fmt, ## __VA_ARGS__) + #define ACMD41_ENQUIRY_MASK 0x00ffffff typedef enum { diff --git a/hw/sd/ssi-sd.c b/hw/sd/ssi-sd.c index b012e57..cd6fc7b 100644 --- a/hw/sd/ssi-sd.c +++ b/hw/sd/ssi-sd.c @@ -17,16 +17,21 @@ //#define DEBUG_SSI_SD 1 #ifdef DEBUG_SSI_SD -#define DPRINTF(fmt, ...) \ -do { printf("ssi_sd: " fmt , ## __VA_ARGS__); } while (0) -#define BADF(fmt, ...) \ -do { fprintf(stderr, "ssi_sd: error: " fmt , ## __VA_ARGS__); exit(1);} while (0) +#define DEBUG_SSI_SD_ENABLED 1 #else -#define DPRINTF(fmt, ...) do {} while(0) -#define BADF(fmt, ...) \ -do { fprintf(stderr, "ssi_sd: error: " fmt , ## __VA_ARGS__);} while (0) +#define DEBUG_SSI_SD_ENABLED 0 #endif +#define DPRINTF(fmt, ...) \ + QEMU_DPRINTF(DEBUG_SSI_SD_ENABLED, "ssi_sd", fmt, ## __VA_ARGS__) +#define BADF(fmt, ...) \ + do { \ + QEMU_DPRINTF(1, "ssi_sd error", fmt, ## __VA_ARGS__); \ + if(DEBUG_SSI_SD_ENABLED) { \ + exit(1); \ + } \ + } while (0) + typedef enum { SSI_SD_CMD, SSI_SD_CMDARG, -- 1.7.10.4