motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-08 10:13:56 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

kvm: Delete the slot if and only if the KVM_MEM_READONLY flag is changed

Browse source 
According to KVM commit 75d61fbc, it needs to delete the slot before
changing the KVM_MEM_READONLY flag. But QEMU commit 235e8982 only check
whether KVM_MEM_READONLY flag is set instead of changing. It doesn't
need to delete the slot if the KVM_MEM_READONLY flag is not changed.

This fixes a issue that migrating a VM at the OVMF startup stage and
VM is executing the codes in rom. Between the deleting and adding the
slot in kvm_set_user_memory_region, there is a chance that guest access
rom and trap to KVM, then KVM can't find the corresponding memslot.
While KVM (on ARM) injects an abort to guest due to the broken hva, then
guest will get stuck.

Signed-off-by: Shannon Zhao <zhaoshenglong@huawei.com>
Message-Id: <1526462314-19720-1-git-send-email-zhaoshenglong@huawei.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Shannon Zhao 2018-05-16 17:18:34 +08:00 • committed by Paolo Bonzini
parent 61362b71c1
commit 6c090d4a75
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/sysemu/kvm_int.h
View file

@ -20,6 +20,7 @@ typedef struct KVMSlot
void *ram;
int slot;
int flags;
int old_flags;
} KVMSlot;
typedef struct KVMMemoryListener {