From bef103aa7dd75121f66848d91f6b6179d40c1a71 Mon Sep 17 00:00:00 2001 From: Marc Zyngier Date: Fri, 15 Feb 2013 19:20:06 +0000 Subject: ARM: KVM: fix kvm_arch_{prepare,commit}_memory_region Commit f82a8cfe9 (KVM: struct kvm_memory_slot.user_alloc -> bool) broke the ARM KVM port by changing the prototype of two global functions. Apply the same change to fix the compilation breakage. Signed-off-by: Marc Zyngier Signed-off-by: Gleb Natapov --- arch/arm/kvm/arm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'arch/arm') diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c index 9ada5549216d..5a936988eb24 100644 --- a/arch/arm/kvm/arm.c +++ b/arch/arm/kvm/arm.c @@ -232,7 +232,7 @@ int kvm_arch_prepare_memory_region(struct kvm *kvm, struct kvm_memory_slot *memslot, struct kvm_memory_slot old, struct kvm_userspace_memory_region *mem, - int user_alloc) + bool user_alloc) { return 0; } @@ -240,7 +240,7 @@ int kvm_arch_prepare_memory_region(struct kvm *kvm, void kvm_arch_commit_memory_region(struct kvm *kvm, struct kvm_userspace_memory_region *mem, struct kvm_memory_slot old, - int user_alloc) + bool user_alloc) { } -- cgit v1.2.3-59-g8ed1b From 2b5e1e474fd7b0f2540a052d15465ba953dd30b1 Mon Sep 17 00:00:00 2001 From: Marc Zyngier Date: Fri, 15 Feb 2013 19:20:07 +0000 Subject: ARM: KVM: Rename KVM_MEMORY_SLOTS -> KVM_USER_MEM_SLOTS Commit bbacc0c (KVM: Rename KVM_MEMORY_SLOTS -> KVM_USER_MEM_SLOTS) broke KVM/ARM by changing a global #define. Apply the same change to fix the compilation breakage. Signed-off-by: Marc Zyngier Signed-off-by: Gleb Natapov --- arch/arm/include/asm/kvm_host.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch/arm') diff --git a/arch/arm/include/asm/kvm_host.h b/arch/arm/include/asm/kvm_host.h index dfe98866a992..d1736a53b12d 100644 --- a/arch/arm/include/asm/kvm_host.h +++ b/arch/arm/include/asm/kvm_host.h @@ -26,7 +26,7 @@ #include #define KVM_MAX_VCPUS CONFIG_KVM_ARM_MAX_VCPUS -#define KVM_MEMORY_SLOTS 32 +#define KVM_USER_MEM_SLOTS 32 #define KVM_PRIVATE_MEM_SLOTS 4 #define KVM_COALESCED_MMIO_PAGE_OFFSET 1 #define KVM_HAVE_ONE_REG -- cgit v1.2.3-59-g8ed1b From 3b8cd8a015f3db85624c0fdb591956aed7f61b65 Mon Sep 17 00:00:00 2001 From: Marc Zyngier Date: Fri, 15 Feb 2013 19:20:08 +0000 Subject: ARM: KVM: fix compilation after removal of user_alloc from struct kvm_memory_slot Commit 7a905b1 (KVM: Remove user_alloc from struct kvm_memory_slot) broke KVM/ARM by removing the user_alloc field from a public structure. As we only used this field to alert the user that we didn't support this operation mode, there is no harm in discarding this bit of code without any remorse. Signed-off-by: Marc Zyngier Signed-off-by: Gleb Natapov --- arch/arm/kvm/mmu.c | 5 ----- 1 file changed, 5 deletions(-) (limited to 'arch/arm') diff --git a/arch/arm/kvm/mmu.c b/arch/arm/kvm/mmu.c index f30e13163a96..99e07c7dd745 100644 --- a/arch/arm/kvm/mmu.c +++ b/arch/arm/kvm/mmu.c @@ -633,11 +633,6 @@ int kvm_handle_guest_abort(struct kvm_vcpu *vcpu, struct kvm_run *run) } memslot = gfn_to_memslot(vcpu->kvm, gfn); - if (!memslot->user_alloc) { - kvm_err("non user-alloc memslots not supported\n"); - ret = -EINVAL; - goto out_unlock; - } ret = user_mem_abort(vcpu, fault_ipa, gfn, memslot, fault_status); if (ret == 0) -- cgit v1.2.3-59-g8ed1b