aboutsummaryrefslogtreecommitdiff
path: root/system
diff options
context:
space:
mode:
authorDavid Hildenbrand <david@redhat.com>2023-09-26 20:57:33 +0200
committerDavid Hildenbrand <david@redhat.com>2023-10-12 14:15:22 +0200
commitaa5317ef7cbf3a322b423a7b63625959b82b1a62 (patch)
tree2f68110203967209804819704939557c847b5a24 /system
parenta2335113aeda1cddad3dc4a76f2ace47a00d7ac9 (diff)
downloadqemu-aa5317ef7cbf3a322b423a7b63625959b82b1a62.zip
qemu-aa5317ef7cbf3a322b423a7b63625959b82b1a62.tar.gz
qemu-aa5317ef7cbf3a322b423a7b63625959b82b1a62.tar.bz2
memory: Clarify mapping requirements for RamDiscardManager
We really only care about the RAM memory region not being mapped into an address space yet as long as we're still setting up the RamDiscardManager. Once mapped into an address space, memory notifiers would get notified about such a region and any attempts to modify the RamDiscardManager would be wrong. While "mapped into an address space" is easy to check for RAM regions that are mapped directly (following the ->container links), it's harder to check when such regions are mapped indirectly via aliases. For now, we can only detect that a region is mapped through an alias (->mapped_via_alias), but we don't have a handle on these aliases to follow all their ->container links to test if they are eventually mapped into an address space. So relax the assertion in memory_region_set_ram_discard_manager(), remove the check in memory_region_get_ram_discard_manager() and clarify the doc. Message-ID: <20230926185738.277351-14-david@redhat.com> Reviewed-by: Maciej S. Szmigiero <maciej.szmigiero@oracle.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: David Hildenbrand <david@redhat.com>
Diffstat (limited to 'system')
-rw-r--r--system/memory.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/system/memory.c b/system/memory.c
index fa1c99f..e11bce5 100644
--- a/system/memory.c
+++ b/system/memory.c
@@ -2085,7 +2085,7 @@ int memory_region_iommu_num_indexes(IOMMUMemoryRegion *iommu_mr)
RamDiscardManager *memory_region_get_ram_discard_manager(MemoryRegion *mr)
{
- if (!memory_region_is_mapped(mr) || !memory_region_is_ram(mr)) {
+ if (!memory_region_is_ram(mr)) {
return NULL;
}
return mr->rdm;
@@ -2094,7 +2094,7 @@ RamDiscardManager *memory_region_get_ram_discard_manager(MemoryRegion *mr)
void memory_region_set_ram_discard_manager(MemoryRegion *mr,
RamDiscardManager *rdm)
{
- g_assert(memory_region_is_ram(mr) && !memory_region_is_mapped(mr));
+ g_assert(memory_region_is_ram(mr));
g_assert(!rdm || !mr->rdm);
mr->rdm = rdm;
}