6c090d4a75
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>
41 lines
858 B
C
41 lines
858 B
C
/*
|
|
* Internal definitions for a target's KVM support
|
|
*
|
|
* This work is licensed under the terms of the GNU GPL, version 2 or later.
|
|
* See the COPYING file in the top-level directory.
|
|
*
|
|
*/
|
|
|
|
#ifndef QEMU_KVM_INT_H
|
|
#define QEMU_KVM_INT_H
|
|
|
|
#include "sysemu/sysemu.h"
|
|
#include "sysemu/accel.h"
|
|
#include "sysemu/kvm.h"
|
|
|
|
typedef struct KVMSlot
|
|
{
|
|
hwaddr start_addr;
|
|
ram_addr_t memory_size;
|
|
void *ram;
|
|
int slot;
|
|
int flags;
|
|
int old_flags;
|
|
} KVMSlot;
|
|
|
|
typedef struct KVMMemoryListener {
|
|
MemoryListener listener;
|
|
KVMSlot *slots;
|
|
int as_id;
|
|
} KVMMemoryListener;
|
|
|
|
#define TYPE_KVM_ACCEL ACCEL_CLASS_NAME("kvm")
|
|
|
|
#define KVM_STATE(obj) \
|
|
OBJECT_CHECK(KVMState, (obj), TYPE_KVM_ACCEL)
|
|
|
|
void kvm_memory_listener_register(KVMState *s, KVMMemoryListener *kml,
|
|
AddressSpace *as, int as_id);
|
|
|
|
#endif
|