From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52666) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wk6lf-0004QI-JZ for qemu-devel@nongnu.org; Tue, 13 May 2014 03:05:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wk6lW-00015U-A4 for qemu-devel@nongnu.org; Tue, 13 May 2014 03:04:51 -0400 Received: from mail-wi0-x229.google.com ([2a00:1450:400c:c05::229]:40276) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wk6lW-00015L-3X for qemu-devel@nongnu.org; Tue, 13 May 2014 03:04:42 -0400 Received: by mail-wi0-f169.google.com with SMTP id hi2so6611517wib.4 for ; Tue, 13 May 2014 00:04:41 -0700 (PDT) From: =?UTF-8?q?Marc=20Mar=C3=AD?= Date: Tue, 13 May 2014 09:02:48 +0200 Message-Id: <1399964572-5376-13-git-send-email-marc.mari.barcelo@gmail.com> In-Reply-To: <1399964572-5376-1-git-send-email-marc.mari.barcelo@gmail.com> References: <1399964572-5376-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 v2 12/16] sd: Convert conditional compilation of debug printfs to regular ifs 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. As the debug printf is always put in code, some casting had to be added to avoid warnings treated as errors at compile time. Signed-off-by: Marc Marí --- hw/sd/sd.c | 7 ++++--- hw/sd/ssi-sd.c | 14 +++++++------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 4502ad1..4a11466 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -37,12 +37,13 @@ //#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..8048056 100644 --- a/hw/sd/ssi-sd.c +++ b/hw/sd/ssi-sd.c @@ -17,16 +17,16 @@ //#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, ...) \ + QEMU_DPRINTF(1, "ssi_sd error", fmt, ## __VA_ARGS__); \ + do { if(DEBUG_SSI_SD_ENABLED) { exit(1); } } while (0) + typedef enum { SSI_SD_CMD, SSI_SD_CMDARG, -- 1.7.10.4