Message ID | 20210922161405.140018-3-damien.hedde@greensocs.com |
---|---|
State | New |
Headers | show |
Series | Initial support for machine creation via QMP | expand |
On 9/22/21 18:13, Damien Hedde wrote: > From: Mirela Grujic <mirela.grujic@greensocs.com> > > The command returns current machine initialization phase. > From now on, the MachineInitPhase enum is generated from the > QAPI schema. > > Signed-off-by: Mirela Grujic <mirela.grujic@greensocs.com> Missing your S-o-b, otherwise: Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > qapi/machine.json | 56 ++++++++++++++++++++++++++++++++++++++ > include/hw/qdev-core.h | 30 ++------------------ > hw/core/machine-qmp-cmds.c | 9 ++++++ > hw/core/qdev.c | 5 ++++ > 4 files changed, 72 insertions(+), 28 deletions(-)
On 9/22/21 19:37, Philippe Mathieu-Daudé wrote: > On 9/22/21 18:13, Damien Hedde wrote: >> From: Mirela Grujic <mirela.grujic@greensocs.com> >> >> The command returns current machine initialization phase. >> From now on, the MachineInitPhase enum is generated from the >> QAPI schema. >> >> Signed-off-by: Mirela Grujic <mirela.grujic@greensocs.com> > > Missing your S-o-b, otherwise: Sorry. I did not realize I had to add it since it was already done by Mirela. I'll add it for this patch and patches 1, 6 and 8. > Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com > >> --- >> qapi/machine.json | 56 ++++++++++++++++++++++++++++++++++++++ >> include/hw/qdev-core.h | 30 ++------------------ >> hw/core/machine-qmp-cmds.c | 9 ++++++ >> hw/core/qdev.c | 5 ++++ >> 4 files changed, 72 insertions(+), 28 deletions(-) >
On Thu, Sep 23, 2021 at 6:13 PM Damien Hedde <damien.hedde@greensocs.com> wrote: > > > > On 9/22/21 19:37, Philippe Mathieu-Daudé wrote: > > On 9/22/21 18:13, Damien Hedde wrote: > >> From: Mirela Grujic <mirela.grujic@greensocs.com> > >> > >> The command returns current machine initialization phase. > >> From now on, the MachineInitPhase enum is generated from the > >> QAPI schema. > >> > >> Signed-off-by: Mirela Grujic <mirela.grujic@greensocs.com> > > > > Missing your S-o-b, otherwise: > > Sorry. I did not realize I had to add it since it was already done by > Mirela. I'll add it for this patch and patches 1, 6 and 8. https://wiki.qemu.org/Contribute/SubmitAPatch#Patch_emails_must_include_a_Signed-off-by:_line btw, it's strictly not mandatory if you are both from the same company and you did not write the patch or contribute in anyway to it. > > > Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com > > >> --- > >> qapi/machine.json | 56 ++++++++++++++++++++++++++++++++++++++ > >> include/hw/qdev-core.h | 30 ++------------------ > >> hw/core/machine-qmp-cmds.c | 9 ++++++ > >> hw/core/qdev.c | 5 ++++ > >> 4 files changed, 72 insertions(+), 28 deletions(-) > >
On Thu, Sep 23, 2021 at 2:20 AM Damien Hedde <damien.hedde@greensocs.com> wrote: > > From: Mirela Grujic <mirela.grujic@greensocs.com> > > The command returns current machine initialization phase. > From now on, the MachineInitPhase enum is generated from the > QAPI schema. > > Signed-off-by: Mirela Grujic <mirela.grujic@greensocs.com> Acked-by: Alistair Francis <alistair.francis@wdc.com> Alistair > --- > qapi/machine.json | 56 ++++++++++++++++++++++++++++++++++++++ > include/hw/qdev-core.h | 30 ++------------------ > hw/core/machine-qmp-cmds.c | 9 ++++++ > hw/core/qdev.c | 5 ++++ > 4 files changed, 72 insertions(+), 28 deletions(-) > > diff --git a/qapi/machine.json b/qapi/machine.json > index 157712f006..969d37fb03 100644 > --- a/qapi/machine.json > +++ b/qapi/machine.json > @@ -1312,3 +1312,59 @@ > '*cores': 'int', > '*threads': 'int', > '*maxcpus': 'int' } } > + > +## > +# @MachineInitPhase: > +# > +# Enumeration of machine initialization phases. > +# > +# @no-machine: machine does not exist > +# > +# @machine-created: machine is created, but its accelerator is not > +# > +# @accel-created: accelerator is created, but the machine properties have not > +# been validated and machine initialization is not done yet > +# > +# @initialized: machine is initialized, thus creating any embedded devices and > +# validating machine properties. Devices created at this time are > +# considered to be cold-plugged. > +# > +# @ready: QEMU is ready to start CPUs and devices created at this time are > +# considered to be hot-plugged. The monitor is not restricted to > +# "preconfig" commands. > +# > +# Since: 6.2 > +## > +{ 'enum': 'MachineInitPhase', > + 'data': [ 'no-machine', 'machine-created', 'accel-created', 'initialized', > + 'ready' ] } > + > +## > +# @MachineInitPhaseStatus: > +# > +# Information about machine initialization phase > +# > +# @phase: the machine initialization phase > +# > +# Since: 6.2 > +## > +{ 'struct': 'MachineInitPhaseStatus', > + 'data': { 'phase': 'MachineInitPhase' } } > + > +## > +# @query-machine-phase: > +# > +# Return machine initialization phase > +# > +# Since: 6.2 > +# > +# Returns: MachineInitPhaseStatus > +# > +# Example: > +# > +# -> { "execute": "query-machine-phase" } > +# <- { "return": { "phase": "initialized" } } > +# > +## > +{ 'command': 'query-machine-phase', 'returns': 'MachineInitPhaseStatus', > + 'allow-preconfig': true } > diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h > index 859fd913bb..800eda8f54 100644 > --- a/include/hw/qdev-core.h > +++ b/include/hw/qdev-core.h > @@ -1,6 +1,7 @@ > #ifndef QDEV_CORE_H > #define QDEV_CORE_H > > +#include "qapi/qapi-types-machine.h" > #include "qemu/queue.h" > #include "qemu/bitmap.h" > #include "qemu/rcu.h" > @@ -839,35 +840,8 @@ void device_listener_unregister(DeviceListener *listener); > */ > bool qdev_should_hide_device(QemuOpts *opts); > > -typedef enum MachineInitPhase { > - /* current_machine is NULL. */ > - MACHINE_INIT_PHASE_NO_MACHINE, > - > - /* current_machine is not NULL, but current_machine->accel is NULL. */ > - MACHINE_INIT_PHASE_MACHINE_CREATED, > - > - /* > - * current_machine->accel is not NULL, but the machine properties have > - * not been validated and machine_class->init has not yet been called. > - */ > - MACHINE_INIT_PHASE_ACCEL_CREATED, > - > - /* > - * machine_class->init has been called, thus creating any embedded > - * devices and validating machine properties. Devices created at > - * this time are considered to be cold-plugged. > - */ > - MACHINE_INIT_PHASE_INITIALIZED, > - > - /* > - * QEMU is ready to start CPUs and devices created at this time > - * are considered to be hot-plugged. The monitor is not restricted > - * to "preconfig" commands. > - */ > - MACHINE_INIT_PHASE_READY, > -} MachineInitPhase; > - > extern bool phase_check(MachineInitPhase phase); > extern void phase_advance(MachineInitPhase phase); > +extern MachineInitPhase phase_get(void); > > #endif > diff --git a/hw/core/machine-qmp-cmds.c b/hw/core/machine-qmp-cmds.c > index 52168a3771..d3b9a04855 100644 > --- a/hw/core/machine-qmp-cmds.c > +++ b/hw/core/machine-qmp-cmds.c > @@ -204,3 +204,12 @@ MemdevList *qmp_query_memdev(Error **errp) > object_child_foreach(obj, query_memdev, &list); > return list; > } > + > +MachineInitPhaseStatus *qmp_query_machine_phase(Error **errp) > +{ > + MachineInitPhaseStatus *status = g_malloc0(sizeof(*status)); > + > + status->phase = phase_get(); > + > + return status; > +} > diff --git a/hw/core/qdev.c b/hw/core/qdev.c > index c5fc704f55..d83f1c029a 100644 > --- a/hw/core/qdev.c > +++ b/hw/core/qdev.c > @@ -1150,6 +1150,11 @@ void phase_advance(MachineInitPhase phase) > machine_phase = phase; > } > > +MachineInitPhase phase_get(void) > +{ > + return machine_phase; > +} > + > static const TypeInfo device_type_info = { > .name = TYPE_DEVICE, > .parent = TYPE_OBJECT, > -- > 2.33.0 > >
diff --git a/qapi/machine.json b/qapi/machine.json index 157712f006..969d37fb03 100644 --- a/qapi/machine.json +++ b/qapi/machine.json @@ -1312,3 +1312,59 @@ '*cores': 'int', '*threads': 'int', '*maxcpus': 'int' } } + +## +# @MachineInitPhase: +# +# Enumeration of machine initialization phases. +# +# @no-machine: machine does not exist +# +# @machine-created: machine is created, but its accelerator is not +# +# @accel-created: accelerator is created, but the machine properties have not +# been validated and machine initialization is not done yet +# +# @initialized: machine is initialized, thus creating any embedded devices and +# validating machine properties. Devices created at this time are +# considered to be cold-plugged. +# +# @ready: QEMU is ready to start CPUs and devices created at this time are +# considered to be hot-plugged. The monitor is not restricted to +# "preconfig" commands. +# +# Since: 6.2 +## +{ 'enum': 'MachineInitPhase', + 'data': [ 'no-machine', 'machine-created', 'accel-created', 'initialized', + 'ready' ] } + +## +# @MachineInitPhaseStatus: +# +# Information about machine initialization phase +# +# @phase: the machine initialization phase +# +# Since: 6.2 +## +{ 'struct': 'MachineInitPhaseStatus', + 'data': { 'phase': 'MachineInitPhase' } } + +## +# @query-machine-phase: +# +# Return machine initialization phase +# +# Since: 6.2 +# +# Returns: MachineInitPhaseStatus +# +# Example: +# +# -> { "execute": "query-machine-phase" } +# <- { "return": { "phase": "initialized" } } +# +## +{ 'command': 'query-machine-phase', 'returns': 'MachineInitPhaseStatus', + 'allow-preconfig': true } diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h index 859fd913bb..800eda8f54 100644 --- a/include/hw/qdev-core.h +++ b/include/hw/qdev-core.h @@ -1,6 +1,7 @@ #ifndef QDEV_CORE_H #define QDEV_CORE_H +#include "qapi/qapi-types-machine.h" #include "qemu/queue.h" #include "qemu/bitmap.h" #include "qemu/rcu.h" @@ -839,35 +840,8 @@ void device_listener_unregister(DeviceListener *listener); */ bool qdev_should_hide_device(QemuOpts *opts); -typedef enum MachineInitPhase { - /* current_machine is NULL. */ - MACHINE_INIT_PHASE_NO_MACHINE, - - /* current_machine is not NULL, but current_machine->accel is NULL. */ - MACHINE_INIT_PHASE_MACHINE_CREATED, - - /* - * current_machine->accel is not NULL, but the machine properties have - * not been validated and machine_class->init has not yet been called. - */ - MACHINE_INIT_PHASE_ACCEL_CREATED, - - /* - * machine_class->init has been called, thus creating any embedded - * devices and validating machine properties. Devices created at - * this time are considered to be cold-plugged. - */ - MACHINE_INIT_PHASE_INITIALIZED, - - /* - * QEMU is ready to start CPUs and devices created at this time - * are considered to be hot-plugged. The monitor is not restricted - * to "preconfig" commands. - */ - MACHINE_INIT_PHASE_READY, -} MachineInitPhase; - extern bool phase_check(MachineInitPhase phase); extern void phase_advance(MachineInitPhase phase); +extern MachineInitPhase phase_get(void); #endif diff --git a/hw/core/machine-qmp-cmds.c b/hw/core/machine-qmp-cmds.c index 52168a3771..d3b9a04855 100644 --- a/hw/core/machine-qmp-cmds.c +++ b/hw/core/machine-qmp-cmds.c @@ -204,3 +204,12 @@ MemdevList *qmp_query_memdev(Error **errp) object_child_foreach(obj, query_memdev, &list); return list; } + +MachineInitPhaseStatus *qmp_query_machine_phase(Error **errp) +{ + MachineInitPhaseStatus *status = g_malloc0(sizeof(*status)); + + status->phase = phase_get(); + + return status; +} diff --git a/hw/core/qdev.c b/hw/core/qdev.c index c5fc704f55..d83f1c029a 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -1150,6 +1150,11 @@ void phase_advance(MachineInitPhase phase) machine_phase = phase; } +MachineInitPhase phase_get(void) +{ + return machine_phase; +} + static const TypeInfo device_type_info = { .name = TYPE_DEVICE, .parent = TYPE_OBJECT,