iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

KVM: Rename KVM_MEMORY_SLOTS -> KVM_USER_MEM_SLOTS

Browse Source 
It's easy to confuse KVM_MEMORY_SLOTS and KVM_MEM_SLOTS_NUM.  One is
the user accessible slots and the other is user + private.  Make this
more obvious.

Reviewed-by: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
This commit is contained in:
Alex Williamson 2012-12-10 10:33:09 -07:00 committed by Marcelo Tosatti
parent b7f69c555c
commit bbacc0c111
10 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/ia64/include/asm/kvm_host.h
View File

@ -23,7 +23,7 @@
#ifndef __ASM_KVM_HOST_H #ifndef __ASM_KVM_HOST_H
#define __ASM_KVM_HOST_H #define __ASM_KVM_HOST_H
#define KVM_MEMORY_SLOTS 32 #define KVM_USER_MEM_SLOTS 32
/* memory slots that does not exposed to userspace */ /* memory slots that does not exposed to userspace */
#define KVM_PRIVATE_MEM_SLOTS 4 #define KVM_PRIVATE_MEM_SLOTS 4

2
arch/ia64/kvm/kvm-ia64.c
View File

@ -1834,7 +1834,7 @@ int kvm_vm_ioctl_get_dirty_log(struct kvm *kvm,
mutex_lock(&kvm->slots_lock); mutex_lock(&kvm->slots_lock);
r = -EINVAL; r = -EINVAL;
if (log->slot >= KVM_MEMORY_SLOTS) if (log->slot >= KVM_USER_MEM_SLOTS)
goto out; goto out;
memslot = id_to_memslot(kvm->memslots, log->slot); memslot = id_to_memslot(kvm->memslots, log->slot);

4
arch/powerpc/include/asm/kvm_host.h
View File

@ -37,10 +37,10 @@
#define KVM_MAX_VCPUS NR_CPUS #define KVM_MAX_VCPUS NR_CPUS
#define KVM_MAX_VCORES NR_CPUS #define KVM_MAX_VCORES NR_CPUS
#define KVM_MEMORY_SLOTS 32 #define KVM_USER_MEM_SLOTS 32
/* memory slots that does not exposed to userspace */ /* memory slots that does not exposed to userspace */
#define KVM_PRIVATE_MEM_SLOTS 4 #define KVM_PRIVATE_MEM_SLOTS 4
#define KVM_MEM_SLOTS_NUM (KVM_MEMORY_SLOTS + KVM_PRIVATE_MEM_SLOTS) #define KVM_MEM_SLOTS_NUM (KVM_USER_MEM_SLOTS + KVM_PRIVATE_MEM_SLOTS)
#ifdef CONFIG_KVM_MMIO #ifdef CONFIG_KVM_MMIO
#define KVM_COALESCED_MMIO_PAGE_OFFSET 1 #define KVM_COALESCED_MMIO_PAGE_OFFSET 1

2
arch/powerpc/kvm/book3s_hv.c
View File

@ -1549,7 +1549,7 @@ int kvm_vm_ioctl_get_dirty_log(struct kvm *kvm, struct kvm_dirty_log *log)
mutex_lock(&kvm->slots_lock); mutex_lock(&kvm->slots_lock);
r = -EINVAL; r = -EINVAL;
if (log->slot >= KVM_MEMORY_SLOTS) if (log->slot >= KVM_USER_MEM_SLOTS)
goto out; goto out;
memslot = id_to_memslot(kvm->memslots, log->slot); memslot = id_to_memslot(kvm->memslots, log->slot);

2
arch/s390/include/asm/kvm_host.h
View File

@ -20,7 +20,7 @@
#include <asm/cpu.h> #include <asm/cpu.h>
#define KVM_MAX_VCPUS 64 #define KVM_MAX_VCPUS 64
#define KVM_MEMORY_SLOTS 32 #define KVM_USER_MEM_SLOTS 32
/* memory slots that does not exposed to userspace */ /* memory slots that does not exposed to userspace */
#define KVM_PRIVATE_MEM_SLOTS 4 #define KVM_PRIVATE_MEM_SLOTS 4

4
arch/x86/include/asm/kvm_host.h
View File

@ -33,10 +33,10 @@
#define KVM_MAX_VCPUS 254 #define KVM_MAX_VCPUS 254
#define KVM_SOFT_MAX_VCPUS 160 #define KVM_SOFT_MAX_VCPUS 160
#define KVM_MEMORY_SLOTS 32 #define KVM_USER_MEM_SLOTS 32
/* memory slots that does not exposed to userspace */ /* memory slots that does not exposed to userspace */
#define KVM_PRIVATE_MEM_SLOTS 4 #define KVM_PRIVATE_MEM_SLOTS 4
#define KVM_MEM_SLOTS_NUM (KVM_MEMORY_SLOTS + KVM_PRIVATE_MEM_SLOTS) #define KVM_MEM_SLOTS_NUM (KVM_USER_MEM_SLOTS + KVM_PRIVATE_MEM_SLOTS)
#define KVM_MMIO_SIZE 16 #define KVM_MMIO_SIZE 16

6
arch/x86/include/asm/vmx.h
View File

@ -427,9 +427,9 @@ enum vmcs_field {
#define AR_RESERVD_MASK 0xfffe0f00 #define AR_RESERVD_MASK 0xfffe0f00
#define TSS_PRIVATE_MEMSLOT (KVM_MEMORY_SLOTS + 0) #define TSS_PRIVATE_MEMSLOT (KVM_USER_MEM_SLOTS + 0)
#define APIC_ACCESS_PAGE_PRIVATE_MEMSLOT (KVM_MEMORY_SLOTS + 1) #define APIC_ACCESS_PAGE_PRIVATE_MEMSLOT (KVM_USER_MEM_SLOTS + 1)
#define IDENTITY_PAGETABLE_PRIVATE_MEMSLOT (KVM_MEMORY_SLOTS + 2) #define IDENTITY_PAGETABLE_PRIVATE_MEMSLOT (KVM_USER_MEM_SLOTS + 2)
#define VMX_NR_VPIDS (1 << 16) #define VMX_NR_VPIDS (1 << 16)
#define VMX_VPID_EXTENT_SINGLE_CONTEXT 1 #define VMX_VPID_EXTENT_SINGLE_CONTEXT 1

6
arch/x86/kvm/x86.c
View File

@ -2518,7 +2518,7 @@ int kvm_dev_ioctl_check_extension(long ext)
r = KVM_MAX_VCPUS; r = KVM_MAX_VCPUS;
break; break;
case KVM_CAP_NR_MEMSLOTS: case KVM_CAP_NR_MEMSLOTS:
r = KVM_MEMORY_SLOTS; r = KVM_USER_MEM_SLOTS;
break; break;
case KVM_CAP_PV_MMU: /* obsolete */ case KVM_CAP_PV_MMU: /* obsolete */
r = 0; r = 0;
@ -3435,7 +3435,7 @@ int kvm_vm_ioctl_get_dirty_log(struct kvm *kvm, struct kvm_dirty_log *log)
mutex_lock(&kvm->slots_lock); mutex_lock(&kvm->slots_lock);
r = -EINVAL; r = -EINVAL;
if (log->slot >= KVM_MEMORY_SLOTS) if (log->slot >= KVM_USER_MEM_SLOTS)
goto out; goto out;
memslot = id_to_memslot(kvm->memslots, log->slot); memslot = id_to_memslot(kvm->memslots, log->slot);
@ -6845,7 +6845,7 @@ int kvm_arch_prepare_memory_region(struct kvm *kvm,
int map_flags = MAP_PRIVATE | MAP_ANONYMOUS; int map_flags = MAP_PRIVATE | MAP_ANONYMOUS;
/* Prevent internal slot pages from being moved by fork()/COW. */ /* Prevent internal slot pages from being moved by fork()/COW. */
if (memslot->id >= KVM_MEMORY_SLOTS) if (memslot->id >= KVM_USER_MEM_SLOTS)
map_flags = MAP_SHARED | MAP_ANONYMOUS; map_flags = MAP_SHARED | MAP_ANONYMOUS;
/*To keep backward compatibility with older userspace, /*To keep backward compatibility with older userspace,

2
include/linux/kvm_host.h
View File

@ -314,7 +314,7 @@ struct kvm_irq_routing_table {};
#endif #endif
#ifndef KVM_MEM_SLOTS_NUM #ifndef KVM_MEM_SLOTS_NUM
#define KVM_MEM_SLOTS_NUM (KVM_MEMORY_SLOTS + KVM_PRIVATE_MEM_SLOTS) #define KVM_MEM_SLOTS_NUM (KVM_USER_MEM_SLOTS + KVM_PRIVATE_MEM_SLOTS)
#endif #endif
/* /*

8
virt/kvm/kvm_main.c
View File

@ -771,7 +771,7 @@ int __kvm_set_memory_region(struct kvm *kvm,
/* Check for overlaps */ /* Check for overlaps */
r = -EEXIST; r = -EEXIST;
kvm_for_each_memslot(slot, kvm->memslots) { kvm_for_each_memslot(slot, kvm->memslots) {
if (slot->id >= KVM_MEMORY_SLOTS || slot == memslot) if (slot->id >= KVM_USER_MEM_SLOTS || slot == memslot)
continue; continue;
if (!((base_gfn + npages <= slot->base_gfn) || if (!((base_gfn + npages <= slot->base_gfn) ||
(base_gfn >= slot->base_gfn + slot->npages))) (base_gfn >= slot->base_gfn + slot->npages)))
@ -905,7 +905,7 @@ int kvm_vm_ioctl_set_memory_region(struct kvm *kvm,
kvm_userspace_memory_region *mem, kvm_userspace_memory_region *mem,
int user_alloc) int user_alloc)
{ {
if (mem->slot >= KVM_MEMORY_SLOTS) if (mem->slot >= KVM_USER_MEM_SLOTS)
return -EINVAL; return -EINVAL;
return kvm_set_memory_region(kvm, mem, user_alloc); return kvm_set_memory_region(kvm, mem, user_alloc);
} }
@ -919,7 +919,7 @@ int kvm_get_dirty_log(struct kvm *kvm,
unsigned long any = 0; unsigned long any = 0;
r = -EINVAL; r = -EINVAL;
if (log->slot >= KVM_MEMORY_SLOTS) if (log->slot >= KVM_USER_MEM_SLOTS)
goto out; goto out;
memslot = id_to_memslot(kvm->memslots, log->slot); memslot = id_to_memslot(kvm->memslots, log->slot);
@ -965,7 +965,7 @@ int kvm_is_visible_gfn(struct kvm *kvm, gfn_t gfn)
{ {
struct kvm_memory_slot *memslot = gfn_to_memslot(kvm, gfn); struct kvm_memory_slot *memslot = gfn_to_memslot(kvm, gfn);
if (!memslot || memslot->id >= KVM_MEMORY_SLOTS || if (!memslot || memslot->id >= KVM_USER_MEM_SLOTS ||
memslot->flags & KVM_MEMSLOT_INVALID) memslot->flags & KVM_MEMSLOT_INVALID)
return 0; return 0;