From patchwork Tue May 13 07:02:45 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: 348263 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 97B101400B8 for ; Tue, 13 May 2014 17:09:11 +1000 (EST) Received: from localhost ([::1]:42188 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wk6pp-0002kN-EU for incoming@patchwork.ozlabs.org; Tue, 13 May 2014 03:09:09 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52615) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wk6lb-0004GY-0a for qemu-devel@nongnu.org; Tue, 13 May 2014 03:04:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wk6lS-00014P-0v for qemu-devel@nongnu.org; Tue, 13 May 2014 03:04:46 -0400 Received: from mail-wi0-x232.google.com ([2a00:1450:400c:c05::232]:55472) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wk6lR-00014H-P3 for qemu-devel@nongnu.org; Tue, 13 May 2014 03:04:37 -0400 Received: by mail-wi0-f178.google.com with SMTP id hm4so54921wib.11 for ; Tue, 13 May 2014 00:04:37 -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=k6ooCrsCUJAdX/WOxbZ1p3iU7LH8Z4oTk/s/cSjGW1A=; b=b4s8ZNG5gOlD9ZwHFCCNFgw0IfqXwOvHcLApGDq7zvCaGJ+2zu95tpNzsaHe+uFy67 fQHfJw6Wa/4AOvhTfyAUiIRsHZ/qbDCWAuKTXDTMV3KB4rspp4itoZXfVh5rycqNjOCp QzmGMSGznF4oznBpVnWfOQp2DiaoxHEL2NuU2WR44WPyCZKC79q7bb5LZSWWuySVghCw Jd8yFnGPZyvnzXC2vnlI/ChXUkmAMoPsY3s0fgm2ZipmiyPDZX73fp/qfhUmLU5p2fre AycUy8zfcHPqrAlz2ia35CGQ/Mnq6i3p4miiknTUgarOCDxZjdTRK/PXQrSGPoITdMXC MMBQ== X-Received: by 10.194.19.161 with SMTP id g1mr25082433wje.20.1399964676942; Tue, 13 May 2014 00:04:36 -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.35 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 13 May 2014 00:04:36 -0700 (PDT) From: =?UTF-8?q?Marc=20Mar=C3=AD?= To: qemu-devel@nongnu.org Date: Tue, 13 May 2014 09:02:45 +0200 Message-Id: <1399964572-5376-10-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:c05::232 Cc: =?UTF-8?q?Marc=20Mar=C3=AD?= , Stefan Hajnoczi , Peter Crosthwaite , =?UTF-8?q?Andreas=20F=C3=A4rber?= Subject: [Qemu-devel] [PATCH v2 09/16] i82374: 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/dma/i82374.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/hw/dma/i82374.c b/hw/dma/i82374.c index b8ad2e6..7026f24 100644 --- a/hw/dma/i82374.c +++ b/hw/dma/i82374.c @@ -27,14 +27,13 @@ //#define DEBUG_I82374 #ifdef DEBUG_I82374 -#define DPRINTF(fmt, ...) \ -do { fprintf(stderr, "i82374: " fmt , ## __VA_ARGS__); } while (0) +#define DEBUG_I82374_ENABLED 1 #else -#define DPRINTF(fmt, ...) \ -do {} while (0) +#define DEBUG_I82374_ENABLED 0 #endif -#define BADF(fmt, ...) \ -do { fprintf(stderr, "i82374 ERROR: " fmt , ## __VA_ARGS__); } while (0) + +#define DPRINTF(fmt, ...) QEMU_DPRINTF(DEBUG_I82374_ENABLED, "i82374", fmt, ## __VA_ARGS__) +#define BADF(fmt, ...) QEMU_DPRINTF(1, "i82374 ERROR", fmt, ## __VA_ARGS__) typedef struct I82374State { uint8_t commands[8];