diff options
| author | David Hildenbrand | 2022-02-01 11:09:40 +0100 |
|---|---|---|
| committer | Philippe Mathieu-Daudé | 2022-03-29 00:44:40 +0200 |
| commit | a8749d7cc9210ae76bb7032970ad8a208c67a1f2 (patch) | |
| tree | dc87543c67bc6a9cd1f6230f545e98fd1b9c89b7 /softmmu | |
| parent | Merge tag 'pull-ppc-20220326' of https://github.com/legoater/qemu into staging (diff) | |
| download | qemu-a8749d7cc9210ae76bb7032970ad8a208c67a1f2.tar.gz qemu-a8749d7cc9210ae76bb7032970ad8a208c67a1f2.tar.xz qemu-a8749d7cc9210ae76bb7032970ad8a208c67a1f2.zip | |
memory: Make memory_region_readd_subregion() properly handle mapped aliases
memory_region_readd_subregion() wants to readd a region by first
removing it and then readding it. For readding, it doesn't use one of
the memory_region_add_*() variants, which is why fail to re-increment the
mr->mapped_via_alias counters, resulting in the
assert(alias->mapped_via_alias >= 0) in memory_region_del_subregion()
triggering the next time we call memory_region_readd_subregion().
Fix it by using memory_region_add_subregion_common() for readding the
region.
Reported-by: Niek Linnenbank <nieklinnenbank@gmail.com>
Fixes: 5ead62185d23 ("memory: Make memory_region_is_mapped() succeed when mapped via an alias")
Tested-by: Niek Linnenbank <nieklinnenbank@gmail.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Peter Xu <peterx@redhat.com>
Cc: "Philippe Mathieu-Daudé" <f4bug@amsat.org>
Signed-off-by: David Hildenbrand <david@redhat.com>
Message-Id: <20220201100940.47788-1-david@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Diffstat (limited to 'softmmu')
| -rw-r--r-- | softmmu/memory.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/softmmu/memory.c b/softmmu/memory.c index 8060c6de78..bfa5d5178c 100644 --- a/softmmu/memory.c +++ b/softmmu/memory.c @@ -2626,8 +2626,7 @@ static void memory_region_readd_subregion(MemoryRegion *mr) memory_region_transaction_begin(); memory_region_ref(mr); memory_region_del_subregion(container, mr); - mr->container = container; - memory_region_update_container_subregions(mr); + memory_region_add_subregion_common(container, mr->addr, mr); memory_region_unref(mr); memory_region_transaction_commit(); } |