migration: fix handling for --only-migratable

MigrateState object is not ready at that time, so we'll get an
assertion. Use qemu_global_option() instead.

Reported-by: Eduardo Habkost <[email protected]>
Suggested-by: Eduardo Habkost <[email protected]>
Reviewed-by: Eduardo Habkost <[email protected]>
Reviewed-by: Juan Quintela <[email protected]>
Fixes: 3df663e ("migration: move only_migratable to MigrationState")
Signed-off-by: Peter Xu <[email protected]>
Message-Id: <1499242883[email protected]>
Signed-off-by: Dr. David Alan Gilbert <[email protected]>

diff --git a/include/migration/misc.h b/include/migration/misc.h
index 22551216bb427d5203df6fb039fbe35005c89015..c079b7771b72fd2607c057a0ff5c89da19a98cc8 100644 (file)
--- a/include/migration/misc.h
+++ b/include/migration/misc.h
@@ -53,7 +53,6 @@ bool migration_has_finished(MigrationState *);
 bool migration_has_failed(MigrationState *);
 /* ...and after the device transmission */
 bool migration_in_postcopy_after_devices(MigrationState *);
-void migration_only_migratable_set(void);
 void migration_global_dump(Monitor *mon);
 
 #endif

diff --git a/migration/migration.c b/migration/migration.c
index 51ccd1a4c5177fb997759ebe5322490b4e2b0bef..dbdc121838cf5cfc61bd05edaf18aded36cae838 100644 (file)
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -128,11 +128,6 @@ MigrationState *migrate_get_current(void)
     return current_migration;
 }
 
-void migration_only_migratable_set(void)
-{
-    migrate_get_current()->only_migratable = true;
-}
-
 MigrationIncomingState *migration_incoming_get_current(void)
 {
     static bool once;

diff --git a/vl.c b/vl.c
index d17c863409e5220e0992e1f1c149c171471a9d9b..7a015eccc6cd483a0db5de25e31b6fed333349d8 100644 (file)
--- a/vl.c
+++ b/vl.c
@@ -3962,7 +3962,7 @@ int main(int argc, char **argv, char **envp)
                  *
                  * "-global migration.only-migratable=true"
                  */
-                migration_only_migratable_set();
+                qemu_global_option("migration.only-migratable=true");
                 break;
             case QEMU_OPTION_nodefaults:
                 has_defaults = 0;