[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 15/36] vl: move CHECKPOINT_INIT after preconfig
From: |
Paolo Bonzini |
Subject: |
[PATCH 15/36] vl: move CHECKPOINT_INIT after preconfig |
Date: |
Mon, 23 Nov 2020 09:14:14 -0500 |
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>
---
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 */
--
2.26.2
- [PATCH 05/36] vl: extract qemu_init_subsystems, (continued)
- [PATCH 05/36] vl: extract qemu_init_subsystems, Paolo Bonzini, 2020/11/23
- [PATCH 06/36] vl: move prelaunch part of qemu_init to new functions, Paolo Bonzini, 2020/11/23
- [PATCH 04/36] vl: move various initialization routines out of qemu_init, Paolo Bonzini, 2020/11/23
- [PATCH 03/36] vl: split various early command line options to a separate function, Paolo Bonzini, 2020/11/23
- [PATCH 07/36] vl: extract various command line validation snippets to a new function, Paolo Bonzini, 2020/11/23
- [PATCH 09/36] vl: extract various command line desugaring snippets to a new function, Paolo Bonzini, 2020/11/23
- [PATCH 11/36] vl: create "-net nic -net user" default earlier, Paolo Bonzini, 2020/11/23
- [PATCH 12/36] vl: load plugins as late as possible, Paolo Bonzini, 2020/11/23
- [PATCH 15/36] vl: move CHECKPOINT_INIT after preconfig,
Paolo Bonzini <=
- [PATCH 10/36] qemu-option: restrict qemu_opts_set to merge-lists QemuOpts, Paolo Bonzini, 2020/11/23
- [PATCH 14/36] vl: extract default devices to separate functions, Paolo Bonzini, 2020/11/23
- [PATCH 13/36] vl: move semihosting command line fallback to qemu_init_board, Paolo Bonzini, 2020/11/23