summary refs log tree commit diff stats
path: root/accel/kvm/kvm-all.c
diff options
context:
space:
mode:
authorDavid Hildenbrand <david@redhat.com>2017-09-20 16:50:25 +0200
committerPaolo Bonzini <pbonzini@redhat.com>2017-09-21 12:40:08 +0200
commit3110cdbd8a4845c5b5fb861b0a664c56d993dd3c (patch)
treea261c0dc5900362c5000beea1bbe97e3aa8cc4dc /accel/kvm/kvm-all.c
parent55289fb036481396466d7825fa01d829c891108c (diff)
downloadfocaccia-qemu-3110cdbd8a4845c5b5fb861b0a664c56d993dd3c.tar.gz
focaccia-qemu-3110cdbd8a4845c5b5fb861b0a664c56d993dd3c.zip
kvm: drop wrong assertion creating problems with pflash
pflash toggles mr->romd_mode. So this assert does not always hold.

1) a device was added with !mr->romd_mode, therefore effectively not
   creating a kvm slot as we want to trap every access (add = false).
2) mr->romd_mode was toggled on before remove it. There is now
   actually no slot to remove and the assert is wrong.

So let's just drop the assert.

Reported-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: David Hildenbrand <david@redhat.com>
Message-Id: <20170920145025.19403-1-david@redhat.com>
Tested-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'accel/kvm/kvm-all.c')
-rw-r--r--accel/kvm/kvm-all.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c
index b0181d7220..4f1997deec 100644
--- a/accel/kvm/kvm-all.c
+++ b/accel/kvm/kvm-all.c
@@ -722,7 +722,6 @@ static void kvm_set_phys_mem(KVMMemoryListener *kml,
     mem = kvm_lookup_matching_slot(kml, start_addr, size);
     if (!add) {
         if (!mem) {
-            g_assert(!memory_region_is_ram(mr) && !writeable && !mr->romd_mode);
             return;
         }
         if (mem->flags & KVM_MEM_LOG_DIRTY_PAGES) {