From: Damien Hedde <damien.hedde@greensocs.com> To: qemu-devel@nongnu.org Cc: "Peter Maydell" <peter.maydell@linaro.org>, "Michael S. Tsirkin" <mst@redhat.com>, "David Hildenbrand" <david@redhat.com>, "Peter Xu" <peterx@redhat.com>, mirela.grujic@greensocs.com, "Alistair Francis" <Alistair.Francis@wdc.com>, "Gerd Hoffmann" <kraxel@redhat.com>, "Ani Sinha" <ani@anisinha.ca>, "Eric Blake" <eblake@redhat.com>, "Stefano Stabellini" <sstabellini@kernel.org>, xen-devel@lists.xenproject.org, "Paul Durrant" <paul@xen.org>, "Markus Armbruster" <armbru@redhat.com>, "Anthony Perard" <anthony.perard@citrix.com>, "Marc-André Lureau" <marcandre.lureau@redhat.com>, "Eduardo Habkost" <ehabkost@redhat.com>, "Dr. David Alan Gilbert" <dgilbert@redhat.com>, "Eric Auger" <eric.auger@redhat.com>, "Paolo Bonzini" <pbonzini@redhat.com>, qemu-riscv@nongnu.org, "Damien Hedde" <damien.hedde@greensocs.com>, "Daniel P. Berrangé" <berrange@redhat.com>, mark.burton@greensocs.com, edgari@xilinx.com, "Igor Mammedov" <imammedo@redhat.com> Subject: [RFC PATCH v2 02/16] qapi: Implement query-machine-phase QMP command Date: Wed, 22 Sep 2021 18:13:51 +0200 [thread overview] Message-ID: <20210922161405.140018-3-damien.hedde@greensocs.com> (raw) In-Reply-To: <20210922161405.140018-1-damien.hedde@greensocs.com> 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> --- 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
WARNING: multiple messages have this Message-ID (diff)
From: Damien Hedde <damien.hedde@greensocs.com> To: qemu-devel@nongnu.org Cc: "Damien Hedde" <damien.hedde@greensocs.com>, "Alistair Francis" <Alistair.Francis@wdc.com>, "Marc-André Lureau" <marcandre.lureau@redhat.com>, "Paolo Bonzini" <pbonzini@redhat.com>, "Eduardo Habkost" <ehabkost@redhat.com>, "Marcel Apfelbaum" <marcel.apfelbaum@gmail.com>, "Daniel P. Berrangé" <berrange@redhat.com>, "Michael S. Tsirkin" <mst@redhat.com>, "Igor Mammedov" <imammedo@redhat.com>, "Ani Sinha" <ani@anisinha.ca>, "Gerd Hoffmann" <kraxel@redhat.com>, "Eric Auger" <eric.auger@redhat.com>, "Stefano Stabellini" <sstabellini@kernel.org>, "Anthony Perard" <anthony.perard@citrix.com>, "Paul Durrant" <paul@xen.org>, "Peter Xu" <peterx@redhat.com>, "David Hildenbrand" <david@redhat.com>, "Dr. David Alan Gilbert" <dgilbert@redhat.com>, "Markus Armbruster" <armbru@redhat.com>, "Eric Blake" <eblake@redhat.com>, qemu-riscv@nongnu.org, xen-devel@lists.xenproject.org, mark.burton@greensocs.com, mirela.grujic@greensocs.com, edgari@xilinx.com, "Peter Maydell" <peter.maydell@linaro.org> Subject: [RFC PATCH v2 02/16] qapi: Implement query-machine-phase QMP command Date: Wed, 22 Sep 2021 18:13:51 +0200 [thread overview] Message-ID: <20210922161405.140018-3-damien.hedde@greensocs.com> (raw) In-Reply-To: <20210922161405.140018-1-damien.hedde@greensocs.com> 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> --- 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
next prev parent reply other threads:[~2021-09-22 16:24 UTC|newest] Thread overview: 82+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-09-22 16:13 [RFC PATCH v2 00/16] Initial support for machine creation via QMP Damien Hedde 2021-09-22 16:13 ` Damien Hedde 2021-09-22 16:13 ` [RFC PATCH v2 01/16] rename MachineInitPhase enum constants for QAPI compatibility Damien Hedde 2021-09-22 16:13 ` Damien Hedde 2021-09-22 16:13 ` Damien Hedde [this message] 2021-09-22 16:13 ` [RFC PATCH v2 02/16] qapi: Implement query-machine-phase QMP command Damien Hedde 2021-09-22 17:37 ` Philippe Mathieu-Daudé 2021-09-22 17:37 ` Philippe Mathieu-Daudé 2021-09-23 12:43 ` Damien Hedde 2021-09-23 12:43 ` Damien Hedde 2021-09-23 13:46 ` Ani Sinha 2021-09-23 13:46 ` Ani Sinha 2021-10-12 22:08 ` Alistair Francis 2021-10-12 22:08 ` Alistair Francis 2021-09-22 16:13 ` [RFC PATCH v2 03/16] qapi: Implement x-machine-init " Damien Hedde 2021-09-22 16:13 ` Damien Hedde 2021-10-12 22:19 ` Alistair Francis 2021-10-12 22:19 ` Alistair Francis 2021-09-22 16:13 ` [RFC PATCH v2 04/16] softmmu/qdev-monitor: add error handling in qdev_set_id Damien Hedde 2021-09-22 16:13 ` Damien Hedde 2021-10-13 7:10 ` Alistair Francis 2021-10-13 7:10 ` Alistair Francis 2021-10-13 14:30 ` Damien Hedde 2021-10-13 14:30 ` Damien Hedde 2021-09-22 16:13 ` [RFC PATCH v2 05/16] qdev-monitor: prevent conflicts between qmp/device_add and cli/-device Damien Hedde 2021-09-22 16:13 ` Damien Hedde 2021-09-22 16:13 ` [RFC PATCH v2 06/16] qapi: Allow device_add to execute in machine initialized phase Damien Hedde 2021-09-22 16:13 ` Damien Hedde 2021-10-12 22:25 ` Alistair Francis 2021-10-12 22:25 ` Alistair Francis 2021-09-22 16:13 ` [RFC PATCH v2 07/16] hw/core/machine: add machine_class_is_dynamic_sysbus_dev_allowed Damien Hedde 2021-09-22 16:13 ` Damien Hedde 2021-09-23 10:51 ` Ani Sinha 2021-09-23 10:51 ` Ani Sinha 2021-09-23 13:07 ` Damien Hedde 2021-09-23 13:07 ` Damien Hedde 2021-09-22 16:13 ` [RFC PATCH v2 08/16] qdev-monitor: Check sysbus device type before creating it Damien Hedde 2021-09-22 16:13 ` Damien Hedde 2021-10-12 22:42 ` Alistair Francis 2021-10-12 22:42 ` Alistair Francis 2021-09-22 16:13 ` [RFC PATCH v2 09/16] hw/core/machine: Remove the dynamic sysbus devices type check Damien Hedde 2021-09-22 16:13 ` Damien Hedde 2021-10-12 23:07 ` Alistair Francis 2021-10-12 23:07 ` Alistair Francis 2021-09-22 16:13 ` [RFC PATCH v2 10/16] qdev-monitor: allow adding any sysbus device before machine is ready Damien Hedde 2021-09-22 16:13 ` Damien Hedde 2021-09-23 11:04 ` Ani Sinha 2021-09-23 11:04 ` Ani Sinha 2021-09-23 11:55 ` Ani Sinha 2021-09-23 11:55 ` Ani Sinha 2021-09-23 14:04 ` Damien Hedde 2021-09-23 14:04 ` Damien Hedde 2021-09-22 16:14 ` [RFC PATCH v2 11/16] softmmu/memory: add memory_region_try_add_subregion function Damien Hedde 2021-09-22 16:14 ` Damien Hedde 2021-09-22 17:42 ` Philippe Mathieu-Daudé 2021-09-22 17:42 ` Philippe Mathieu-Daudé 2021-09-22 17:49 ` David Hildenbrand 2021-09-22 17:49 ` David Hildenbrand 2021-10-13 7:12 ` Alistair Francis 2021-10-13 7:12 ` Alistair Francis 2021-09-22 16:14 ` [RFC PATCH v2 12/16] add x-sysbus-mmio-map qmp command Damien Hedde 2021-09-22 16:14 ` Damien Hedde 2021-10-13 7:16 ` Alistair Francis 2021-10-13 7:16 ` Alistair Francis 2021-09-22 16:14 ` [RFC PATCH v2 13/16] hw/mem/system-memory: add a memory sysbus device Damien Hedde 2021-09-22 16:14 ` Damien Hedde 2021-09-22 16:14 ` [RFC PATCH v2 14/16] docs/system: add doc about the initialized machine phase and an example Damien Hedde 2021-09-22 16:14 ` Damien Hedde 2021-09-22 16:14 ` [RFC PATCH v2 15/16] hw/char/ibex_uart: set user_creatable Damien Hedde 2021-09-22 16:14 ` Damien Hedde 2021-09-22 16:14 ` [RFC PATCH v2 16/16] hw/intc/ibex_plic: " Damien Hedde 2021-09-22 16:14 ` Damien Hedde 2021-09-22 17:50 ` [RFC PATCH v2 00/16] Initial support for machine creation via QMP Philippe Mathieu-Daudé 2021-09-22 17:50 ` Philippe Mathieu-Daudé 2021-09-23 11:08 ` Damien Hedde 2021-09-23 11:08 ` Damien Hedde 2021-10-04 15:56 ` Damien Hedde 2021-10-04 15:56 ` Damien Hedde 2021-10-12 22:16 ` Alistair Francis 2021-10-12 22:16 ` Alistair Francis 2021-10-13 5:56 ` Mark Burton 2021-10-13 5:56 ` Mark Burton
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210922161405.140018-3-damien.hedde@greensocs.com \ --to=damien.hedde@greensocs.com \ --cc=Alistair.Francis@wdc.com \ --cc=ani@anisinha.ca \ --cc=anthony.perard@citrix.com \ --cc=armbru@redhat.com \ --cc=berrange@redhat.com \ --cc=david@redhat.com \ --cc=dgilbert@redhat.com \ --cc=eblake@redhat.com \ --cc=edgari@xilinx.com \ --cc=ehabkost@redhat.com \ --cc=eric.auger@redhat.com \ --cc=imammedo@redhat.com \ --cc=kraxel@redhat.com \ --cc=marcandre.lureau@redhat.com \ --cc=mark.burton@greensocs.com \ --cc=mirela.grujic@greensocs.com \ --cc=mst@redhat.com \ --cc=paul@xen.org \ --cc=pbonzini@redhat.com \ --cc=peter.maydell@linaro.org \ --cc=peterx@redhat.com \ --cc=qemu-devel@nongnu.org \ --cc=qemu-riscv@nongnu.org \ --cc=sstabellini@kernel.org \ --cc=xen-devel@lists.xenproject.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.