From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Marc=20Mar=C3=AD?= Subject: [PATCH v2 01/16] x86: Convert conditional compilation of debug printfs to regular ifs Date: Tue, 13 May 2014 09:02:37 +0200 Message-ID: <1399964572-5376-2-git-send-email-marc.mari.barcelo@gmail.com> References: <1399964572-5376-1-git-send-email-marc.mari.barcelo@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: In-Reply-To: <1399964572-5376-1-git-send-email-marc.mari.barcelo@gmail.com> Sender: kvm-owner@vger.kernel.org To: qemu-devel@nongnu.org Cc: Peter Crosthwaite , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Stefan Hajnoczi , =?UTF-8?q?Marc=20Mar=C3=AD?= , "open list:X86" , "open list:X86" List-Id: xen-devel@lists.xenproject.org Modify debug macros to have the same format through the codebase and us= e 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=C3=AD --- hw/i386/kvm/pci-assign.c | 9 ++++----- hw/i386/multiboot.c | 6 ++++-- target-i386/kvm.c | 8 ++++---- xen-hvm.c | 12 ++++++------ xen-mapcache.c | 8 ++++---- 5 files changed, 22 insertions(+), 21 deletions(-) diff --git a/hw/i386/kvm/pci-assign.c b/hw/i386/kvm/pci-assign.c index e55421a..35757ae 100644 --- a/hw/i386/kvm/pci-assign.c +++ b/hw/i386/kvm/pci-assign.c @@ -51,14 +51,13 @@ //#define DEVICE_ASSIGNMENT_DEBUG =20 #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 =20 +#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..cd215dc 100644 --- a/hw/i386/multiboot.c +++ b/hw/i386/multiboot.c @@ -33,11 +33,13 @@ //#define DEBUG_MULTIBOOT =20 #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 =20 +#define mb_debug(a...) QEMU_DPRINTF(DEBUG_MULTIBOOT_ENABLED, "i386 mul= tiboot", a) + #define MULTIBOOT_STRUCT_ADDR 0x9000 =20 #if MULTIBOOT_STRUCT_ADDR > 0xf0000 diff --git a/target-i386/kvm.c b/target-i386/kvm.c index 4389959..d6cd89c 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -37,13 +37,13 @@ //#define DEBUG_KVM =20 #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 =20 +#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 =20 diff --git a/xen-hvm.c b/xen-hvm.c index a64486c..ccce342 100644 --- a/xen-hvm.c +++ b/xen-hvm.c @@ -26,16 +26,16 @@ #include #include =20 -//#define DEBUG_XEN_HVM +//#define DEBUG_XEN =20 -#ifdef DEBUG_XEN_HVM -#define DPRINTF(fmt, ...) \ - do { fprintf(stderr, "xen: " fmt, ## __VA_ARGS__); } while (0) +#ifdef DEBUG_XEN +#define DEBUG_XEN_ENABLED 1 #else -#define DPRINTF(fmt, ...) \ - do { } while (0) +#define DEBUG_XEN_ENABLED 0 #endif =20 +#define DPRINTF(fmt, ...) QEMU_DPRINTF(DEBUG_XEN_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..a50bb80 100644 --- a/xen-mapcache.c +++ b/xen-mapcache.c @@ -26,13 +26,13 @@ //#define MAPCACHE_DEBUG =20 #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 =20 +#define DPRINTF(fmt, ...) QEMU_DPRINTF(MAPCACHE_DEBUG_ENABLED, "xen_ma= pcache", fmt, ## __VA_ARGS__) + #if defined(__i386__) # define MCACHE_BUCKET_SHIFT 16 # define MCACHE_MAX_SIZE (1UL<<31) /* 2GB Cap */ --=20 1.7.10.4