summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2012-08-07 10:50:26 +0200
committerPaolo Bonzini <pbonzini@redhat.com>2012-11-02 18:35:07 +0100
commitab52a824a496f4459539a9a11152d6da68703ea0 (patch)
tree1e450ada5167587e2fb1cf5e17312c4fe0dd8dd7
parent6c3601361ff22cb8bda3f483ea11c4f7bd095094 (diff)
downloadfocaccia-qemu-ab52a824a496f4459539a9a11152d6da68703ea0.tar.gz
focaccia-qemu-ab52a824a496f4459539a9a11152d6da68703ea0.zip
migration: close socket QEMUFile from socket_close
The common suffix now is process_incoming_migration+qemu_fclose.

Reviewed-by: Orit Wasserman <owasserm@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-rw-r--r--migration-tcp.c2
-rw-r--r--migration-unix.c2
-rw-r--r--savevm.c1
3 files changed, 5 insertions, 0 deletions
diff --git a/migration-tcp.c b/migration-tcp.c
index bb27ce832a..1279cc9677 100644
--- a/migration-tcp.c
+++ b/migration-tcp.c
@@ -103,6 +103,8 @@ static void tcp_accept_incoming_migration(void *opaque)
 
     process_incoming_migration(f);
     qemu_fclose(f);
+    return;
+
 out:
     closesocket(c);
 }
diff --git a/migration-unix.c b/migration-unix.c
index 9b5521edec..96ea71b787 100644
--- a/migration-unix.c
+++ b/migration-unix.c
@@ -103,6 +103,8 @@ static void unix_accept_incoming_migration(void *opaque)
 
     process_incoming_migration(f);
     qemu_fclose(f);
+    return;
+
 out:
     close(c);
 }
diff --git a/savevm.c b/savevm.c
index 0ab1ad4afd..cdad3ad8e4 100644
--- a/savevm.c
+++ b/savevm.c
@@ -213,6 +213,7 @@ static int socket_get_buffer(void *opaque, uint8_t *buf, int64_t pos, int size)
 static int socket_close(void *opaque)
 {
     QEMUFileSocket *s = opaque;
+    closesocket(s->fd);
     g_free(s);
     return 0;
 }