1 files changed, 4 insertions, 3 deletions
diff --git a/vl.c b/vl.c
index f2964d9e43..0388852deb 100644
--- a/vl.c
+++ b/vl.c
@@ -4535,9 +4535,7 @@ int main(int argc, char **argv, char **envp)
     replay_checkpoint(CHECKPOINT_RESET);
     qemu_system_reset(SHUTDOWN_CAUSE_NONE);
     register_global_state();
-    if (replay_mode != REPLAY_MODE_NONE) {
-        replay_vmstate_init();
-    } else if (loadvm) {
+    if (loadvm) {
         Error *local_err = NULL;
         if (load_snapshot(loadvm, &local_err) < 0) {
             error_report_err(local_err);
@@ -4545,6 +4543,9 @@ int main(int argc, char **argv, char **envp)
             exit(1);
         }
     }
+    if (replay_mode != REPLAY_MODE_NONE) {
+        replay_vmstate_init();
+    }
 
     qdev_prop_check_globals();
     if (vmstate_dump_file) {