From: Amit Shah Date: Wed, 14 Oct 2015 12:07:19 +0000 (+0530) Subject: migration: announce VM's new home just before VM is runnable X-Git-Tag: TizenStudio_2.0_p2.3.2~120^2~1^2~136^2~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=92e3762237475407fe03e1ccac6e30612ab96caf;p=sdk%2Femulator%2Fqemu.git migration: announce VM's new home just before VM is runnable We were announcing the dest host's IP as our new IP a bit too soon -- if there were errors detected after this announcement was done, the migration is failed and the VM could continue running on the src host -- causing problems later. Move around the qemu_announce_self() call so it's done just before the VM is runnable. Signed-off-by: Amit Shah Reviewed-by: Juan Quintela Reviewed-by: Michael S. Tsirkin Signed-off-by: Juan Quintela --- diff --git a/migration/migration.c b/migration/migration.c index 3d40f24..b092f38 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -294,7 +294,6 @@ static void process_incoming_migration_co(void *opaque) migrate_decompress_threads_join(); exit(EXIT_FAILURE); } - qemu_announce_self(); /* Make sure all file formats flush their mutable metadata */ bdrv_invalidate_cache_all(&local_err); @@ -305,6 +304,12 @@ static void process_incoming_migration_co(void *opaque) exit(EXIT_FAILURE); } + /* + * This must happen after all error conditions are dealt with and + * we're sure the VM is going to be running on this host. + */ + qemu_announce_self(); + /* If global state section was not received or we are in running state, we need to obey autostart. Any other state is set with runstate_set. */