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

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

KVM: struct kvm_memory_slot.user_alloc -> bool 



There's no need for this to be an int, it holds a boolean.
Move to the end of the struct for alignment.

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 0743247f

arch/ia64/kvm/kvm-ia64.c

+3 −3
Original line number Diff line number Diff line
@@ -955,7 +955,7 @@ long kvm_arch_vm_ioctl(struct file *filp, 
					kvm_mem.guest_phys_addr;

		kvm_userspace_mem.memory_size = kvm_mem.memory_size;

		r = kvm_vm_ioctl_set_memory_region(kvm,

					&kvm_userspace_mem, 0);

					&kvm_userspace_mem, false);

		if (r)

			goto out;

		break;
@@ -1580,7 +1580,7 @@ int kvm_arch_prepare_memory_region(struct kvm *kvm, 
		struct kvm_memory_slot *memslot,

		struct kvm_memory_slot old,

		struct kvm_userspace_memory_region *mem,

		int user_alloc)

		bool user_alloc)

{

	unsigned long i;

	unsigned long pfn;
@@ -1611,7 +1611,7 @@ int kvm_arch_prepare_memory_region(struct kvm *kvm, 
void kvm_arch_commit_memory_region(struct kvm *kvm,

		struct kvm_userspace_memory_region *mem,

		struct kvm_memory_slot old,

		int user_alloc)

		bool user_alloc)

{

	return;

}

arch/powerpc/kvm/powerpc.c

+2 −2
Original line number Diff line number Diff line
@@ -412,7 +412,7 @@ int kvm_arch_prepare_memory_region(struct kvm *kvm, 
                                   struct kvm_memory_slot *memslot,

                                   struct kvm_memory_slot old,

                                   struct kvm_userspace_memory_region *mem,

                                   int user_alloc)

                                   bool user_alloc)

{

	return kvmppc_core_prepare_memory_region(kvm, memslot, mem);

}
@@ -420,7 +420,7 @@ int kvm_arch_prepare_memory_region(struct kvm *kvm, 
void kvm_arch_commit_memory_region(struct kvm *kvm,

               struct kvm_userspace_memory_region *mem,

               struct kvm_memory_slot old,

               int user_alloc)

               bool user_alloc)

{

	kvmppc_core_commit_memory_region(kvm, mem, old);

}

arch/s390/kvm/kvm-s390.c

+2 −2
Original line number Diff line number Diff line
@@ -928,7 +928,7 @@ int kvm_arch_prepare_memory_region(struct kvm *kvm, 
				   struct kvm_memory_slot *memslot,

				   struct kvm_memory_slot old,

				   struct kvm_userspace_memory_region *mem,

				   int user_alloc)

				   bool user_alloc)

{

	/* A few sanity checks. We can have exactly one memory slot which has

	   to start at guest virtual zero and which has to be located at a
@@ -958,7 +958,7 @@ int kvm_arch_prepare_memory_region(struct kvm *kvm, 
void kvm_arch_commit_memory_region(struct kvm *kvm,

				struct kvm_userspace_memory_region *mem,

				struct kvm_memory_slot old,

				int user_alloc)

				bool user_alloc)

{

	int rc;

arch/x86/kvm/vmx.c

+3 −3
Original line number Diff line number Diff line
@@ -3667,7 +3667,7 @@ static int alloc_apic_access_page(struct kvm *kvm) 
	kvm_userspace_mem.flags = 0;

	kvm_userspace_mem.guest_phys_addr = 0xfee00000ULL;

	kvm_userspace_mem.memory_size = PAGE_SIZE;

	r = __kvm_set_memory_region(kvm, &kvm_userspace_mem, 0);

	r = __kvm_set_memory_region(kvm, &kvm_userspace_mem, false);

	if (r)

		goto out;
@@ -3697,7 +3697,7 @@ static int alloc_identity_pagetable(struct kvm *kvm) 
	kvm_userspace_mem.guest_phys_addr =

		kvm->arch.ept_identity_map_addr;

	kvm_userspace_mem.memory_size = PAGE_SIZE;

	r = __kvm_set_memory_region(kvm, &kvm_userspace_mem, 0);

	r = __kvm_set_memory_region(kvm, &kvm_userspace_mem, false);

	if (r)

		goto out;
@@ -4251,7 +4251,7 @@ static int vmx_set_tss_addr(struct kvm *kvm, unsigned int addr) 
		.flags = 0,

	};



	ret = kvm_set_memory_region(kvm, &tss_mem, 0);

	ret = kvm_set_memory_region(kvm, &tss_mem, false);

	if (ret)

		return ret;

	kvm->arch.tss_addr = addr;

arch/x86/kvm/x86.c

+2 −2
Original line number Diff line number Diff line
@@ -6839,7 +6839,7 @@ int kvm_arch_prepare_memory_region(struct kvm *kvm, 
				struct kvm_memory_slot *memslot,

				struct kvm_memory_slot old,

				struct kvm_userspace_memory_region *mem,

				int user_alloc)

				bool user_alloc)

{

	int npages = memslot->npages;

	int map_flags = MAP_PRIVATE | MAP_ANONYMOUS;
@@ -6875,7 +6875,7 @@ int kvm_arch_prepare_memory_region(struct kvm *kvm, 
void kvm_arch_commit_memory_region(struct kvm *kvm,

				struct kvm_userspace_memory_region *mem,

				struct kvm_memory_slot old,

				int user_alloc)

				bool user_alloc)

{



	int nr_mmu_pages = 0, npages = mem->memory_size >> PAGE_SHIFT;