diff options
author | malc <av1474@comtv.ru> | 2010-02-07 02:03:50 +0300 |
---|---|---|
committer | malc <av1474@comtv.ru> | 2010-02-07 02:03:50 +0300 |
commit | d0f2c4c60263e29a87681433e696844401514194 (patch) | |
tree | de9e60340c36e9d8d395e294f98c164b1b98435c /migration-tcp.c | |
parent | bc4347b883e8175dadef77ed9e02ccaa5e8eba94 (diff) |
Do not use dprintf
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>
Diffstat (limited to 'migration-tcp.c')
-rw-r--r-- | migration-tcp.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/migration-tcp.c b/migration-tcp.c index 2cfa8cba59..e7f307ce90 100644 --- a/migration-tcp.c +++ b/migration-tcp.c @@ -22,10 +22,10 @@ //#define DEBUG_MIGRATION_TCP #ifdef DEBUG_MIGRATION_TCP -#define dprintf(fmt, ...) \ +#define DPRINTF(fmt, ...) \ do { printf("migration-tcp: " fmt, ## __VA_ARGS__); } while (0) #else -#define dprintf(fmt, ...) \ +#define DPRINTF(fmt, ...) \ do { } while (0) #endif @@ -41,7 +41,7 @@ static int socket_write(FdMigrationState *s, const void * buf, size_t size) static int tcp_close(FdMigrationState *s) { - dprintf("tcp_close\n"); + DPRINTF("tcp_close\n"); if (s->fd != -1) { close(s->fd); s->fd = -1; @@ -56,7 +56,7 @@ static void tcp_wait_for_connect(void *opaque) int val, ret; socklen_t valsize = sizeof(val); - dprintf("connect completed\n"); + DPRINTF("connect completed\n"); do { ret = getsockopt(s->fd, SOL_SOCKET, SO_ERROR, (void *) &val, &valsize); } while (ret == -1 && (s->get_error(s)) == EINTR); @@ -71,7 +71,7 @@ static void tcp_wait_for_connect(void *opaque) if (val == 0) migrate_fd_connect(s); else { - dprintf("error connecting %d\n", val); + DPRINTF("error connecting %d\n", val); migrate_fd_error(s); } } @@ -127,7 +127,7 @@ MigrationState *tcp_start_outgoing_migration(Monitor *mon, } while (ret == -EINTR); if (ret < 0 && ret != -EINPROGRESS && ret != -EWOULDBLOCK) { - dprintf("connect failed\n"); + DPRINTF("connect failed\n"); close(s->fd); qemu_free(s); return NULL; @@ -149,7 +149,7 @@ static void tcp_accept_incoming_migration(void *opaque) c = qemu_accept(s, (struct sockaddr *)&addr, &addrlen); } while (c == -1 && socket_error() == EINTR); - dprintf("accepted migration\n"); + DPRINTF("accepted migration\n"); if (c == -1) { fprintf(stderr, "could not accept migration connection\n"); @@ -168,7 +168,7 @@ static void tcp_accept_incoming_migration(void *opaque) goto out_fopen; } qemu_announce_self(); - dprintf("successfully loaded vm state\n"); + DPRINTF("successfully loaded vm state\n"); /* we've successfully migrated, close the server socket */ qemu_set_fd_handler2(s, NULL, NULL, NULL, NULL); |