From cfaf6d36ae761da1033159d85d670706ffb24fb9 Mon Sep 17 00:00:00 2001 From: Juan Quintela Date: Wed, 10 Mar 2010 00:10:35 +0100 Subject: 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 Signed-off-by: Anthony Liguori --- migration-fd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'migration-fd.c') diff --git a/migration-fd.c b/migration-fd.c index 0cc74ad8b2..9cf52ce90b 100644 --- a/migration-fd.c +++ b/migration-fd.c @@ -113,12 +113,12 @@ static void fd_accept_incoming_migration(void *opaque) } qemu_announce_self(); DPRINTF("successfully loaded vm state\n"); - /* we've successfully migrated, close the fd */ - qemu_set_fd_handler2(qemu_stdio_fd(f), NULL, NULL, NULL, NULL); + if (autostart) vm_start(); err: + qemu_set_fd_handler2(qemu_stdio_fd(f), NULL, NULL, NULL, NULL); qemu_fclose(f); } -- cgit v1.2.1