aboutsummaryrefslogtreecommitdiff
path: root/memory.c
diff options
context:
space:
mode:
authorDavid Hildenbrand <david@redhat.com>2017-10-16 16:42:56 +0200
committerPaolo Bonzini <pbonzini@redhat.com>2017-10-18 09:49:48 +0200
commitae990e6cd77a4e6004b7abc6d293598910abca63 (patch)
tree85659c1c063e5f03978b3d27173c3e2f91b9b193 /memory.c
parentb066c5375737ad0d630196dab2a2b329515a1d00 (diff)
memory: call log_start after region_add
It might be confusing for some listener implementations that implement both, region_add and log_start (e.g. KVM) if we call log_start before an actual region was added using region_add. This makes current KVM code trigger an assertion ("kvm_section_update_flags: error finding slot"). So let's just reverse the order instead of tolerating log_start on yet unknown regions. Reported-by: Thomas Huth <thuth@redhat.com> Signed-off-by: David Hildenbrand <david@redhat.com> Message-Id: <20171016144302.24284-2-david@redhat.com> Tested-by: Joe Clifford <joeclifford@gmail.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'memory.c')
-rw-r--r--memory.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/memory.c b/memory.c
index b637c12bad..3e1558a031 100644
--- a/memory.c
+++ b/memory.c
@@ -2607,12 +2607,12 @@ static void listener_add_address_space(MemoryListener *listener,
.offset_within_address_space = int128_get64(fr->addr.start),
.readonly = fr->readonly,
};
- if (fr->dirty_log_mask && listener->log_start) {
- listener->log_start(listener, &section, 0, fr->dirty_log_mask);
- }
if (listener->region_add) {
listener->region_add(listener, &section);
}
+ if (fr->dirty_log_mask && listener->log_start) {
+ listener->log_start(listener, &section, 0, fr->dirty_log_mask);
+ }
}
if (listener->commit) {
listener->commit(listener);