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 11/16] softmmu/memory: add memory_region_try_add_subregion function Date: Wed, 22 Sep 2021 18:14:00 +0200 [thread overview] Message-ID: <20210922161405.140018-12-damien.hedde@greensocs.com> (raw) In-Reply-To: <20210922161405.140018-1-damien.hedde@greensocs.com> It allows to try to add a subregion to a memory region with error handling. Like memory_region_add_subregion_overlap, it handles priority as well. Apart the error handling, the behavior is the same. It can be used to do the simple memory_region_add_subregion() (with no overlap) by setting the priority parameter to 0. This commit is a preparation to further use this function in the context of qmp command which needs error handling support. Signed-off-by: Damien Hedde <damien.hedde@greensocs.com> --- Adding a new function is obviously not ideal. But there is ~900 occurrences of memory_region_add_subregion[_overlap] calls in the code base. We do not really see an alternative here. --- include/exec/memory.h | 22 ++++++++++++++++++++++ softmmu/memory.c | 22 ++++++++++++++-------- 2 files changed, 36 insertions(+), 8 deletions(-) diff --git a/include/exec/memory.h b/include/exec/memory.h index c3d417d317..422e1eda67 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -2162,6 +2162,28 @@ void memory_region_add_subregion_overlap(MemoryRegion *mr, MemoryRegion *subregion, int priority); +/** + * memory_region_try_add_subregion: Add a subregion to a container + * with error handling. + * + * Behaves like memory_region_add_subregion_overlap(), but errors are + * reported if the subregion cannot be added. + * + * @mr: the region to contain the new subregion; must be a container + * initialized with memory_region_init(). + * @offset: the offset relative to @mr where @subregion is added. + * @subregion: the subregion to be added. + * @priority: used for resolving overlaps; highest priority wins. + * @errp: pointer to Error*, to store an error if it happens. + * + * Returns: True in case of success, false otherwise. + */ +bool memory_region_try_add_subregion(MemoryRegion *mr, + hwaddr offset, + MemoryRegion *subregion, + int priority, + Error **errp); + /** * memory_region_get_ram_addr: Get the ram address associated with a memory * region diff --git a/softmmu/memory.c b/softmmu/memory.c index bfedaf9c4d..eac61f8236 100644 --- a/softmmu/memory.c +++ b/softmmu/memory.c @@ -2513,22 +2513,28 @@ done: memory_region_transaction_commit(); } -static void memory_region_add_subregion_common(MemoryRegion *mr, - hwaddr offset, - MemoryRegion *subregion) +bool memory_region_try_add_subregion(MemoryRegion *mr, + hwaddr offset, + MemoryRegion *subregion, + int priority, + Error **errp) { - assert(!subregion->container); + if (subregion->container) { + error_setg(errp, "The memory region is already in another region"); + return false; + } + subregion->priority = priority; subregion->container = mr; subregion->addr = offset; memory_region_update_container_subregions(subregion); + return true; } void memory_region_add_subregion(MemoryRegion *mr, hwaddr offset, MemoryRegion *subregion) { - subregion->priority = 0; - memory_region_add_subregion_common(mr, offset, subregion); + memory_region_try_add_subregion(mr, offset, subregion, 0, &error_abort); } void memory_region_add_subregion_overlap(MemoryRegion *mr, @@ -2536,8 +2542,8 @@ void memory_region_add_subregion_overlap(MemoryRegion *mr, MemoryRegion *subregion, int priority) { - subregion->priority = priority; - memory_region_add_subregion_common(mr, offset, subregion); + memory_region_try_add_subregion(mr, offset, subregion, priority, + &error_abort); } void memory_region_del_subregion(MemoryRegion *mr, -- 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 11/16] softmmu/memory: add memory_region_try_add_subregion function Date: Wed, 22 Sep 2021 18:14:00 +0200 [thread overview] Message-ID: <20210922161405.140018-12-damien.hedde@greensocs.com> (raw) In-Reply-To: <20210922161405.140018-1-damien.hedde@greensocs.com> It allows to try to add a subregion to a memory region with error handling. Like memory_region_add_subregion_overlap, it handles priority as well. Apart the error handling, the behavior is the same. It can be used to do the simple memory_region_add_subregion() (with no overlap) by setting the priority parameter to 0. This commit is a preparation to further use this function in the context of qmp command which needs error handling support. Signed-off-by: Damien Hedde <damien.hedde@greensocs.com> --- Adding a new function is obviously not ideal. But there is ~900 occurrences of memory_region_add_subregion[_overlap] calls in the code base. We do not really see an alternative here. --- include/exec/memory.h | 22 ++++++++++++++++++++++ softmmu/memory.c | 22 ++++++++++++++-------- 2 files changed, 36 insertions(+), 8 deletions(-) diff --git a/include/exec/memory.h b/include/exec/memory.h index c3d417d317..422e1eda67 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -2162,6 +2162,28 @@ void memory_region_add_subregion_overlap(MemoryRegion *mr, MemoryRegion *subregion, int priority); +/** + * memory_region_try_add_subregion: Add a subregion to a container + * with error handling. + * + * Behaves like memory_region_add_subregion_overlap(), but errors are + * reported if the subregion cannot be added. + * + * @mr: the region to contain the new subregion; must be a container + * initialized with memory_region_init(). + * @offset: the offset relative to @mr where @subregion is added. + * @subregion: the subregion to be added. + * @priority: used for resolving overlaps; highest priority wins. + * @errp: pointer to Error*, to store an error if it happens. + * + * Returns: True in case of success, false otherwise. + */ +bool memory_region_try_add_subregion(MemoryRegion *mr, + hwaddr offset, + MemoryRegion *subregion, + int priority, + Error **errp); + /** * memory_region_get_ram_addr: Get the ram address associated with a memory * region diff --git a/softmmu/memory.c b/softmmu/memory.c index bfedaf9c4d..eac61f8236 100644 --- a/softmmu/memory.c +++ b/softmmu/memory.c @@ -2513,22 +2513,28 @@ done: memory_region_transaction_commit(); } -static void memory_region_add_subregion_common(MemoryRegion *mr, - hwaddr offset, - MemoryRegion *subregion) +bool memory_region_try_add_subregion(MemoryRegion *mr, + hwaddr offset, + MemoryRegion *subregion, + int priority, + Error **errp) { - assert(!subregion->container); + if (subregion->container) { + error_setg(errp, "The memory region is already in another region"); + return false; + } + subregion->priority = priority; subregion->container = mr; subregion->addr = offset; memory_region_update_container_subregions(subregion); + return true; } void memory_region_add_subregion(MemoryRegion *mr, hwaddr offset, MemoryRegion *subregion) { - subregion->priority = 0; - memory_region_add_subregion_common(mr, offset, subregion); + memory_region_try_add_subregion(mr, offset, subregion, 0, &error_abort); } void memory_region_add_subregion_overlap(MemoryRegion *mr, @@ -2536,8 +2542,8 @@ void memory_region_add_subregion_overlap(MemoryRegion *mr, MemoryRegion *subregion, int priority) { - subregion->priority = priority; - memory_region_add_subregion_common(mr, offset, subregion); + memory_region_try_add_subregion(mr, offset, subregion, priority, + &error_abort); } void memory_region_del_subregion(MemoryRegion *mr, -- 2.33.0
next prev parent reply other threads:[~2021-09-22 16:34 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 ` [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 ` Damien Hedde [this message] 2021-09-22 16:14 ` [RFC PATCH v2 11/16] softmmu/memory: add memory_region_try_add_subregion function 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-12-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.