Merge remote-tracking branch 'sstabellini/saverestore-8' into staging

[qemu.git] / vl.c

diff --git a/vl.c b/vl.c
index eeb634b9ade5e54321a55c41affe02fee965c328..112b0e0af96628c883b5cad61feb8fbafc41b808 100644 (file)
--- a/vl.c
+++ b/vl.c
@@ -3099,6 +3099,7 @@ int main(int argc, char **argv, char **envp)
                 break;
             case QEMU_OPTION_incoming:
                 incoming = optarg;
+                runstate_set(RUN_STATE_INMIGRATE);
                 break;
             case QEMU_OPTION_nodefaults:
                 default_serial = 0;
@@ -3616,7 +3617,6 @@ int main(int argc, char **argv, char **envp)
     }
 
     if (incoming) {
-        runstate_set(RUN_STATE_INMIGRATE);
         int ret = qemu_start_incoming_migration(incoming);
         if (ret < 0) {
             fprintf(stderr, "Migration failed. Exit code %s(%d), exiting.\n",