diff options
| author | Alex Williamson <alex.williamson@redhat.com> | 2012-12-10 10:33:09 -0700 |
|---|---|---|
| committer | Marcelo Tosatti <mtosatti@redhat.com> | 2012-12-13 23:21:57 -0200 |
| commit | bbacc0c111c3c5d1f3192b8cc1642b9c3954f80d (patch) | |
| tree | 2ccef1b8a73400c56a1ef2a3967d09606b8ab50a /arch/ia64 | |
| parent | b7f69c555ca430129b6cde81e9f0927531420c5c (diff) | |
| download | op-kernel-dev-bbacc0c111c3c5d1f3192b8cc1642b9c3954f80d.zip op-kernel-dev-bbacc0c111c3c5d1f3192b8cc1642b9c3954f80d.tar.gz | |
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: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'arch/ia64')
| -rw-r--r-- | arch/ia64/include/asm/kvm_host.h | 2 | ||||
| -rw-r--r-- | arch/ia64/kvm/kvm-ia64.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/ia64/include/asm/kvm_host.h b/arch/ia64/include/asm/kvm_host.h index 6d6a5ac..48d7b0e 100644 --- a/arch/ia64/include/asm/kvm_host.h +++ b/arch/ia64/include/asm/kvm_host.h @@ -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 diff --git a/arch/ia64/kvm/kvm-ia64.c b/arch/ia64/kvm/kvm-ia64.c index bd1c515..9bacfe2 100644 --- a/arch/ia64/kvm/kvm-ia64.c +++ b/arch/ia64/kvm/kvm-ia64.c @@ -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); |
