diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2020-10-21 07:19:34 -0400 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2020-12-10 12:15:13 -0500 |
| commit | a3ef9bfb8808f615bd77dcc2ec5332e4cf670f92 (patch) | |
| tree | 6820f0df7747d6ba989d4a3fb7e3fae4f6aee1c6 | |
| parent | f650266bc53a0195fc227e4ba8e816ac6f2d19e8 (diff) | |
| download | focaccia-qemu-a3ef9bfb8808f615bd77dcc2ec5332e4cf670f92.tar.gz focaccia-qemu-a3ef9bfb8808f615bd77dcc2ec5332e4cf670f92.zip | |
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>
| -rw-r--r-- | hw/core/machine.c | 5 | ||||
| -rw-r--r-- | softmmu/vl.c | 5 |
2 files changed, 5 insertions, 5 deletions
diff --git a/hw/core/machine.c b/hw/core/machine.c index 5a65b9d88e..71a0e375ab 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -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, 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 */ |