Skip to content

Commit

Permalink
Do not use dprintf
Browse files Browse the repository at this point in the history 
dprintf is already claimed by POSIX[1], and on at least one system
is implemented as a macro

[1] http://www.opengroup.org/onlinepubs/9699919799/functions/dprintf.html

Signed-off-by: malc <av1474@comtv.ru>
  • Loading branch information
malc committed Feb 6, 2010
1 parent bc4347b commit d0f2c4c
Show file tree
Hide file tree
Showing 14 changed files with 204 additions and 204 deletions.
10 changes: 5 additions & 5 deletions block-migration.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@
//#define DEBUG_BLK_MIGRATION

#ifdef DEBUG_BLK_MIGRATION
#define dprintf(fmt, ...) \
#define DPRINTF(fmt, ...) \
do { printf("blk_migration: " fmt, ## __VA_ARGS__); } while (0)
#else
#define dprintf(fmt, ...) \
#define DPRINTF(fmt, ...) \
do { } while (0)
#endif

Expand Down Expand Up @@ -332,7 +332,7 @@ static void flush_blks(QEMUFile* f)
{
BlkMigBlock *blk;

dprintf("%s Enter submitted %d read_done %d transferred %d\n",
DPRINTF("%s Enter submitted %d read_done %d transferred %d\n",
__FUNCTION__, block_mig_state.submitted, block_mig_state.read_done,
block_mig_state.transferred);

Expand All @@ -355,7 +355,7 @@ static void flush_blks(QEMUFile* f)
assert(block_mig_state.read_done >= 0);
}

dprintf("%s Exit submitted %d read_done %d transferred %d\n", __FUNCTION__,
DPRINTF("%s Exit submitted %d read_done %d transferred %d\n", __FUNCTION__,
block_mig_state.submitted, block_mig_state.read_done,
block_mig_state.transferred);
}
Expand Down Expand Up @@ -400,7 +400,7 @@ static void blk_mig_cleanup(Monitor *mon)

static int block_save_live(Monitor *mon, QEMUFile *f, int stage, void *opaque)
{
dprintf("Enter save live stage %d submitted %d transferred %d\n",
DPRINTF("Enter save live stage %d submitted %d transferred %d\n",
stage, block_mig_state.submitted, block_mig_state.transferred);

if (stage < 0) {
Expand Down
16 changes: 8 additions & 8 deletions block/curl.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@
// #define DEBUG_VERBOSE

#ifdef DEBUG_CURL
#define dprintf(fmt, ...) do { printf(fmt, ## __VA_ARGS__); } while (0)
#define DPRINTF(fmt, ...) do { printf(fmt, ## __VA_ARGS__); } while (0)
#else
#define dprintf(fmt, ...) do { } while (0)
#define DPRINTF(fmt, ...) do { } while (0)
#endif

#define CURL_NUM_STATES 8
Expand Down Expand Up @@ -80,7 +80,7 @@ static void curl_multi_do(void *arg);
static int curl_sock_cb(CURL *curl, curl_socket_t fd, int action,
void *s, void *sp)
{
dprintf("CURL (AIO): Sock action %d on fd %d\n", action, fd);
DPRINTF("CURL (AIO): Sock action %d on fd %d\n", action, fd);
switch (action) {
case CURL_POLL_IN:
qemu_aio_set_fd_handler(fd, curl_multi_do, NULL, NULL, NULL, s);
Expand Down Expand Up @@ -118,7 +118,7 @@ static size_t curl_read_cb(void *ptr, size_t size, size_t nmemb, void *opaque)
size_t realsize = size * nmemb;
int i;

dprintf("CURL: Just reading %lld bytes\n", (unsigned long long)realsize);
DPRINTF("CURL: Just reading %lld bytes\n", (unsigned long long)realsize);

if (!s || !s->orig_buf)
goto read_end;
Expand Down Expand Up @@ -349,7 +349,7 @@ static int curl_open(BlockDriverState *bs, const char *filename, int flags)
inited = 1;
}

dprintf("CURL: Opening %s\n", file);
DPRINTF("CURL: Opening %s\n", file);
s->url = file;
state = curl_init_state(s);
if (!state)
Expand All @@ -368,7 +368,7 @@ static int curl_open(BlockDriverState *bs, const char *filename, int flags)
s->len = (size_t)d;
else if(!s->len)
goto out;
dprintf("CURL: Size = %lld\n", (long long)s->len);
DPRINTF("CURL: Size = %lld\n", (long long)s->len);

curl_clean_state(state);
curl_easy_cleanup(state->curl);
Expand Down Expand Up @@ -451,7 +451,7 @@ static BlockDriverAIOCB *curl_aio_readv(BlockDriverState *bs,
state->acb[0] = acb;

snprintf(state->range, 127, "%lld-%lld", (long long)start, (long long)end);
dprintf("CURL (AIO): Reading %d at %lld (%s)\n", (nb_sectors * SECTOR_SIZE), start, state->range);
DPRINTF("CURL (AIO): Reading %d at %lld (%s)\n", (nb_sectors * SECTOR_SIZE), start, state->range);
curl_easy_setopt(state->curl, CURLOPT_RANGE, state->range);

curl_multi_add_handle(s->multi, state->curl);
Expand All @@ -465,7 +465,7 @@ static void curl_close(BlockDriverState *bs)
BDRVCURLState *s = bs->opaque;
int i;

dprintf("CURL: Close\n");
DPRINTF("CURL: Close\n");
for (i=0; i<CURL_NUM_STATES; i++) {
if (s->states[i].in_use)
curl_clean_state(&s->states[i]);
Expand Down
36 changes: 18 additions & 18 deletions buffered_file.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@ typedef struct QEMUFileBuffered
} QEMUFileBuffered;

#ifdef DEBUG_BUFFERED_FILE
#define dprintf(fmt, ...) \
#define DPRINTF(fmt, ...) \
do { printf("buffered-file: " fmt, ## __VA_ARGS__); } while (0)
#else
#define dprintf(fmt, ...) \
#define DPRINTF(fmt, ...) \
do { } while (0)
#endif

Expand All @@ -52,7 +52,7 @@ static void buffered_append(QEMUFileBuffered *s,
if (size > (s->buffer_capacity - s->buffer_size)) {
void *tmp;

dprintf("increasing buffer capacity from %zu by %zu\n",
DPRINTF("increasing buffer capacity from %zu by %zu\n",
s->buffer_capacity, size + 1024);

s->buffer_capacity += size + 1024;
Expand All @@ -75,34 +75,34 @@ static void buffered_flush(QEMUFileBuffered *s)
size_t offset = 0;

if (s->has_error) {
dprintf("flush when error, bailing\n");
DPRINTF("flush when error, bailing\n");
return;
}

dprintf("flushing %zu byte(s) of data\n", s->buffer_size);
DPRINTF("flushing %zu byte(s) of data\n", s->buffer_size);

while (offset < s->buffer_size) {
ssize_t ret;

ret = s->put_buffer(s->opaque, s->buffer + offset,
s->buffer_size - offset);
if (ret == -EAGAIN) {
dprintf("backend not ready, freezing\n");
DPRINTF("backend not ready, freezing\n");
s->freeze_output = 1;
break;
}

if (ret <= 0) {
dprintf("error flushing data, %zd\n", ret);
DPRINTF("error flushing data, %zd\n", ret);
s->has_error = 1;
break;
} else {
dprintf("flushed %zd byte(s)\n", ret);
DPRINTF("flushed %zd byte(s)\n", ret);
offset += ret;
}
}

dprintf("flushed %zu of %zu byte(s)\n", offset, s->buffer_size);
DPRINTF("flushed %zu of %zu byte(s)\n", offset, s->buffer_size);
memmove(s->buffer, s->buffer + offset, s->buffer_size - offset);
s->buffer_size -= offset;
}
Expand All @@ -113,45 +113,45 @@ static int buffered_put_buffer(void *opaque, const uint8_t *buf, int64_t pos, in
int offset = 0;
ssize_t ret;

dprintf("putting %d bytes at %" PRId64 "\n", size, pos);
DPRINTF("putting %d bytes at %" PRId64 "\n", size, pos);

if (s->has_error) {
dprintf("flush when error, bailing\n");
DPRINTF("flush when error, bailing\n");
return -EINVAL;
}

dprintf("unfreezing output\n");
DPRINTF("unfreezing output\n");
s->freeze_output = 0;

buffered_flush(s);

while (!s->freeze_output && offset < size) {
if (s->bytes_xfer > s->xfer_limit) {
dprintf("transfer limit exceeded when putting\n");
DPRINTF("transfer limit exceeded when putting\n");
break;
}

ret = s->put_buffer(s->opaque, buf + offset, size - offset);
if (ret == -EAGAIN) {
dprintf("backend not ready, freezing\n");
DPRINTF("backend not ready, freezing\n");
s->freeze_output = 1;
break;
}

if (ret <= 0) {
dprintf("error putting\n");
DPRINTF("error putting\n");
s->has_error = 1;
offset = -EINVAL;
break;
}

dprintf("put %zd byte(s)\n", ret);
DPRINTF("put %zd byte(s)\n", ret);
offset += ret;
s->bytes_xfer += ret;
}

if (offset >= 0) {
dprintf("buffering %d bytes\n", size - offset);
DPRINTF("buffering %d bytes\n", size - offset);
buffered_append(s, buf + offset, size - offset);
offset = size;
}
Expand All @@ -164,7 +164,7 @@ static int buffered_close(void *opaque)
QEMUFileBuffered *s = opaque;
int ret;

dprintf("closing\n");
DPRINTF("closing\n");

while (!s->has_error && s->buffer_size) {
buffered_flush(s);
Expand Down
36 changes: 18 additions & 18 deletions hw/gt64xxx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@
//#define DEBUG

#ifdef DEBUG
#define dprintf(fmt, ...) fprintf(stderr, "%s: " fmt, __FUNCTION__, ##__VA_ARGS__)
#define DPRINTF(fmt, ...) fprintf(stderr, "%s: " fmt, __FUNCTION__, ##__VA_ARGS__)
#else
#define dprintf(fmt, ...)
#define DPRINTF(fmt, ...)
#endif

#define GT_REGS (0x1000 >> 2)
Expand Down Expand Up @@ -276,7 +276,7 @@ static void gt64120_isd_mapping(GT64120State *s)
check_reserved_space(&start, &length);
length = 0x1000;
/* Map new address */
dprintf("ISD: %x@%x -> %x@%x, %x\n", s->ISD_length, s->ISD_start,
DPRINTF("ISD: %x@%x -> %x@%x, %x\n", s->ISD_length, s->ISD_start,
length, start, s->ISD_handle);
s->ISD_start = start;
s->ISD_length = length;
Expand Down Expand Up @@ -423,7 +423,7 @@ static void gt64120_writel (void *opaque, target_phys_addr_t addr,
case GT_DEV_B3:
case GT_DEV_BOOT:
/* Not implemented */
dprintf ("Unimplemented device register offset 0x%x\n", saddr << 2);
DPRINTF ("Unimplemented device register offset 0x%x\n", saddr << 2);
break;

/* ECC */
Expand Down Expand Up @@ -457,7 +457,7 @@ static void gt64120_writel (void *opaque, target_phys_addr_t addr,
case GT_DMA2_CUR:
case GT_DMA3_CUR:
/* Not implemented */
dprintf ("Unimplemented DMA register offset 0x%x\n", saddr << 2);
DPRINTF ("Unimplemented DMA register offset 0x%x\n", saddr << 2);
break;

/* DMA Channel Control */
Expand All @@ -466,13 +466,13 @@ static void gt64120_writel (void *opaque, target_phys_addr_t addr,
case GT_DMA2_CTRL:
case GT_DMA3_CTRL:
/* Not implemented */
dprintf ("Unimplemented DMA register offset 0x%x\n", saddr << 2);
DPRINTF ("Unimplemented DMA register offset 0x%x\n", saddr << 2);
break;

/* DMA Arbiter */
case GT_DMA_ARB:
/* Not implemented */
dprintf ("Unimplemented DMA register offset 0x%x\n", saddr << 2);
DPRINTF ("Unimplemented DMA register offset 0x%x\n", saddr << 2);
break;

/* Timer/Counter */
Expand All @@ -482,7 +482,7 @@ static void gt64120_writel (void *opaque, target_phys_addr_t addr,
case GT_TC3:
case GT_TC_CONTROL:
/* Not implemented */
dprintf ("Unimplemented timer register offset 0x%x\n", saddr << 2);
DPRINTF ("Unimplemented timer register offset 0x%x\n", saddr << 2);
break;

/* PCI Internal */
Expand Down Expand Up @@ -539,19 +539,19 @@ static void gt64120_writel (void *opaque, target_phys_addr_t addr,
/* not really implemented */
s->regs[saddr] = ~(~(s->regs[saddr]) | ~(val & 0xfffffffe));
s->regs[saddr] |= !!(s->regs[saddr] & 0xfffffffe);
dprintf("INTRCAUSE %x\n", val);
DPRINTF("INTRCAUSE %x\n", val);
break;
case GT_INTRMASK:
s->regs[saddr] = val & 0x3c3ffffe;
dprintf("INTRMASK %x\n", val);
DPRINTF("INTRMASK %x\n", val);
break;
case GT_PCI0_ICMASK:
s->regs[saddr] = val & 0x03fffffe;
dprintf("ICMASK %x\n", val);
DPRINTF("ICMASK %x\n", val);
break;
case GT_PCI0_SERR0MASK:
s->regs[saddr] = val & 0x0000003f;
dprintf("SERR0MASK %x\n", val);
DPRINTF("SERR0MASK %x\n", val);
break;

/* Reserved when only PCI_0 is configured. */
Expand All @@ -575,7 +575,7 @@ static void gt64120_writel (void *opaque, target_phys_addr_t addr,
break;

default:
dprintf ("Bad register offset 0x%x\n", (int)addr);
DPRINTF ("Bad register offset 0x%x\n", (int)addr);
break;
}
}
Expand Down Expand Up @@ -815,19 +815,19 @@ static uint32_t gt64120_readl (void *opaque,
/* Interrupts */
case GT_INTRCAUSE:
val = s->regs[saddr];
dprintf("INTRCAUSE %x\n", val);
DPRINTF("INTRCAUSE %x\n", val);
break;
case GT_INTRMASK:
val = s->regs[saddr];
dprintf("INTRMASK %x\n", val);
DPRINTF("INTRMASK %x\n", val);
break;
case GT_PCI0_ICMASK:
val = s->regs[saddr];
dprintf("ICMASK %x\n", val);
DPRINTF("ICMASK %x\n", val);
break;
case GT_PCI0_SERR0MASK:
val = s->regs[saddr];
dprintf("SERR0MASK %x\n", val);
DPRINTF("SERR0MASK %x\n", val);
break;

/* Reserved when only PCI_0 is configured. */
Expand All @@ -842,7 +842,7 @@ static uint32_t gt64120_readl (void *opaque,

default:
val = s->regs[saddr];
dprintf ("Bad register offset 0x%x\n", (int)addr);
DPRINTF ("Bad register offset 0x%x\n", (int)addr);
break;
}

Expand Down
Loading

0 comments on commit d0f2c4c

Please sign in to comment.