aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ia64
diff options
context:
space:
mode:
authorAlex Williamson <alex.williamson@redhat.com>2012-12-10 12:33:09 -0500
committerMarcelo Tosatti <mtosatti@redhat.com>2012-12-13 20:21:57 -0500
commitbbacc0c111c3c5d1f3192b8cc1642b9c3954f80d (patch)
tree2ccef1b8a73400c56a1ef2a3967d09606b8ab50a /arch/ia64
parentb7f69c555ca430129b6cde81e9f0927531420c5c (diff)
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.h2
-rw-r--r--arch/ia64/kvm/kvm-ia64.c2
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 6d6a5ac48d85..48d7b0e1dba9 100644
--- a/arch/ia64/include/asm/kvm_host.h
+++ b/arch/ia64/include/asm/kvm_host.h
@@ -23,7 +23,7 @@
23#ifndef __ASM_KVM_HOST_H 23#ifndef __ASM_KVM_HOST_H
24#define __ASM_KVM_HOST_H 24#define __ASM_KVM_HOST_H
25 25
26#define KVM_MEMORY_SLOTS 32 26#define KVM_USER_MEM_SLOTS 32
27/* memory slots that does not exposed to userspace */ 27/* memory slots that does not exposed to userspace */
28#define KVM_PRIVATE_MEM_SLOTS 4 28#define KVM_PRIVATE_MEM_SLOTS 4
29 29
diff --git a/arch/ia64/kvm/kvm-ia64.c b/arch/ia64/kvm/kvm-ia64.c
index bd1c51555038..9bacfe207b43 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,
1834 mutex_lock(&kvm->slots_lock); 1834 mutex_lock(&kvm->slots_lock);
1835 1835
1836 r = -EINVAL; 1836 r = -EINVAL;
1837 if (log->slot >= KVM_MEMORY_SLOTS) 1837 if (log->slot >= KVM_USER_MEM_SLOTS)
1838 goto out; 1838 goto out;
1839 1839
1840 memslot = id_to_memslot(kvm->memslots, log->slot); 1840 memslot = id_to_memslot(kvm->memslots, log->slot);