From patchwork Tue May 13 07:02:39 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marc_Mar=C3=AD?= X-Patchwork-Id: 348257 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 1AD2E1400B8 for ; Tue, 13 May 2014 17:07:06 +1000 (EST) Received: from localhost ([::1]:42165 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wk6nn-0007vn-Rh for incoming@patchwork.ozlabs.org; Tue, 13 May 2014 03:07:03 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52523) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wk6lT-000409-F5 for qemu-devel@nongnu.org; Tue, 13 May 2014 03:04:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wk6lJ-00012Q-3B for qemu-devel@nongnu.org; Tue, 13 May 2014 03:04:39 -0400 Received: from mail-we0-x22f.google.com ([2a00:1450:400c:c03::22f]:56779) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wk6lI-00012M-Pb; Tue, 13 May 2014 03:04:29 -0400 Received: by mail-we0-f175.google.com with SMTP id t61so7791212wes.20 for ; Tue, 13 May 2014 00:04:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=C2VmbRIVMKjAdh372vmyc6Gx9YC4GtAC/oRvodi13Ao=; b=Hu88CocxquEydCSevcKuqV2oCQvAMLiJLcyYiErS+Lfi/5+EFm1B9k3eQJzidG/Mf+ 6dosTGBCUCr4ER+kJesTd+s8quRYTsYpd7m5cmC+RciRiqIgsoKdD82q/k0gRxLNg6zi sXL39krzvicrk5yrAPiWa1f+yj6QFJrCE425O4bamfN7PYqmc6agkrQL0WS7tShd155v i9iWA4wZvvYCmtqmtN8seur1h91UPr8b/MomrrcbNWWRzDYobD86ECs3fOkVLH0/kXJe 0lvRMlLuegTiR9EbMFzJ+RD0Ea7OUTS4qUaBeYjg8w4jIpZfqgdzlFLtrOhA5Hcx9HwO 6lPQ== X-Received: by 10.180.198.48 with SMTP id iz16mr19520746wic.29.1399964667841; Tue, 13 May 2014 00:04:27 -0700 (PDT) Received: from crunchbang.upc.es (cisne-cn07.upc.es. [147.83.182.7]) by mx.google.com with ESMTPSA id fu10sm20272383wib.11.2014.05.13.00.04.26 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 13 May 2014 00:04:26 -0700 (PDT) From: =?UTF-8?q?Marc=20Mar=C3=AD?= To: qemu-devel@nongnu.org Date: Tue, 13 May 2014 09:02:39 +0200 Message-Id: <1399964572-5376-4-git-send-email-marc.mari.barcelo@gmail.com> X-Mailer: git-send-email 1.7.10.4 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 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:400c:c03::22f Cc: =?UTF-8?q?Marc=20Mar=C3=AD?= , Stefan Hajnoczi , Peter Crosthwaite , "open list:sPAPR" , =?UTF-8?q?Andreas=20F=C3=A4rber?= Subject: [Qemu-devel] [PATCH v2 03/16] scsi: Convert conditional compilation of debug printfs to regular ifs X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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/scsi/lsi53c895a.c | 17 ++++++++--------- hw/scsi/scsi-generic.c | 12 +++++------- hw/scsi/spapr_vscsi.c | 8 ++++---- 3 files changed, 17 insertions(+), 20 deletions(-) diff --git a/hw/scsi/lsi53c895a.c b/hw/scsi/lsi53c895a.c index cb30414..4c92198 100644 --- a/hw/scsi/lsi53c895a.c +++ b/hw/scsi/lsi53c895a.c @@ -24,16 +24,16 @@ //#define DEBUG_LSI_REG #ifdef DEBUG_LSI -#define DPRINTF(fmt, ...) \ -do { printf("lsi_scsi: " fmt , ## __VA_ARGS__); } while (0) -#define BADF(fmt, ...) \ -do { fprintf(stderr, "lsi_scsi: error: " fmt , ## __VA_ARGS__); exit(1);} while (0) +#define DEBUG_LSI_ENABLED 1 #else -#define DPRINTF(fmt, ...) do {} while(0) -#define BADF(fmt, ...) \ -do { fprintf(stderr, "lsi_scsi: error: " fmt , ## __VA_ARGS__);} while (0) +#define DEBUG_LSI_ENABLED 0 #endif +#define DPRINTF(fmt, ...) QEMU_DPRINTF(DEBUG_LSI_ENABLED, "lsi_scsi", fmt, ## __VA_ARGS__) +#define BADF(fmt, ...) \ + QEMU_DPRINTF(1, "lsi_scsi error", fmt, ## __VA_ARGS__); \ + do { if(DEBUG_LSI_ENABLED) { exit(1); } } while (0) + #define LSI_MAX_DEVS 7 #define LSI_SCNTL0_TRG 0x01 @@ -1261,12 +1261,11 @@ again: uint8_t data8; int reg; int operator; -#ifdef DEBUG_LSI + static const char *opcode_names[3] = {"Write", "Read", "Read-Modify-Write"}; static const char *operator_names[8] = {"MOV", "SHL", "OR", "XOR", "AND", "SHR", "ADD", "ADC"}; -#endif reg = ((insn >> 16) & 0x7f) | (insn & 0x80); data8 = (insn >> 8) & 0xff; diff --git a/hw/scsi/scsi-generic.c b/hw/scsi/scsi-generic.c index 8d92e0d..bf1207f 100644 --- a/hw/scsi/scsi-generic.c +++ b/hw/scsi/scsi-generic.c @@ -21,14 +21,13 @@ //#define DEBUG_SCSI #ifdef DEBUG_SCSI -#define DPRINTF(fmt, ...) \ -do { printf("scsi-generic: " fmt , ## __VA_ARGS__); } while (0) +#define DEBUG_SCSI_ENABLED 1 #else -#define DPRINTF(fmt, ...) do {} while(0) +#define DEBUG_SCSI_ENABLED 0 #endif -#define BADF(fmt, ...) \ -do { fprintf(stderr, "scsi-generic: " fmt , ## __VA_ARGS__); } while (0) +#define DPRINTF(fmt, ...) QEMU_DPRINTF(DEBUG_SCSI_ENABLED, "scsi-generic", fmt, ## __VA_ARGS__) +#define BADF(fmt, ...) QEMU_DPRINTF(1, "scsi-generic", fmt, ## __VA_ARGS__) #include #include @@ -303,8 +302,7 @@ static int32_t scsi_send_command(SCSIRequest *req, uint8_t *cmd) SCSIDevice *s = r->req.dev; int ret; - DPRINTF("Command: lun=%d tag=0x%x len %zd data=0x%02x", lun, tag, - r->req.cmd.xfer, cmd[0]); + DPRINTF("Command: len %zd data=0x%02x", r->req.cmd.xfer, cmd[0]); #ifdef DEBUG_SCSI { diff --git a/hw/scsi/spapr_vscsi.c b/hw/scsi/spapr_vscsi.c index d4ada4f..c844bb0 100644 --- a/hw/scsi/spapr_vscsi.c +++ b/hw/scsi/spapr_vscsi.c @@ -45,13 +45,13 @@ /*#define DEBUG_VSCSI*/ #ifdef DEBUG_VSCSI -#define DPRINTF(fmt, ...) \ - do { fprintf(stderr, fmt, ## __VA_ARGS__); } while (0) +#define DEBUG_VSCSI_ENABLED 1 #else -#define DPRINTF(fmt, ...) \ - do { } while (0) +#define DEBUG_VSCSI_ENABLED 0 #endif +#define DPRINTF(fmt, ...) QEMU_DPRINTF(DEBUG_VSCSI_ENABLED, "spapr_vscsi", fmt, ## __VA_ARGS__) + /* * Virtual SCSI device */