vl: move CHECKPOINT_INIT after preconfig

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é <philmd@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2020-10-21 07:19:34 -04:00
parent f650266bc5
commit a3ef9bfb88
2 changed files with 5 additions and 5 deletions

View File

@ -1110,6 +1110,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,

View File

@ -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 */