Revert "memory: Optimize replay of guest mapping"
authorPeter Maydell <peter.maydell@linaro.org>
Tue, 4 Apr 2023 20:37:31 +0000 (16:37 -0400)
committerPeter Maydell <peter.maydell@linaro.org>
Wed, 5 Apr 2023 12:31:52 +0000 (13:31 +0100)
commitb1ab8f9cc554e3c92200d44ce9d65bab50be183e
tree160b86f1123d6dbad43ee9a1a3950969226a3aeb
parentb5fba99ec7969054ab2f3727d2df014b5b72e4f1
Revert "memory: Optimize replay of guest mapping"

This reverts commit 6da24341866fa940fd7d575788a2319514941c77
("memory: Optimize replay of guest mapping").

This change breaks the mps3-an547 board under TCG (and
probably other TCG boards using an IOMMU), which now
assert:

$ ./build/x86/qemu-system-arm --machine mps3-an547 -serial stdio
-kernel /tmp/an547-mwe/build/test.elf
qemu-system-arm: ../../softmmu/memory.c:1903:
memory_region_register_iommu_notifier: Assertion `n->end <=
memory_region_size(mr)' failed.

This is because tcg_register_iommu_notifier() registers
an IOMMU notifier which covers the entire address space,
so the assertion added in this commit is not correct.

For the 8.0 release, just revert this commit as it is
only an optimization.

Fixes: 6da24341866f ("memory: Optimize replay of guest mapping")
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-id: 917c1c552b2d1b732f9a86c6a90684c3a5e4cada.1680640587.git.mst@redhat.com
hw/i386/intel_iommu.c
softmmu/memory.c