[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 1/4] migration: fix handling for --only-migratabl
From: |
Peter Xu |
Subject: |
[Qemu-devel] [PATCH v2 1/4] migration: fix handling for --only-migratable |
Date: |
Wed, 5 Jul 2017 16:21:20 +0800 |
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>
---
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 2255121..c079b77 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 51ccd1a..dbdc121 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 36ff3f4..0c497a3 100644
--- a/vl.c
+++ b/vl.c
@@ -3958,7 +3958,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.7.4
- [Qemu-devel] [PATCH v2 0/4] migration: fix iotest 055, only-migratable break, Peter Xu, 2017/07/05
- [Qemu-devel] [PATCH v2 1/4] migration: fix handling for --only-migratable,
Peter Xu <=
- [Qemu-devel] [PATCH v2 2/4] vl: move global property, migrate init earlier, Peter Xu, 2017/07/05
- [Qemu-devel] [PATCH v2 3/4] doc: add item for "-M enforce-config-section", Peter Xu, 2017/07/05
- [Qemu-devel] [PATCH v2.1 3/4] doc: add item for "-M enforce-config-section", Peter Xu, 2017/07/05
- Re: [Qemu-devel] [PATCH v2.1 3/4] doc: add item for "-M enforce-config-section", Eduardo Habkost, 2017/07/06
- [Qemu-devel] [PATCH v2.2 3/4] doc: add item for "-M enforce-config-section", Peter Xu, 2017/07/06
- Re: [Qemu-devel] [PATCH v2.2 3/4] doc: add item for "-M enforce-config-section", Greg Kurz, 2017/07/07
- Re: [Qemu-devel] [PATCH v2.2 3/4] doc: add item for "-M enforce-config-section", Eduardo Habkost, 2017/07/07
- Re: [Qemu-devel] [PATCH v2.2 3/4] doc: add item for "-M enforce-config-section", Dr. David Alan Gilbert, 2017/07/07