aboutsummaryrefslogtreecommitdiff
path: root/migration-unix.c
diff options
context:
space:
mode:
authorJuan Quintela <quintela@redhat.com>2010-03-10 00:10:35 +0100
committerAnthony Liguori <aliguori@us.ibm.com>2010-03-17 11:16:15 -0500
commitcfaf6d36ae761da1033159d85d670706ffb24fb9 (patch)
treea5165f1ba834d1478cf407fd9d66dd1efb0dcc7c /migration-unix.c
parent0056dcc1146545e7c814db83b7b7b62e0c93ac68 (diff)
downloadqemu-arm-cfaf6d36ae761da1033159d85d670706ffb24fb9.tar.gz
migration: Clear fd also in error cases
Not clearing the fd and closing the file makes qemu spin using 100%CPU after incoming migration error. See for instance bug: https://bugzilla.redhat.com/show_bug.cgi?id=518032 Signed-off-by: Juan Quintela <quintela@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'migration-unix.c')
-rw-r--r--migration-unix.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/migration-unix.c b/migration-unix.c
index b7aab3843a..ce59a2a9e8 100644
--- a/migration-unix.c
+++ b/migration-unix.c
@@ -176,13 +176,12 @@ static void unix_accept_incoming_migration(void *opaque)
qemu_announce_self();
DPRINTF("successfully loaded vm state\n");
- /* we've successfully migrated, close the server socket */
- qemu_set_fd_handler2(s, NULL, NULL, NULL, NULL);
- close(s);
out_fopen:
qemu_fclose(f);
out:
+ qemu_set_fd_handler2(s, NULL, NULL, NULL, NULL);
+ close(s);
close(c);
}