From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34820) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3moO-0001Ca-Jt for qemu-devel@nongnu.org; Mon, 29 Jul 2013 08:44:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V3moJ-0002yJ-Ne for qemu-devel@nongnu.org; Mon, 29 Jul 2013 08:44:28 -0400 Date: Mon, 29 Jul 2013 14:44:16 +0200 From: Kevin Wolf Message-ID: <20130729124416.GC10467@dhcp-200-207.str.redhat.com> References: <1375100199-13934-1-git-send-email-peter.maydell@linaro.org> <1375100199-13934-2-git-send-email-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1375100199-13934-2-git-send-email-peter.maydell@linaro.org> Subject: Re: [Qemu-devel] [PATCH 1/4] block/sheepdog: Rename 'dprintf' to 'DPRINTF' List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Maydell Cc: Anthony Liguori , patches@linaro.org, Alexander Graf , qemu-devel@nongnu.org, Andreas =?iso-8859-1?Q?F=E4rber?= , qemu-ppc@nongnu.org, Stefan Hajnoczi , Paolo Bonzini , morita.kazutaka@lab.ntt.co.jp, Richard Henderson Am 29.07.2013 um 14:16 hat Peter Maydell geschrieben: > 'dprintf' is the name of a POSIX standard function so we should not be > stealing it for our debug macro. Rename to 'DPRINTF' (in line with > a number of other source files.) > > Signed-off-by: Peter Maydell Acked-by: Kevin Wolf (CCed Kazutaka in case he has any objections, unexpectedly) > --- > block/sheepdog.c | 30 +++++++++++++++--------------- > 1 file changed, 15 insertions(+), 15 deletions(-) > > diff --git a/block/sheepdog.c b/block/sheepdog.c > index 6a41ad9..a506137 100644 > --- a/block/sheepdog.c > +++ b/block/sheepdog.c > @@ -242,14 +242,14 @@ static inline bool is_snapshot(struct SheepdogInode *inode) > return !!inode->snap_ctime; > } > > -#undef dprintf > +#undef DPRINTF > #ifdef DEBUG_SDOG > -#define dprintf(fmt, args...) \ > +#define DPRINTF(fmt, args...) \ > do { \ > fprintf(stdout, "%s %d: " fmt, __func__, __LINE__, ##args); \ > } while (0) > #else > -#define dprintf(fmt, args...) > +#define DPRINTF(fmt, args...) > #endif > > typedef struct SheepdogAIOCB SheepdogAIOCB; > @@ -729,7 +729,7 @@ static void coroutine_fn aio_read_response(void *opaque) > break; > case AIOCB_FLUSH_CACHE: > if (rsp.result == SD_RES_INVALID_PARMS) { > - dprintf("disable cache since the server doesn't support it\n"); > + DPRINTF("disable cache since the server doesn't support it\n"); > s->cache_flags = SD_FLAG_CMD_DIRECT; > rsp.result = SD_RES_SUCCESS; > } > @@ -1229,7 +1229,7 @@ static int coroutine_fn resend_aioreq(BDRVSheepdogState *s, AIOReq *aio_req) > * the same object */ > QLIST_FOREACH(areq, &s->inflight_aio_head, aio_siblings) { > if (areq != aio_req && areq->oid == aio_req->oid) { > - dprintf("simultaneous CoW to %" PRIx64 "\n", aio_req->oid); > + DPRINTF("simultaneous CoW to %" PRIx64 "\n", aio_req->oid); > QLIST_REMOVE(aio_req, aio_siblings); > QLIST_INSERT_HEAD(&s->pending_aio_head, aio_req, aio_siblings); > return SD_RES_SUCCESS; > @@ -1319,7 +1319,7 @@ static int sd_open(BlockDriverState *bs, QDict *options, int flags) > s->discard_supported = true; > > if (snapid || tag[0] != '\0') { > - dprintf("%" PRIx32 " snapshot inode was open.\n", vid); > + DPRINTF("%" PRIx32 " snapshot inode was open.\n", vid); > s->is_snapshot = true; > } > > @@ -1554,7 +1554,7 @@ static void sd_close(BlockDriverState *bs) > unsigned int wlen, rlen = 0; > int fd, ret; > > - dprintf("%s\n", s->name); > + DPRINTF("%s\n", s->name); > > fd = connect_to_sdog(s); > if (fd < 0) { > @@ -1714,7 +1714,7 @@ static int sd_create_branch(BDRVSheepdogState *s) > char *buf; > bool deleted; > > - dprintf("%" PRIx32 " is snapshot.\n", s->inode.vdi_id); > + DPRINTF("%" PRIx32 " is snapshot.\n", s->inode.vdi_id); > > buf = g_malloc(SD_INODE_SIZE); > > @@ -1730,7 +1730,7 @@ static int sd_create_branch(BDRVSheepdogState *s) > goto out; > } > > - dprintf("%" PRIx32 " is created.\n", vid); > + DPRINTF("%" PRIx32 " is created.\n", vid); > > fd = connect_to_sdog(s); > if (fd < 0) { > @@ -1751,7 +1751,7 @@ static int sd_create_branch(BDRVSheepdogState *s) > > s->is_snapshot = false; > ret = 0; > - dprintf("%" PRIx32 " was newly created.\n", s->inode.vdi_id); > + DPRINTF("%" PRIx32 " was newly created.\n", s->inode.vdi_id); > > out: > g_free(buf); > @@ -1841,11 +1841,11 @@ static int coroutine_fn sd_co_rw_vector(void *p) > } > > if (create) { > - dprintf("update ino (%" PRIu32 ") %" PRIu64 " %" PRIu64 " %ld\n", > + DPRINTF("update ino (%" PRIu32 ") %" PRIu64 " %" PRIu64 " %ld\n", > inode->vdi_id, oid, > vid_to_data_oid(inode->data_vdi_id[idx], idx), idx); > oid = vid_to_data_oid(inode->vdi_id, idx); > - dprintf("new oid %" PRIx64 "\n", oid); > + DPRINTF("new oid %" PRIx64 "\n", oid); > } > > aio_req = alloc_aio_req(s, acb, oid, len, offset, flags, old_oid, done); > @@ -1978,7 +1978,7 @@ static int sd_snapshot_create(BlockDriverState *bs, QEMUSnapshotInfo *sn_info) > SheepdogInode *inode; > unsigned int datalen; > > - dprintf("sn_info: name %s id_str %s s: name %s vm_state_size %" PRId64 " " > + DPRINTF("sn_info: name %s id_str %s s: name %s vm_state_size %" PRId64 " " > "is_snapshot %d\n", sn_info->name, sn_info->id_str, > s->name, sn_info->vm_state_size, s->is_snapshot); > > @@ -1989,7 +1989,7 @@ static int sd_snapshot_create(BlockDriverState *bs, QEMUSnapshotInfo *sn_info) > return -EINVAL; > } > > - dprintf("%s %s\n", sn_info->name, sn_info->id_str); > + DPRINTF("%s %s\n", sn_info->name, sn_info->id_str); > > s->inode.vm_state_size = sn_info->vm_state_size; > s->inode.vm_clock_nsec = sn_info->vm_clock_nsec; > @@ -2033,7 +2033,7 @@ static int sd_snapshot_create(BlockDriverState *bs, QEMUSnapshotInfo *sn_info) > } > > memcpy(&s->inode, inode, datalen); > - dprintf("s->inode: name %s snap_id %x oid %x\n", > + DPRINTF("s->inode: name %s snap_id %x oid %x\n", > s->inode.name, s->inode.snap_id, s->inode.vdi_id); > > cleanup: > -- > 1.7.9.5 >