[PULL,065/113] vl: move CHECKPOINT_INIT after preconfig

Commit Message

Paolo Bonzini Dec. 2, 2020, 8:08 a.m. UTC

Move CHECKPOINT_INIT right before the machine initialization is
completed.  Everything before is essentially an extension of
command line parsing.

Reviewed-by: Philippe Mathieu-Daudé <[e-mail]>
Reviewed-by: Igor Mammedov <[e-mail]>
Signed-off-by: Paolo Bonzini <[e-mail]>
---
 hw/core/machine.c | 5 +++++
 softmmu/vl.c      | 5 -----
 2 files changed, 5 insertions(+), 5 deletions(-)

Patch

diff --git a/hw/core/machine.c b/hw/core/machine.c
index 7ef3de5ce5..a5cfbcc7cb 100644
--- a/hw/core/machine.c
+++ b/hw/core/machine.c
@@ -1107,6 +1107,11 @@  void machine_run_board_init(MachineState *machine)
     ObjectClass *oc = object_class_by_name(machine->cpu_type);
     CPUClass *cc;
 
+    /* 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. */
+    replay_checkpoint(CHECKPOINT_INIT);
+
     if (machine->ram_memdev_id) {
         Object *o;
         o = object_resolve_path_type(machine->ram_memdev_id,
diff --git a/softmmu/vl.c b/softmmu/vl.c
index 1a80a9a68d..91ef21833b 100644
--- a/softmmu/vl.c
+++ b/softmmu/vl.c
@@ -4443,11 +4443,6 @@  void qemu_init(int argc, char **argv, char **envp)
     qemu_semihosting_connect_chardevs();
     qemu_semihosting_console_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. */
-    replay_checkpoint(CHECKPOINT_INIT);
-
     current_machine->boot_order = boot_order;
 
     /* parse features once if machine provides default cpu_type */