Re: [PATCH 15/36] vl: move CHECKPOINT_INIT after preconfig

[Igor Mammedov]

On Mon, 23 Nov 2020 09:14:14 -0500
Paolo Bonzini <pbonzini@redhat.com> wrote:

> 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>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

Reviewed-by: Igor Mammedov <imammedo@redhat.com>

> ---
>  hw/core/machine.c | 5 +++++
>  softmmu/vl.c      | 5 -----
>  2 files changed, 5 insertions(+), 5 deletions(-)
> 
> 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 b6c62e1e4f..dc0cdc3417 100644
> --- a/softmmu/vl.c
> +++ b/softmmu/vl.c
> @@ -4437,11 +4437,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 */