From patchwork Sat Apr 1 13:45:53 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Danil Antonov X-Patchwork-Id: 9657917 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 4FB8060353 for ; Sat, 1 Apr 2017 13:46:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 40A7027EED for ; Sat, 1 Apr 2017 13:46:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 32B162860F; Sat, 1 Apr 2017 13:46:28 +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 DDAE427EED for ; Sat, 1 Apr 2017 13:46:27 +0000 (UTC) Received: from localhost ([::1]:51393 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cuJMJ-0008HL-3e for patchwork-qemu-devel@patchwork.kernel.org; Sat, 01 Apr 2017 09:46:27 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50078) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cuJLn-0008HC-Q5 for qemu-devel@nongnu.org; Sat, 01 Apr 2017 09:45:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cuJLm-000872-QM for qemu-devel@nongnu.org; Sat, 01 Apr 2017 09:45:55 -0400 Received: from mail-oi0-x242.google.com ([2607:f8b0:4003:c06::242]:35922) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cuJLm-00086s-L9 for qemu-devel@nongnu.org; Sat, 01 Apr 2017 09:45:54 -0400 Received: by mail-oi0-x242.google.com with SMTP id b187so13189560oif.3 for ; Sat, 01 Apr 2017 06:45:54 -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=xKEo9jJeHwomtPIefMTO+F8pm1gnHuTcAjBrpxfk00c=; b=d2UoUo7FnDvxVYpal+vHflpu0OhJcTUN9zf64yWm4w9D7+EuYnuuAkPnzpsvar4+H2 5+Ju0A1GkJU9pWHX+x6vh+lqHuDJHfebA9z2kPmgV1+9hP5izZBQlqH20a6a9y/r4IhW OD66stxaY1XHHDcbUIFPrKrM0A7JBl0yiQhJRHgxjZz5HGmyStvA9n4HIr/RyBx+lvR8 BaYJ1RitMDk3qey+Ccm7auWpaDG44Sy8+gvKNXn7BfUPVBGBl9ygXK5D6/q/pcSuOPN7 kSiA96b9RrBNF0fHWKnFM0Is2oFKZL6JFHHfyMS+DAGTL0ivU9//T4JRPoVmA/PucqY4 w9yQ== 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=xKEo9jJeHwomtPIefMTO+F8pm1gnHuTcAjBrpxfk00c=; b=NngY2JXMp8kVftqR4QkIbwTRx0sHWE29oyxWlXKR7xVCOqd/z978AoDY7cYwVZphIj mT/cBFI47zQFa4c57pJmAbAQxLKRIe/cuGDTPftw1yJVJjlX/PQ1JOMSrmfER/CEZ5tI qhxC4rBI1sQWonV2mb+AWMRqT2HxVcAraeDytMVLWCFcg7ZApqU8Q92OjOnFwL+C3XqW Ljei/6dBK9R0b6tvyRoBLPki4ocNl3Cl2jWIBmf7kDsGHjoykfGM2ANtJ0kBv3g33kww bRTyj2gza9ifPBxMxTvIzwIrNMkGrdQecUzBqWYVxv5FuzRc7vHtP1UN2czurGhsz7+p lW3w== X-Gm-Message-State: AFeK/H2+ISWGmghh9bR6ACmTV6cvNTzL/IfcujoOVNInKse4iXdkTxdQvmPszsAnk8uB7r4Z5SrmbOqt7KfbSg== X-Received: by 10.202.237.65 with SMTP id l62mr4671638oih.38.1491054354032; Sat, 01 Apr 2017 06:45:54 -0700 (PDT) MIME-Version: 1.0 Received: by 10.157.32.234 with HTTP; Sat, 1 Apr 2017 06:45:53 -0700 (PDT) From: Danil Antonov Date: Sat, 1 Apr 2017 16:45:53 +0300 Message-ID: To: qemu-devel@nongnu.org, borntraeger@de.ibm.com, cornelia.huck@de.ibm.com, agraf@suse.de, rth@twiddle.net X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:4003:c06::242 X-Content-Filtered-By: Mailman/MimeDel 2.1.21 Subject: [Qemu-devel] [PATCH 10/43] s390x: 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 ea9cd8f02bd98548435f561e62f4f9b672318bcb Mon Sep 17 00:00:00 2001 From: Danil Antonov Date: Wed, 29 Mar 2017 12:26:05 +0300 Subject: [PATCH 10/43] s390x: 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 --- target/s390x/kvm.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/target/s390x/kvm.c b/target/s390x/kvm.c index ac47154..ac994fe 100644 --- a/target/s390x/kvm.c +++ b/target/s390x/kvm.c @@ -47,15 +47,15 @@ #include "exec/memattrs.h" #include "hw/s390x/s390-virtio-ccw.h" -/* #define DEBUG_KVM */ - -#ifdef DEBUG_KVM -#define DPRINTF(fmt, ...) \ - do { fprintf(stderr, fmt, ## __VA_ARGS__); } while (0) -#else -#define DPRINTF(fmt, ...) \ - do { } while (0) -#endif +#ifndef DEBUG_KVM +#define DEBUG_KVM 0 +#endif + +#define DPRINTF(fmt, ...) do { \ + if (DEBUG_KVM) { \ + fprintf(stderr, fmt, ## __VA_ARGS__); \ + } \ +} while (0); #define kvm_vm_check_mem_attr(s, attr) \ kvm_vm_check_attr(s, KVM_S390_VM_MEM_CTRL, attr)