[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 02/11] memory: allow destroying a non-empty Memory
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL v2 02/11] memory: allow destroying a non-empty MemoryRegion |
Date: |
Thu, 8 Oct 2015 15:02:02 +0200 |
From: Paolo Bonzini <address@hidden>
This is legal; the MemoryRegion will simply unreference all the
existing subregions and possibly bring them down with it as well.
However, it requires a bit of care to avoid an infinite loop.
Finalizing a memory region cannot trigger an address space update,
but memory_region_del_subregion errs on the side of caution and
might trigger a spurious update: avoid that by resetting mr->enabled
first.
Signed-off-by: Paolo Bonzini <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
Message-Id: <address@hidden>
---
memory.c | 17 ++++++++++++++++-
1 file changed, 16 insertions(+), 1 deletion(-)
diff --git a/memory.c b/memory.c
index ef87363..73d28ba 100644
--- a/memory.c
+++ b/memory.c
@@ -1304,7 +1304,22 @@ static void memory_region_finalize(Object *obj)
{
MemoryRegion *mr = MEMORY_REGION(obj);
- assert(QTAILQ_EMPTY(&mr->subregions));
+ assert(!mr->container);
+
+ /* We know the region is not visible in any address space (it
+ * does not have a container and cannot be a root either because
+ * it has no references, so we can blindly clear mr->enabled.
+ * memory_region_set_enabled instead could trigger a transaction
+ * and cause an infinite loop.
+ */
+ mr->enabled = false;
+ memory_region_transaction_begin();
+ while (!QTAILQ_EMPTY(&mr->subregions)) {
+ MemoryRegion *subregion = QTAILQ_FIRST(&mr->subregions);
+ memory_region_del_subregion(mr, subregion);
+ }
+ memory_region_transaction_commit();
+
mr->destructor(mr);
memory_region_clear_coalescing(mr);
g_free((char *)mr->name);
--
2.4.3
- [Qemu-devel] [PULL v2 00/11] Fix device introspection regressions, Markus Armbruster, 2015/10/08
- [Qemu-devel] [PULL v2 02/11] memory: allow destroying a non-empty MemoryRegion,
Markus Armbruster <=
- [Qemu-devel] [PULL v2 03/11] hw: do not pass NULL to memory_region_init from instance_init, Markus Armbruster, 2015/10/08
- [Qemu-devel] [PULL v2 08/11] device-introspect-test: New, covering device introspection, Markus Armbruster, 2015/10/08
- [Qemu-devel] [PULL v2 01/11] virtio-input: Fix device introspection on non-Linux hosts, Markus Armbruster, 2015/10/08
- [Qemu-devel] [PULL v2 05/11] tests: Fix how qom-test is run, Markus Armbruster, 2015/10/08
- [Qemu-devel] [PULL v2 07/11] libqtest: New hmp() & friends, Markus Armbruster, 2015/10/08
- [Qemu-devel] [PULL v2 11/11] Revert "qdev: Use qdev_get_device_class() for -device <type>, help", Markus Armbruster, 2015/10/08
- [Qemu-devel] [PULL v2 06/11] libqtest: Clean up unused QTestState member sigact_old, Markus Armbruster, 2015/10/09
- Re: [Qemu-devel] [PULL v2 00/11] Fix device introspection regressions, Peter Maydell, 2015/10/09
- [Qemu-devel] [PULL v2 04/11] macio: move DBDMA_init from instance_init to realize, Markus Armbruster, 2015/10/09
- [Qemu-devel] [PULL v2 09/11] qmp: Fix device-list-properties not to crash for abstract device, Markus Armbruster, 2015/10/09