From 304e3a7c802969811fe82b6247f63fcba063f52e Mon Sep 17 00:00:00 2001 From: Yoshiaki Tamura Date: Thu, 10 Jun 2010 06:50:10 +0900 Subject: migration-tcp: call migrate_fd_error() instead of close() and free(). This patch fixes the following error report. When changing migration-tcp.c to call migrate_fd_error() instead of close() and free() by itself, monitor is resumed, and returns allocated mig_state is set to current_migration in migration.c allows us to print "info migrate". Reported-by: Cole Robinson Signed-off-by: Yoshiaki Tamura Signed-off-by: Anthony Liguori --- migration-tcp.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'migration-tcp.c') diff --git a/migration-tcp.c b/migration-tcp.c index 95ce722fec..43af2e0450 100644 --- a/migration-tcp.c +++ b/migration-tcp.c @@ -128,9 +128,7 @@ MigrationState *tcp_start_outgoing_migration(Monitor *mon, if (ret < 0 && ret != -EINPROGRESS && ret != -EWOULDBLOCK) { DPRINTF("connect failed\n"); - close(s->fd); - qemu_free(s); - return NULL; + migrate_fd_error(s); } else if (ret >= 0) migrate_fd_connect(s); -- cgit v1.2.1