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

Commit f2a25160 authored by Christian Borntraeger's avatar Christian Borntraeger Committed by Paolo Bonzini
Browse files

KVM: remove redundant assignments in __kvm_set_memory_region 



__kvm_set_memory_region sets r to EINVAL very early.
Doing it again is not necessary. The same is true later on, where
r is assigned -ENOMEM twice.

Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent a13f533b

virt/kvm/kvm_main.c

+0 −3
Original line number Diff line number Diff line
@@ -793,7 +793,6 @@ int __kvm_set_memory_region(struct kvm *kvm, 
	base_gfn = mem->guest_phys_addr >> PAGE_SHIFT;

	npages = mem->memory_size >> PAGE_SHIFT;



	r = -EINVAL;

	if (npages > KVM_MEM_MAX_NR_PAGES)

		goto out;
@@ -807,7 +806,6 @@ int __kvm_set_memory_region(struct kvm *kvm, 
	new.npages = npages;

	new.flags = mem->flags;



	r = -EINVAL;

	if (npages) {

		if (!old.npages)

			change = KVM_MR_CREATE;
@@ -863,7 +861,6 @@ int __kvm_set_memory_region(struct kvm *kvm, 
	}



	if ((change == KVM_MR_DELETE) || (change == KVM_MR_MOVE)) {

		r = -ENOMEM;

		slots = kmemdup(kvm->memslots, sizeof(struct kvm_memslots),

				GFP_KERNEL);

		if (!slots)