From: Christian Borntraeger Date: Thu, 4 Sep 2014 19:13:33 +0000 (+0200) Subject: KVM: remove redundant assignments in __kvm_set_memory_region X-Git-Tag: v3.16.35~2345 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1a98197d156a318c2a057865f9c55fa76e98ddd3;p=thirdparty%2Fkernel%2Fstable.git KVM: remove redundant assignments in __kvm_set_memory_region commit f2a25160887e00434ce1361007009120e1fecbda upstream. __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: Christian Borntraeger Signed-off-by: Paolo Bonzini Signed-off-by: Luis Henriques --- diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 438851c2a797c..7e76ce9254e20 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -791,7 +791,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; @@ -805,7 +804,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; @@ -861,7 +859,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)