memory: avoid unnecessary coalesced_io_del operations
Store whether the FlatRange has had any coalesced I/O ranges applied,
and if not avoid calling coalesced_io_del. This is useful in preparation
for the next patch, which will call coalesced_io_del when rendering
memory regions.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
diff --git a/memory.c b/memory.c
index 119b6e4..072769a 100644
--- a/memory.c
+++ b/memory.c
@@ -217,6 +217,7 @@
bool romd_mode;
bool readonly;
bool nonvolatile;
+ bool has_coalesced_range;
};
#define FOR_EACH_FLAT_RANGE(var, view) \
@@ -650,6 +651,7 @@
fr.romd_mode = mr->romd_mode;
fr.readonly = readonly;
fr.nonvolatile = nonvolatile;
+ fr.has_coalesced_range = false;
/* Render the region itself into any gaps left by the current view. */
for (i = 0; i < view->nr && int128_nz(remain); ++i) {
@@ -852,6 +854,10 @@
static void flat_range_coalesced_io_del(FlatRange *fr, AddressSpace *as)
{
+ if (!fr->has_coalesced_range) {
+ return;
+ }
+
MEMORY_LISTENER_UPDATE_REGION(fr, as, Reverse, coalesced_io_del,
int128_get64(fr->addr.start),
int128_get64(fr->addr.size));
@@ -863,6 +869,11 @@
CoalescedMemoryRange *cmr;
AddrRange tmp;
+ if (QTAILQ_EMPTY(&mr->coalesced)) {
+ return;
+ }
+
+ fr->has_coalesced_range = true;
QTAILQ_FOREACH(cmr, &mr->coalesced, link) {
tmp = addrrange_shift(cmr->addr,
int128_sub(fr->addr.start,
