Commit c110ae57 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

kvm: move KVM_CAP_NR_MEMSLOTS to common code 



All architectures except MIPS were defining it in the same way,
and memory slots are handled entirely by common code so there
is no point in keeping the definition per-architecture.

Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 0a629563

Documentation/virtual/kvm/api.txt

+2 −3
Original line number Diff line number Diff line
@@ -1117,9 +1117,8 @@ struct kvm_userspace_memory_region { 
This ioctl allows the user to create, modify or delete a guest physical

memory slot.  Bits 0-15 of "slot" specify the slot id and this value

should be less than the maximum number of user memory slots supported per

VM.  The maximum allowed slots can be queried using KVM_CAP_NR_MEMSLOTS,

if this capability is supported by the architecture.  Slots may not

overlap in guest physical address space.

VM.  The maximum allowed slots can be queried using KVM_CAP_NR_MEMSLOTS.

Slots may not overlap in guest physical address space.



If KVM_CAP_MULTI_ADDRESS_SPACE is available, bits 16-31 of "slot"

specifies the address space which is being modified.  They must be

arch/powerpc/kvm/powerpc.c

+0 −3
Original line number Diff line number Diff line
@@ -644,9 +644,6 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext) 
		else

			r = num_online_cpus();

		break;

	case KVM_CAP_NR_MEMSLOTS:

		r = KVM_USER_MEM_SLOTS;

		break;

	case KVM_CAP_MAX_VCPUS:

		r = KVM_MAX_VCPUS;

		break;

arch/s390/kvm/kvm-s390.c

+0 −3
Original line number Diff line number Diff line
@@ -513,9 +513,6 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext) 
		else if (sclp.has_esca && sclp.has_64bscao)

			r = KVM_S390_ESCA_CPU_SLOTS;

		break;

	case KVM_CAP_NR_MEMSLOTS:

		r = KVM_USER_MEM_SLOTS;

		break;

	case KVM_CAP_S390_COW:

		r = MACHINE_HAS_ESOP;

		break;

arch/x86/kvm/x86.c

+0 −3
Original line number Diff line number Diff line
@@ -3093,9 +3093,6 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext) 
	case KVM_CAP_MAX_VCPUS:

		r = KVM_MAX_VCPUS;

		break;

	case KVM_CAP_NR_MEMSLOTS:

		r = KVM_USER_MEM_SLOTS;

		break;

	case KVM_CAP_PV_MMU:	/* obsolete */

		r = 0;

		break;

virt/kvm/arm/arm.c

+0 −3
Original line number Diff line number Diff line
@@ -224,9 +224,6 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext) 
	case KVM_CAP_MAX_VCPUS:

		r = KVM_MAX_VCPUS;

		break;

	case KVM_CAP_NR_MEMSLOTS:

		r = KVM_USER_MEM_SLOTS;

		break;

	case KVM_CAP_MSI_DEVID:

		if (!kvm)

			r = -EINVAL;