diff options
author | David Hildenbrand <david@redhat.com> | 2017-10-16 16:42:56 +0200 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2017-10-18 09:49:48 +0200 |
commit | ae990e6cd77a4e6004b7abc6d293598910abca63 (patch) | |
tree | 85659c1c063e5f03978b3d27173c3e2f91b9b193 /memory.c | |
parent | b066c5375737ad0d630196dab2a2b329515a1d00 (diff) | |
download | qemu-ae990e6cd77a4e6004b7abc6d293598910abca63.zip qemu-ae990e6cd77a4e6004b7abc6d293598910abca63.tar.gz qemu-ae990e6cd77a4e6004b7abc6d293598910abca63.tar.bz2 |
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.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -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, §ion, 0, fr->dirty_log_mask); - } if (listener->region_add) { listener->region_add(listener, §ion); } + if (fr->dirty_log_mask && listener->log_start) { + listener->log_start(listener, §ion, 0, fr->dirty_log_mask); + } } if (listener->commit) { listener->commit(listener); |