mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

raw-posix: DPRINTF instead of DEBUG_BLOCK_PRINT

Browse Source 
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() (that does not cause bit-rot).

Signed-off-by: Dimitris Aragiorgis <dimara@arrikto.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-id: 1435056300-14924-4-git-send-email-dimara@arrikto.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Dimitris Aragiorgis 2015-06-23 13:44:58 +03:00 committed by Stefan Hajnoczi
parent 1b6bc94d5d
commit bcb225550d
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
block/raw-posix.c
View File

@ -99,12 +99,18 @@
//#define DEBUG_FLOPPY //#define DEBUG_FLOPPY
//#define DEBUG_BLOCK //#define DEBUG_BLOCK
#if defined(DEBUG_BLOCK)
#define DEBUG_BLOCK_PRINT(formatCstr, ...) do { if (qemu_log_enabled()) \ #ifdef DEBUG_BLOCK
{ qemu_log(formatCstr, ## __VA_ARGS__); qemu_log_flush(); } } while (0) # define DEBUG_BLOCK_PRINT 1
#else #else
#define DEBUG_BLOCK_PRINT(formatCstr, ...) # define DEBUG_BLOCK_PRINT 0
#endif #endif
#define DPRINTF(fmt, ...) \
do { \
if (DEBUG_BLOCK_PRINT) { \
printf(fmt, ## __VA_ARGS__); \
} \
} while (0)
/* OS X does not have O_DSYNC */ /* OS X does not have O_DSYNC */
#ifndef O_DSYNC #ifndef O_DSYNC
@ -1020,6 +1026,7 @@ static ssize_t handle_aiocb_rw(RawPosixAIOData *aiocb)
static int xfs_write_zeroes(BDRVRawState *s, int64_t offset, uint64_t bytes) static int xfs_write_zeroes(BDRVRawState *s, int64_t offset, uint64_t bytes)
{ {
struct xfs_flock64 fl; struct xfs_flock64 fl;
int err;
memset(&fl, 0, sizeof(fl)); memset(&fl, 0, sizeof(fl));
fl.l_whence = SEEK_SET; fl.l_whence = SEEK_SET;
@ -1027,8 +1034,9 @@ static int xfs_write_zeroes(BDRVRawState *s, int64_t offset, uint64_t bytes)
fl.l_len = bytes; fl.l_len = bytes;
if (xfsctl(NULL, s->fd, XFS_IOC_ZERO_RANGE, &fl) < 0) { if (xfsctl(NULL, s->fd, XFS_IOC_ZERO_RANGE, &fl) < 0) {
DEBUG_BLOCK_PRINT("cannot write zero range (%s)\n", strerror(errno)); err = errno;
return -errno; DPRINTF("cannot write zero range (%s)\n", strerror(errno));
return -err;
} }
return 0; return 0;
@ -1037,6 +1045,7 @@ static int xfs_write_zeroes(BDRVRawState *s, int64_t offset, uint64_t bytes)
static int xfs_discard(BDRVRawState *s, int64_t offset, uint64_t bytes) static int xfs_discard(BDRVRawState *s, int64_t offset, uint64_t bytes)
{ {
struct xfs_flock64 fl; struct xfs_flock64 fl;
int err;
memset(&fl, 0, sizeof(fl)); memset(&fl, 0, sizeof(fl));
fl.l_whence = SEEK_SET; fl.l_whence = SEEK_SET;
@ -1044,8 +1053,9 @@ static int xfs_discard(BDRVRawState *s, int64_t offset, uint64_t bytes)
fl.l_len = bytes; fl.l_len = bytes;
if (xfsctl(NULL, s->fd, XFS_IOC_UNRESVSP64, &fl) < 0) { if (xfsctl(NULL, s->fd, XFS_IOC_UNRESVSP64, &fl) < 0) {
DEBUG_BLOCK_PRINT("cannot punch hole (%s)\n", strerror(errno)); err = errno;
return -errno; DPRINTF("cannot punch hole (%s)\n", strerror(errno));
return -err;
} }
return 0; return 0;