[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 065/113] vl: move CHECKPOINT_INIT after preconfig
From: |
Paolo Bonzini |
Subject: |
[PULL 065/113] vl: move CHECKPOINT_INIT after preconfig |
Date: |
Wed, 2 Dec 2020 03:08:01 -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>
Reviewed-by: Igor Mammedov <imammedo@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 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 */
--
2.26.2
- [PULL 098/113] scripts: kernel-doc: make it more compatible with Sphinx 3.x, (continued)
- [PULL 098/113] scripts: kernel-doc: make it more compatible with Sphinx 3.x, Paolo Bonzini, 2020/12/02
- [PULL 107/113] Revert "kernel-doc: Handle function typedefs without asterisks", Paolo Bonzini, 2020/12/02
- [PULL 104/113] scripts: kernel-doc: allow passing desired Sphinx C domain dialect, Paolo Bonzini, 2020/12/02
- [PULL 078/113] vl: extract softmmu/rtc.c, Paolo Bonzini, 2020/12/02
- [PULL 093/113] kernel-doc: include line numbers for function prototypes, Paolo Bonzini, 2020/12/02
- [PULL 106/113] scripts: kernel-doc: try to use c:function if possible, Paolo Bonzini, 2020/12/02
- [PULL 105/113] scripts: kernel-doc: fix line number handling, Paolo Bonzini, 2020/12/02
- [PULL 113/113] scripts: kernel-doc: remove unnecesssary change wrt Linux, Paolo Bonzini, 2020/12/02
- [PULL 111/113] scripts: kernel-doc: use :c:union when needed, Paolo Bonzini, 2020/12/02
- [PULL 099/113] scripts: kernel-doc: use a less pedantic markup for funcs on Sphinx 3.x, Paolo Bonzini, 2020/12/02
- [PULL 065/113] vl: move CHECKPOINT_INIT after preconfig,
Paolo Bonzini <=
- [PULL 091/113] scripts/kernel-doc: handle function pointer prototypes, Paolo Bonzini, 2020/12/02
- [PULL 101/113] scripts: kernel-doc: reimplement -nofunction argument, Paolo Bonzini, 2020/12/02
- [PULL 100/113] scripts: kernel-doc: fix troubles with line counts, Paolo Bonzini, 2020/12/02
- [PULL 109/113] scripts: kernel-doc: fix typedef parsing, Paolo Bonzini, 2020/12/02
- [PULL 108/113] Revert "kernel-doc: Handle function typedefs that return pointers", Paolo Bonzini, 2020/12/02
- [PULL 103/113] scripts: kernel-doc: don't mangle with parameter list, Paolo Bonzini, 2020/12/02
- [PULL 112/113] Revert "docs: temporarily disable the kernel-doc extension", Paolo Bonzini, 2020/12/02
- [PULL 110/113] scripts: kernel-doc: split typedef complex regex, Paolo Bonzini, 2020/12/02
- Re: [PULL 000/113] First batch of misc (i386, kernel-doc, memory, vl.c) changes for QEMU 6.0, no-reply, 2020/12/02
- Re: [PULL 000/113] First batch of misc (i386, kernel-doc, memory, vl.c) changes for QEMU 6.0, Peter Maydell, 2020/12/09