From patchwork Sat Apr 1 14:02:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Danil Antonov X-Patchwork-Id: 9658019 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 E89A860349 for ; Sat, 1 Apr 2017 14:05:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E194728481 for ; Sat, 1 Apr 2017 14:05:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D68C228616; Sat, 1 Apr 2017 14:05:57 +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 7FF2428481 for ; Sat, 1 Apr 2017 14:05:57 +0000 (UTC) Received: from localhost ([::1]:51530 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cuJf9-0003QP-Sw for patchwork-qemu-devel@patchwork.kernel.org; Sat, 01 Apr 2017 10:05:55 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56913) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cuJbl-0001fK-Tf for qemu-devel@nongnu.org; Sat, 01 Apr 2017 10:02:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cuJbk-00075A-Nc for qemu-devel@nongnu.org; Sat, 01 Apr 2017 10:02:25 -0400 Received: from mail-oi0-x241.google.com ([2607:f8b0:4003:c06::241]:33086) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cuJbk-00074Y-Hn for qemu-devel@nongnu.org; Sat, 01 Apr 2017 10:02:24 -0400 Received: by mail-oi0-x241.google.com with SMTP id f193so13240197oib.0 for ; Sat, 01 Apr 2017 07:02:24 -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=9Jzg7CQoJcJEIFEXm5DvIEBlxh3Oy8YKrBGZpYbk+1s=; b=XNu5dCq42Xex6nlQckYHOZQLfKDJG4kZZ/zGGaMKQ+fRNP7/jyCiQOMTSw/X7HMyUB QZI8EeTa4VQH+1Mkzn0EXm03bnO43gAhuTFzFjxd+hKuTWGNyGFhXjyZQZHExVgpmbzF kvVhetDLyWMq0T5OP821mzbU+P1v4RpaZBJGx5P0mCQpgpFyQRLKBvQEz6/Z6syepEgQ +yf5EUpJiyRXjZrjvdBPp/CAkrbcrGkO3qQORU0wBSyGT8xvUx5oDv6/YC2H4LFBN+/D Pv8lztcQw+f4KX7dbwpPEN9uoLXLgm5nH1kYOcemSGmCaJC99Km5ONUqZLoHojSj32+K 3b6w== 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=9Jzg7CQoJcJEIFEXm5DvIEBlxh3Oy8YKrBGZpYbk+1s=; b=eGwY6xOfo6Xa639jH2D28VdMl4eN8aoePc1yrcgILQBPgmt1JlrHvZkSsdrddE6QzX Mc0gzMo2qDTWpvp1weSKRitM2xBSjyjmnWGm2kJIMvKsdz670ydnfnO1ieaJKxjBVPQz GXeNARBOCqzur+x71W+35jxfB+0syMLFaYs6nQlIG/i3QsyixF6wOzgHYAftwjc7jw6J iDWsUvk2Mj8YCpbz21/EJIPR7mCsQz1MrPbGP4XYDxTUiSgCpwX2sERXCbBWOZXjuEWd OJR9RcXWR+CV85nbND0xrfsF5P2TCpnXXPRmN+7xIpw5MbYVZ9JKWTe/5HnkpidjpgC7 7isg== X-Gm-Message-State: AFeK/H2QrqDNMB2ygHr8Q5PyiLezLWu2qO0ELM0edfk0qtT03rzPKkIhdGhrnrhk7eOM/JJSv2D+Weqz8u+O3A== X-Received: by 10.157.6.7 with SMTP id 7mr5494691otn.246.1491055343605; Sat, 01 Apr 2017 07:02:23 -0700 (PDT) MIME-Version: 1.0 Received: by 10.157.32.234 with HTTP; Sat, 1 Apr 2017 07:02:23 -0700 (PDT) From: Danil Antonov Date: Sat, 1 Apr 2017 17:02:23 +0300 Message-ID: To: qemu-devel@nongnu.org X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:4003:c06::241 X-Content-Filtered-By: Mailman/MimeDel 2.1.21 Subject: [Qemu-devel] [PATCH 30/43] block: 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 63139dc0a7e3b5c8caa1ecf6fbe900372fddeba0 Mon Sep 17 00:00:00 2001 From: Danil Antonov Date: Wed, 29 Mar 2017 12:39:12 +0300 Subject: [PATCH 30/43] block: 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/block/pflash_cfi01.c | 18 +++++++++--------- hw/block/pflash_cfi02.c | 19 +++++++++++-------- 2 files changed, 20 insertions(+), 17 deletions(-) diff --git a/hw/block/pflash_cfi01.c b/hw/block/pflash_cfi01.c index 594d4cf..6e07ad7 100644 --- a/hw/block/pflash_cfi01.c +++ b/hw/block/pflash_cfi01.c @@ -55,15 +55,15 @@ do { \ exit(1); \ } while(0) -/* #define PFLASH_DEBUG */ -#ifdef PFLASH_DEBUG -#define DPRINTF(fmt, ...) \ -do { \ - fprintf(stderr, "PFLASH: " fmt , ## __VA_ARGS__); \ -} while (0) -#else -#define DPRINTF(fmt, ...) do { } while (0) -#endif +#ifndef PFLASH_DEBUG +#define PFLASH_DEBUG 0 +#endif + +#define DPRINTF(fmt, ...) do { \ + if (PFLASH_DEBUG) { \ + fprintf(stderr, "PFLASH: " fmt, ## __VA_ARGS__); \ + } \ +} while (0); #define CFI_PFLASH01(obj) OBJECT_CHECK(pflash_t, (obj), TYPE_CFI_PFLASH01) diff --git a/hw/block/pflash_cfi02.c b/hw/block/pflash_cfi02.c index e6c5c6c..be35bca 100644 --- a/hw/block/pflash_cfi02.c +++ b/hw/block/pflash_cfi02.c @@ -46,14 +46,17 @@ #include "hw/sysbus.h" //#define PFLASH_DEBUG -#ifdef PFLASH_DEBUG -#define DPRINTF(fmt, ...) \ -do { \ - fprintf(stderr, "PFLASH: " fmt , ## __VA_ARGS__); \ -} while (0) -#else -#define DPRINTF(fmt, ...) do { } while (0) -#endif + +#ifndef PFLASH_DEBUG +#define PFLASH_DEBUG 0 +#endif + +#define DPRINTF(fmt, ...) do { \ + if (PFLASH_DEBUG) { \ + fprintf(stderr, "PFLASH: " fmt, ## __VA_ARGS__); \ + } \ +} while (0); + #define PFLASH_LAZY_ROMD_THRESHOLD 42