Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bbacc0c1 authored by Alex Williamson's avatar Alex Williamson Committed by Marcelo Tosatti
Browse files

KVM: Rename KVM_MEMORY_SLOTS -> KVM_USER_MEM_SLOTS 



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: default avatarGleb Natapov <gleb@redhat.com>
Signed-off-by: default avatarAlex Williamson <alex.williamson@redhat.com>
Signed-off-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
parent b7f69c55

arch/ia64/include/asm/kvm_host.h

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
#ifndef __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 */

#define KVM_PRIVATE_MEM_SLOTS 4

arch/ia64/kvm/kvm-ia64.c

+1 −1
Original line number Diff line number Diff line
@@ -1834,7 +1834,7 @@ int kvm_vm_ioctl_get_dirty_log(struct kvm *kvm, 
	mutex_lock(&kvm->slots_lock);



	r = -EINVAL;

	if (log->slot >= KVM_MEMORY_SLOTS)

	if (log->slot >= KVM_USER_MEM_SLOTS)

		goto out;



	memslot = id_to_memslot(kvm->memslots, log->slot);

arch/powerpc/include/asm/kvm_host.h

+2 −2
Original line number Diff line number Diff line
@@ -37,10 +37,10 @@ 


#define KVM_MAX_VCPUS		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 */

#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

#define KVM_COALESCED_MMIO_PAGE_OFFSET 1

arch/powerpc/kvm/book3s_hv.c

+1 −1
Original line number Diff line number Diff line
@@ -1549,7 +1549,7 @@ int kvm_vm_ioctl_get_dirty_log(struct kvm *kvm, struct kvm_dirty_log *log) 
	mutex_lock(&kvm->slots_lock);



	r = -EINVAL;

	if (log->slot >= KVM_MEMORY_SLOTS)

	if (log->slot >= KVM_USER_MEM_SLOTS)

		goto out;



	memslot = id_to_memslot(kvm->memslots, log->slot);

arch/s390/include/asm/kvm_host.h

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
#include <asm/cpu.h>



#define KVM_MAX_VCPUS 64

#define KVM_MEMORY_SLOTS 32

#define KVM_USER_MEM_SLOTS 32

/* memory slots that does not exposed to userspace */

#define KVM_PRIVATE_MEM_SLOTS 4