From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55718) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YqmNJ-0004nk-VE for qemu-devel@nongnu.org; Fri, 08 May 2015 13:47:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YqmNI-00020B-PW for qemu-devel@nongnu.org; Fri, 08 May 2015 13:47:49 -0400 From: Dimitris Aragiorgis Date: Fri, 8 May 2015 20:47:20 +0300 Message-Id: <1431107242-31947-4-git-send-email-dimara@arrikto.com> In-Reply-To: <1431107242-31947-1-git-send-email-dimara@arrikto.com> References: <1431107242-31947-1-git-send-email-dimara@arrikto.com> Subject: [Qemu-devel] [PATCH v2 3/5] raw-posix: DPRINTF instead of DEBUG_BLOCK_PRINT List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, pbonzini@redhat.com, stefanha@redhat.com, qemu-block@nongnu.org Building the QEMU tools fails if we #define DEBUG_BLOCK inside block/raw-posix.c. Here instead of adding qemu-log.o in block-obj-y so that DEBUG_BLOCK_PRINT can be used, we substitute the latter with a simple DPRINTF(). Signed-off-by: Dimitris Aragiorgis --- block/raw-posix.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/block/raw-posix.c b/block/raw-posix.c index 24b061f..fbccca8 100644 --- a/block/raw-posix.c +++ b/block/raw-posix.c @@ -97,11 +97,11 @@ //#define DEBUG_FLOPPY //#define DEBUG_BLOCK -#if defined(DEBUG_BLOCK) -#define DEBUG_BLOCK_PRINT(formatCstr, ...) do { if (qemu_log_enabled()) \ - { qemu_log(formatCstr, ## __VA_ARGS__); qemu_log_flush(); } } while (0) + +#ifdef DEBUG_BLOCK +#define DPRINTF(fmt, ...) do { printf(fmt, ## __VA_ARGS__); } while (0) #else -#define DEBUG_BLOCK_PRINT(formatCstr, ...) +#define DPRINTF(fmt, ...) do { } while (0) #endif /* OS X does not have O_DSYNC */ @@ -1023,7 +1023,7 @@ static int xfs_write_zeroes(BDRVRawState *s, int64_t offset, uint64_t bytes) fl.l_len = bytes; if (xfsctl(NULL, s->fd, XFS_IOC_ZERO_RANGE, &fl) < 0) { - DEBUG_BLOCK_PRINT("cannot write zero range (%s)\n", strerror(errno)); + DPRINTF("cannot write zero range (%s)\n", strerror(errno)); return -errno; } @@ -1040,7 +1040,7 @@ static int xfs_discard(BDRVRawState *s, int64_t offset, uint64_t bytes) fl.l_len = bytes; if (xfsctl(NULL, s->fd, XFS_IOC_UNRESVSP64, &fl) < 0) { - DEBUG_BLOCK_PRINT("cannot punch hole (%s)\n", strerror(errno)); + DPRINTF("cannot punch hole (%s)\n", strerror(errno)); return -errno; } -- 1.7.10.4