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 09/16] hw/core/machine: Remove the dynamic sysbus devices type check Date: Wed, 22 Sep 2021 18:13:58 +0200 [thread overview] Message-ID: <20210922161405.140018-10-damien.hedde@greensocs.com> (raw) In-Reply-To: <20210922161405.140018-1-damien.hedde@greensocs.com> Now that we check sysbus device types during device creation, we can remove the check done in the machine init done notifier. This was the only thing done by this notifier, so we remove the whole sysbus_notifier structure of the MachineState. Note: This notifier was checking all /peripheral and /peripheral-anon sysbus devices. Now we only check those added by -device cli option or device_add qmp command when handling the command/option. So if there are some devices added in one of these containers manually (eg in machine C code), these will not be checked anymore. This use case does not seem to appear apart from hw/xen/xen-legacy-backend.c (it uses qdev_set_id() and in this case, not for a sysbus device, so it's ok). Signed-off-by: Damien Hedde <damien.hedde@greensocs.com> --- include/hw/boards.h | 1 - hw/core/machine.c | 27 --------------------------- 2 files changed, 28 deletions(-) diff --git a/include/hw/boards.h b/include/hw/boards.h index 934443c1cd..ccbc40355a 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -311,7 +311,6 @@ typedef struct CpuTopology { struct MachineState { /*< private >*/ Object parent_obj; - Notifier sysbus_notifier; /*< public >*/ diff --git a/hw/core/machine.c b/hw/core/machine.c index 1a18912dc8..521438e90a 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -571,18 +571,6 @@ bool machine_class_is_dynamic_sysbus_dev_allowed(MachineClass *mc, return allowed; } -static void validate_sysbus_device(SysBusDevice *sbdev, void *opaque) -{ - MachineState *machine = opaque; - MachineClass *mc = MACHINE_GET_CLASS(machine); - - if (!device_is_dynamic_sysbus(mc, DEVICE(sbdev))) { - error_report("Option '-device %s' cannot be handled by this machine", - object_class_get_name(object_get_class(OBJECT(sbdev)))); - exit(1); - } -} - static char *machine_get_memdev(Object *obj, Error **errp) { MachineState *ms = MACHINE(obj); @@ -598,17 +586,6 @@ static void machine_set_memdev(Object *obj, const char *value, Error **errp) ms->ram_memdev_id = g_strdup(value); } -static void machine_init_notify(Notifier *notifier, void *data) -{ - MachineState *machine = MACHINE(qdev_get_machine()); - - /* - * Loop through all dynamically created sysbus devices and check if they are - * all allowed. If a device is not allowed, error out. - */ - foreach_dynamic_sysbus_device(validate_sysbus_device, machine); -} - HotpluggableCPUList *machine_query_hotpluggable_cpus(MachineState *machine) { int i; @@ -1030,10 +1007,6 @@ static void machine_initfn(Object *obj) "Table (HMAT)"); } - /* Register notifier when init is done for sysbus sanity checks */ - ms->sysbus_notifier.notify = machine_init_notify; - qemu_add_machine_init_done_notifier(&ms->sysbus_notifier); - /* default to mc->default_cpus */ ms->smp.cpus = mc->default_cpus; ms->smp.max_cpus = mc->default_cpus; -- 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 09/16] hw/core/machine: Remove the dynamic sysbus devices type check Date: Wed, 22 Sep 2021 18:13:58 +0200 [thread overview] Message-ID: <20210922161405.140018-10-damien.hedde@greensocs.com> (raw) In-Reply-To: <20210922161405.140018-1-damien.hedde@greensocs.com> Now that we check sysbus device types during device creation, we can remove the check done in the machine init done notifier. This was the only thing done by this notifier, so we remove the whole sysbus_notifier structure of the MachineState. Note: This notifier was checking all /peripheral and /peripheral-anon sysbus devices. Now we only check those added by -device cli option or device_add qmp command when handling the command/option. So if there are some devices added in one of these containers manually (eg in machine C code), these will not be checked anymore. This use case does not seem to appear apart from hw/xen/xen-legacy-backend.c (it uses qdev_set_id() and in this case, not for a sysbus device, so it's ok). Signed-off-by: Damien Hedde <damien.hedde@greensocs.com> --- include/hw/boards.h | 1 - hw/core/machine.c | 27 --------------------------- 2 files changed, 28 deletions(-) diff --git a/include/hw/boards.h b/include/hw/boards.h index 934443c1cd..ccbc40355a 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -311,7 +311,6 @@ typedef struct CpuTopology { struct MachineState { /*< private >*/ Object parent_obj; - Notifier sysbus_notifier; /*< public >*/ diff --git a/hw/core/machine.c b/hw/core/machine.c index 1a18912dc8..521438e90a 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -571,18 +571,6 @@ bool machine_class_is_dynamic_sysbus_dev_allowed(MachineClass *mc, return allowed; } -static void validate_sysbus_device(SysBusDevice *sbdev, void *opaque) -{ - MachineState *machine = opaque; - MachineClass *mc = MACHINE_GET_CLASS(machine); - - if (!device_is_dynamic_sysbus(mc, DEVICE(sbdev))) { - error_report("Option '-device %s' cannot be handled by this machine", - object_class_get_name(object_get_class(OBJECT(sbdev)))); - exit(1); - } -} - static char *machine_get_memdev(Object *obj, Error **errp) { MachineState *ms = MACHINE(obj); @@ -598,17 +586,6 @@ static void machine_set_memdev(Object *obj, const char *value, Error **errp) ms->ram_memdev_id = g_strdup(value); } -static void machine_init_notify(Notifier *notifier, void *data) -{ - MachineState *machine = MACHINE(qdev_get_machine()); - - /* - * Loop through all dynamically created sysbus devices and check if they are - * all allowed. If a device is not allowed, error out. - */ - foreach_dynamic_sysbus_device(validate_sysbus_device, machine); -} - HotpluggableCPUList *machine_query_hotpluggable_cpus(MachineState *machine) { int i; @@ -1030,10 +1007,6 @@ static void machine_initfn(Object *obj) "Table (HMAT)"); } - /* Register notifier when init is done for sysbus sanity checks */ - ms->sysbus_notifier.notify = machine_init_notify; - qemu_add_machine_init_done_notifier(&ms->sysbus_notifier); - /* default to mc->default_cpus */ ms->smp.cpus = mc->default_cpus; ms->smp.max_cpus = mc->default_cpus; -- 2.33.0
next prev parent reply other threads:[~2021-09-22 16:26 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 ` [RFC PATCH v2 02/16] qapi: Implement query-machine-phase QMP command Damien Hedde 2021-09-22 16:13 ` 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 ` Damien Hedde [this message] 2021-09-22 16:13 ` [RFC PATCH v2 09/16] hw/core/machine: Remove the dynamic sysbus devices type check 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-10-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.