diff options
| author | Juan Quintela <quintela@redhat.com> | 2010-03-10 00:10:35 +0100 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2010-03-17 11:16:15 -0500 |
| commit | cfaf6d36ae761da1033159d85d670706ffb24fb9 (patch) | |
| tree | a5165f1ba834d1478cf407fd9d66dd1efb0dcc7c /migration-exec.c | |
| parent | 0056dcc1146545e7c814db83b7b7b62e0c93ac68 (diff) | |
| download | qemu-cfaf6d36ae761da1033159d85d670706ffb24fb9.tar.gz qemu-cfaf6d36ae761da1033159d85d670706ffb24fb9.tar.bz2 qemu-cfaf6d36ae761da1033159d85d670706ffb24fb9.zip | |
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-exec.c')
| -rw-r--r-- | migration-exec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/migration-exec.c b/migration-exec.c index 3edc026009..6ff844927c 100644 --- a/migration-exec.c +++ b/migration-exec.c @@ -120,12 +120,12 @@ static void exec_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); } |