From patchwork Sat Apr 1 13:47:18 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Danil Antonov X-Patchwork-Id: 9657921 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 9E29D60353 for ; Sat, 1 Apr 2017 13:48:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 926AB285F8 for ; Sat, 1 Apr 2017 13:48:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 873A628610; Sat, 1 Apr 2017 13:48:18 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 30F73285F8 for ; Sat, 1 Apr 2017 13:48:18 +0000 (UTC) Received: from localhost ([::1]:51396 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cuJO5-0000cG-Cx for patchwork-qemu-devel@patchwork.kernel.org; Sat, 01 Apr 2017 09:48:17 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50746) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cuJNG-0000Zp-Hu for qemu-devel@nongnu.org; Sat, 01 Apr 2017 09:47:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cuJN9-0000RT-Us for qemu-devel@nongnu.org; Sat, 01 Apr 2017 09:47:26 -0400 Received: from mail-oi0-x243.google.com ([2607:f8b0:4003:c06::243]:33959) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cuJN9-0000R5-OL for qemu-devel@nongnu.org; Sat, 01 Apr 2017 09:47:19 -0400 Received: by mail-oi0-x243.google.com with SMTP id t11so13200326oib.1 for ; Sat, 01 Apr 2017 06:47:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=bbjJyvAAXklS03Sde19MVI4b6rX1z5SkQ8W7INRLydw=; b=KHYQ5nWHzbxVicKNId8jyGtsQk9r4BjJA5g7SKMHZgY/wLpkTQTju56X65groOqyN/ lHlTjUBsiZRSgSt/NJ/gS0zBqWcPXTUOj8XMCLK0/nVZBSEARKtMSqUfNj2mmky2eziO C4qWDe/xrGvYHFplJo9S6m/dK9o3f5Ni5QJvssnarwAxMnIgL0MnznfkJDqEYU3YZ9sU FWfW73iMqKoe5QNa1sb7WVhqQvJWLK+y0Jql2+h7c/OglqlnLD/Gau8/6ZCpbpZibmKs TWLWwDypy1klhQ0uKdCuaBe36qAwm/+PIXWyxHsaihMXES2312zf/UF8PNjrqN1H9Brc yniQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=bbjJyvAAXklS03Sde19MVI4b6rX1z5SkQ8W7INRLydw=; b=tHHfgQUEMLj/OeS0IA/juoC3QCwZiKfBK7yOtpaVNNQXCewKP5a+rmxCiDyBrwGoEN JXwk+RkX7+byDasuCwgvrsAbhc/vsiE2Fn+gecJSak/u/iE2IhzqDKePxGuu7eQuaMVr VGvF2K61WncXoeOenEaxT3Hrxhrmus5foECX7MgqySAL7rWI/AQ0W0mI5BoIp+4bf6UP hzpKb3y8vgrncu2hbEjAZqZ8yh7Ecf/0n/5LkzdvGv1E15xksU3Fq93ad10SyTdraWbD /OGmJMjywOCsrXMK6Q5wJod6Lsx5jCX+fXJzZJquz5P3o3NEnPZfhokP3/dZUxpQHTxJ sRGg== X-Gm-Message-State: AFeK/H1VasxhWto3fapOJJ/oMN7HHhWKLwMhs4H+v8h2DZcMc1prg59nktvPI9YUXoWcHOH3h24rjZlVBTdb8g== X-Received: by 10.157.27.44 with SMTP id l41mr4956628otl.103.1491054439095; Sat, 01 Apr 2017 06:47:19 -0700 (PDT) MIME-Version: 1.0 Received: by 10.157.32.234 with HTTP; Sat, 1 Apr 2017 06:47:18 -0700 (PDT) From: Danil Antonov Date: Sat, 1 Apr 2017 16:47:18 +0300 Message-ID: To: qemu-devel@nongnu.org, peter.maydell@linaro.org X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:4003:c06::243 X-Content-Filtered-By: Mailman/MimeDel 2.1.21 Subject: [Qemu-devel] [PATCH 12/43] sd: made printf always compile in debug output X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From 78c7cc133ba566b13afe6e9924e174b6d081e393 Mon Sep 17 00:00:00 2001 From: Danil Antonov Date: Wed, 29 Mar 2017 12:27:24 +0300 Subject: [PATCH 12/43] sd: made printf always compile in debug output Wrapped printf calls inside debug macros (DPRINTF) in `if` statement. This will ensure that printf function will always compile even if debug output is turned off and, in turn, will prevent bitrot of the format strings. Signed-off-by: Danil Antonov --- hw/sd/pl181.c | 16 ++++++++++------ hw/sd/sd.c | 14 +++++++++----- hw/sd/ssi-sd.c | 27 +++++++++++++++++---------- 3 files changed, 36 insertions(+), 21 deletions(-) SSI_SD_CMDARG, diff --git a/hw/sd/pl181.c b/hw/sd/pl181.c index 82c63a4..e4d350f 100644 --- a/hw/sd/pl181.c +++ b/hw/sd/pl181.c @@ -16,14 +16,18 @@ #include "qapi/error.h" //#define DEBUG_PL181 1 - -#ifdef DEBUG_PL181 -#define DPRINTF(fmt, ...) \ -do { printf("pl181: " fmt , ## __VA_ARGS__); } while (0) -#else -#define DPRINTF(fmt, ...) do {} while(0) +// +#ifndef DEBUG_PL181 +#define DEBUG_PL181 0 #endif +#define DPRINTF(fmt, ...) \ + do { \ + if (DEBUG_PL181) { \ + fprintf(stderr, "pl181: " fmt, ## __VA_ARGS__); \ + } \ + } while (0) + #define PL181_FIFO_LEN 16 #define TYPE_PL181 "pl181" diff --git a/hw/sd/sd.c b/hw/sd/sd.c index ba47bff..f2cd369 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -43,13 +43,17 @@ //#define DEBUG_SD 1 -#ifdef DEBUG_SD -#define DPRINTF(fmt, ...) \ -do { fprintf(stderr, "SD: " fmt , ## __VA_ARGS__); } while (0) -#else -#define DPRINTF(fmt, ...) do {} while(0) +#ifndef DEBUG_SD +#define DEBUG_SD 0 #endif +#define DPRINTF(fmt, ...) \ + do { \ + if (DEBUG_SD) { \ + fprintf(stderr, "SD: " fmt, ## __VA_ARGS__); \ + } \ + } while (0) + #define ACMD41_ENQUIRY_MASK 0x00ffffff #define OCR_POWER_UP 0x80000000 #define OCR_POWER_DELAY_NS 500000 /* 0.5ms */ diff --git a/hw/sd/ssi-sd.c b/hw/sd/ssi-sd.c index 24001dc..c8168ae 100644 --- a/hw/sd/ssi-sd.c +++ b/hw/sd/ssi-sd.c @@ -18,18 +18,25 @@ #include "qapi/error.h" //#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) -#else -#define DPRINTF(fmt, ...) do {} while(0) -#define BADF(fmt, ...) \ -do { fprintf(stderr, "ssi_sd: error: " fmt , ## __VA_ARGS__);} while (0) +#ifndef DEBUG_SSI_SD +#define DEBUG_SSI_SD 0 #endif +#define DPRINTF(fmt, ...) \ + do { \ + if (DEBUG_SSI_SD) { \ + fprintf(stderr, "ssi_sd: " fmt, ## __VA_ARGS__); \ + } \ + } while (0) + +#define BADF(fmt, ...) \ + do { \ + fprintf(stderr, "ssi_sd: error: " fmt, ## __VA_ARGS__); \ + if (DEBUG_SSI_SD) { \ + exit(1); \ + } \ + } while (0) + typedef enum { SSI_SD_CMD = 0,