[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 1/9] migration: fix handling for --only-migratable
From: |
Dr. David Alan Gilbert (git) |
Subject: |
[Qemu-devel] [PULL 1/9] migration: fix handling for --only-migratable |
Date: |
Mon, 10 Jul 2017 18:10:32 +0100 |
From: Peter Xu <address@hidden>
MigrateState object is not ready at that time, so we'll get an
assertion. Use qemu_global_option() instead.
Reported-by: Eduardo Habkost <address@hidden>
Suggested-by: Eduardo Habkost <address@hidden>
Reviewed-by: Eduardo Habkost <address@hidden>
Reviewed-by: Juan Quintela <address@hidden>
Fixes: 3df663e ("migration: move only_migratable to MigrationState")
Signed-off-by: Peter Xu <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Dr. David Alan Gilbert <address@hidden>
---
include/migration/misc.h | 1 -
migration/migration.c | 5 -----
vl.c | 2 +-
3 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/include/migration/misc.h b/include/migration/misc.h
index 22551216bb..c079b7771b 100644
--- 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 51ccd1a4c5..dbdc121838 100644
--- 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 d17c863409..7a015eccc6 100644
--- 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;
--
2.13.0
- [Qemu-devel] [PULL 0/9] migration queue, Dr. David Alan Gilbert (git), 2017/07/10
- [Qemu-devel] [PULL 2/9] vl: move global property, migrate init earlier, Dr. David Alan Gilbert (git), 2017/07/10
- [Qemu-devel] [PULL 1/9] migration: fix handling for --only-migratable,
Dr. David Alan Gilbert (git) <=
- [Qemu-devel] [PULL 3/9] doc: add item for "-M enforce-config-section", Dr. David Alan Gilbert (git), 2017/07/10
- [Qemu-devel] [PULL 4/9] doc: update TYPE_MIGRATION documents, Dr. David Alan Gilbert (git), 2017/07/10
- [Qemu-devel] [PULL 5/9] migration: Rename save_live_setup() to save_setup(), Dr. David Alan Gilbert (git), 2017/07/10
- [Qemu-devel] [PULL 6/9] migration: Rename cleanup() to save_cleanup(), Dr. David Alan Gilbert (git), 2017/07/10
- [Qemu-devel] [PULL 8/9] migration: Convert ram to use new load_setup()/load_cleanup(), Dr. David Alan Gilbert (git), 2017/07/10
- [Qemu-devel] [PULL 7/9] migration: Create load_setup()/cleanup() methods, Dr. David Alan Gilbert (git), 2017/07/10
- [Qemu-devel] [PULL 9/9] migration: Make compression_threads use save/load_setup/cleanup(), Dr. David Alan Gilbert (git), 2017/07/10
- Re: [Qemu-devel] [PULL 0/9] migration queue, Peter Maydell, 2017/07/11