From patchwork Sat May 17 23:03:29 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: 349962 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 AC3C514021A for ; Sun, 18 May 2014 09:05:26 +1000 (EST) Received: from localhost ([::1]:41676 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WlnfQ-0007Xz-Ak for incoming@patchwork.ozlabs.org; Sat, 17 May 2014 19:05:24 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37054) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wlneh-0006K8-SM for qemu-devel@nongnu.org; Sat, 17 May 2014 19:04:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WlneY-00041y-HA for qemu-devel@nongnu.org; Sat, 17 May 2014 19:04:39 -0400 Received: from mail-wg0-x230.google.com ([2a00:1450:400c:c00::230]:36862) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WlneY-00041p-4v for qemu-devel@nongnu.org; Sat, 17 May 2014 19:04:30 -0400 Received: by mail-wg0-f48.google.com with SMTP id b13so6456212wgh.7 for ; Sat, 17 May 2014 16:04:29 -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=ibp7p5Uyq57iES/rq5IDEAboRhnkPoQ5ExoiIVyfeIQ=; b=BQ6t5HqkRuoaRtXl6qVcoJYhik7sIDwbPFO/10RY1rGnWNbnIGlElsyUgFlRW8KeaD 5PDAdIe7cAfVxczpeQE5+is57+/a7WW+YXfddVeeI6og7Xq1kkwtk52qVmdNFsfHJs+6 zQMtsKHNz8YUxMS5h/HEg0FwjIAqfWx4XlPVXHorIqmhrOBi4bIKCQ7igGpxUj0yGxCs nzl356VF75cVq2c7iEVvX0+SgEwSdHZY5Ety3/6HZXFXNkoEzdTDllQEmvb6MZKvELar euVARsqoUsUnAMSB1F1Pc7ehQeF1ZTeOO8uF8YzT+v6kMkXPLL27ZKJi8JG6dP2X7AHL muxw== X-Received: by 10.194.58.43 with SMTP id n11mr50256wjq.92.1400367869252; Sat, 17 May 2014 16:04:29 -0700 (PDT) Received: from localhost.localdomain (81.184.190.63.dyn.user.ono.com. [81.184.190.63]) by mx.google.com with ESMTPSA id ga10sm7530339wjb.23.2014.05.17.16.04.27 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 17 May 2014 16:04:28 -0700 (PDT) From: =?UTF-8?q?Marc=20Mar=C3=AD?= To: qemu-devel@nongnu.org Date: Sun, 18 May 2014 01:03:29 +0200 Message-Id: <1400367823-32610-3-git-send-email-marc.mari.barcelo@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1400367823-32610-1-git-send-email-marc.mari.barcelo@gmail.com> References: <1400367823-32610-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:c00::230 Cc: =?UTF-8?q?Marc=20Mar=C3=AD?= , Peter Crosthwaite , "open list:X86" , "open list:X86" , Stefan Hajnoczi , =?UTF-8?q?Andreas=20F=C3=A4rber?= Subject: [Qemu-devel] [PATCH v3 02/16] x86: Convert debug printfs to QEMU_DPRINTF 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. Signed-off-by: Marc Marí Reviewed-by: Eric Blake --- hw/i386/kvm/pci-assign.c | 11 ++++++----- hw/i386/multiboot.c | 7 +++++-- target-i386/kvm.c | 9 +++++---- xen-hvm.c | 9 +++++---- xen-mapcache.c | 9 +++++---- 5 files changed, 26 insertions(+), 19 deletions(-) diff --git a/hw/i386/kvm/pci-assign.c b/hw/i386/kvm/pci-assign.c index de33657..21330a9 100644 --- a/hw/i386/kvm/pci-assign.c +++ b/hw/i386/kvm/pci-assign.c @@ -51,14 +51,15 @@ //#define DEVICE_ASSIGNMENT_DEBUG #ifdef DEVICE_ASSIGNMENT_DEBUG -#define DEBUG(fmt, ...) \ - do { \ - fprintf(stderr, "%s: " fmt, __func__ , __VA_ARGS__); \ - } while (0) +#define DEVICE_ASSIGNMENT_DEBUG_ENABLED 1 #else -#define DEBUG(fmt, ...) +#define DEVICE_ASSIGNMENT_DEBUG_ENABLED 0 #endif +#define DEBUG(fmt, ...) \ + QEMU_DPRINTF(DEVICE_ASSIGNMENT_DEBUG_ENABLED, \ + "pci_assign", fmt, ## __VA_ARGS__) + typedef struct PCIRegion { int type; /* Memory or port I/O */ int valid; diff --git a/hw/i386/multiboot.c b/hw/i386/multiboot.c index 985ca1e..cd04339 100644 --- a/hw/i386/multiboot.c +++ b/hw/i386/multiboot.c @@ -33,11 +33,14 @@ //#define DEBUG_MULTIBOOT #ifdef DEBUG_MULTIBOOT -#define mb_debug(a...) fprintf(stderr, ## a) +#define DEBUG_MULTIBOOT_ENABLED 1 #else -#define mb_debug(a...) +#define DEBUG_MULTIBOOT_ENABLED 0 #endif +#define mb_debug(...) \ + QEMU_DPRINTF(DEBUG_MULTIBOOT_ENABLED, "i386 multiboot", __VA_ARGS__) + #define MULTIBOOT_STRUCT_ADDR 0x9000 #if MULTIBOOT_STRUCT_ADDR > 0xf0000 diff --git a/target-i386/kvm.c b/target-i386/kvm.c index 0d894ef..53098ad 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -39,13 +39,14 @@ //#define DEBUG_KVM #ifdef DEBUG_KVM -#define DPRINTF(fmt, ...) \ - do { fprintf(stderr, fmt, ## __VA_ARGS__); } while (0) +#define DEBUG_KVM_ENABLED 1 #else -#define DPRINTF(fmt, ...) \ - do { } while (0) +#define DEBUG_KVM_ENABLED 0 #endif +#define DPRINTF(fmt, ...) \ + QEMU_DPRINTF(DEBUG_KVM_ENABLED, "i386 kvm", fmt, ## __VA_ARGS__) + #define MSR_KVM_WALL_CLOCK 0x11 #define MSR_KVM_SYSTEM_TIME 0x12 diff --git a/xen-hvm.c b/xen-hvm.c index a64486c..a0d0bf1 100644 --- a/xen-hvm.c +++ b/xen-hvm.c @@ -29,13 +29,14 @@ //#define DEBUG_XEN_HVM #ifdef DEBUG_XEN_HVM -#define DPRINTF(fmt, ...) \ - do { fprintf(stderr, "xen: " fmt, ## __VA_ARGS__); } while (0) +#define DEBUG_XEN_HVM_ENABLED 1 #else -#define DPRINTF(fmt, ...) \ - do { } while (0) +#define DEBUG_XEN_HVM_ENABLED 0 #endif +#define DPRINTF(fmt, ...) \ + QEMU_DPRINTF(DEBUG_XEN_HVM_ENABLED, "xen", fmt, ## __VA_ARGS__) + static MemoryRegion ram_memory, ram_640k, ram_lo, ram_hi; static MemoryRegion *framebuffer; static bool xen_in_migration; diff --git a/xen-mapcache.c b/xen-mapcache.c index eda914a..c6a72c5 100644 --- a/xen-mapcache.c +++ b/xen-mapcache.c @@ -26,13 +26,14 @@ //#define MAPCACHE_DEBUG #ifdef MAPCACHE_DEBUG -# define DPRINTF(fmt, ...) do { \ - fprintf(stderr, "xen_mapcache: " fmt, ## __VA_ARGS__); \ -} while (0) +#define MAPCACHE_DEBUG_ENABLED 1 #else -# define DPRINTF(fmt, ...) do { } while (0) +#define MAPCACHE_DEBUG_ENABLED 0 #endif +#define DPRINTF(fmt, ...) \ + QEMU_DPRINTF(MAPCACHE_DEBUG_ENABLED, "xen_mapcache", fmt, ## __VA_ARGS__) + #if defined(__i386__) # define MCACHE_BUCKET_SHIFT 16 # define MCACHE_MAX_SIZE (1UL<<31) /* 2GB Cap */