[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 2/9] vl: move global property, migrate init earlier
From: |
Dr. David Alan Gilbert (git) |
Subject: |
[Qemu-devel] [PULL 2/9] vl: move global property, migrate init earlier |
Date: |
Mon, 10 Jul 2017 18:10:33 +0100 |
From: Peter Xu <address@hidden>
Currently drive_init_func() may call migrate_get_current() while the
migrate object is still not ready yet at that time. Move the migration
object init earlier, along with the global properties, right after
acceleration init.
This fixes a breakage for iotest 055, which caused an assertion failure.
Reported-by: Max Reitz <address@hidden>
Reported-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Eduardo Habkost <address@hidden>
Tested-by: QingFeng Hao <address@hidden>
Fixes: 3df663 ("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>
---
vl.c | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/vl.c b/vl.c
index 7a015eccc6..f7560de622 100644
--- a/vl.c
+++ b/vl.c
@@ -4418,6 +4418,18 @@ int main(int argc, char **argv, char **envp)
configure_accelerator(current_machine);
+ /*
+ * Register all the global properties, including accel properties,
+ * machine properties, and user-specified ones.
+ */
+ register_global_properties(current_machine);
+
+ /*
+ * Migration object can only be created after global properties
+ * are applied correctly.
+ */
+ migration_object_init();
+
if (qtest_chrdev) {
qtest_init(qtest_chrdev, qtest_log, &error_fatal);
}
@@ -4601,18 +4613,6 @@ int main(int argc, char **argv, char **envp)
exit (i == 1 ? 1 : 0);
}
- /*
- * Register all the global properties, including accel properties,
- * machine properties, and user-specified ones.
- */
- register_global_properties(current_machine);
-
- /*
- * Migration object can only be created after global properties
- * are applied correctly.
- */
- migration_object_init();
-
/* This checkpoint is required by replay to separate prior clock
reading from the other reads, because timer polling functions query
clock values from the log. */
--
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) <=
- [Qemu-devel] [PULL 1/9] migration: fix handling for --only-migratable, Dr. David Alan Gilbert (git), 2017/07/10
- [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