[v4,01/14] machine: add phase_get() and document phase_check()/advance()

Commit Message

Damien Hedde Feb. 23, 2022, 9:06 a.m. UTC

phase_get() returns the current phase, we'll use it in next
commit.

Signed-off-by: Damien Hedde <[e-mail]>
---
 include/hw/qdev-core.h | 19 +++++++++++++++++++
 hw/core/qdev.c         |  5 +++++
 2 files changed, 24 insertions(+)

Comments

Philippe Mathieu-Daudé March 3, 2022, 3:01 p.m. UTC | #1

On 23/2/22 10:06, Damien Hedde wrote:
> phase_get() returns the current phase, we'll use it in next
> commit.
> 
> Signed-off-by: Damien Hedde <[e-mail]>
> ---
>   include/hw/qdev-core.h | 19 +++++++++++++++++++
>   hw/core/qdev.c         |  5 +++++
>   2 files changed, 24 insertions(+)

Reviewed-by: Philippe Mathieu-Daudé <[e-mail]>

Patch

diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h
index 92c3d65208..e29c705b74 100644
--- a/include/hw/qdev-core.h
+++ b/include/hw/qdev-core.h
@@ -887,7 +887,26 @@  typedef enum MachineInitPhase {
     PHASE_MACHINE_READY,
 } MachineInitPhase;
 
+/*
+ * phase_get:
+ * Returns the current phase
+ */
+MachineInitPhase phase_get(void);
+
+/**
+ * phase_check:
+ * Test if current phase is at least @phase.
+ *
+ * Returns true if this is the case.
+ */
 extern bool phase_check(MachineInitPhase phase);
+
+/**
+ * @phase_advance:
+ * Update the current phase to @phase.
+ *
+ * Must only be used to make a single phase step.
+ */
 extern void phase_advance(MachineInitPhase phase);
 
 #endif
diff --git a/hw/core/qdev.c b/hw/core/qdev.c
index 84f3019440..632dc0a4be 100644
--- a/hw/core/qdev.c
+++ b/hw/core/qdev.c
@@ -910,6 +910,11 @@  Object *qdev_get_machine(void)
 
 static MachineInitPhase machine_phase;
 
+MachineInitPhase phase_get(void)
+{
+    return machine_phase;
+}
+
 bool phase_check(MachineInitPhase phase)
 {
     return machine_phase >= phase;