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: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index de1ae82ba1921928d90a9e5234c853566cdd4c64..c338599804e060c44b61e9cc69e7fd5cd92364bb 100644 (file)
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -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;
 
        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;
 
        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;
 
        new.npages = npages;
        new.flags = mem->flags;
 

-       r = -EINVAL;

        if (npages) {
                if (!old.npages)
                        change = KVM_MR_CREATE;
        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)) {
        }
 
        if ((change == KVM_MR_DELETE) || (change == KVM_MR_MOVE)) {

-               r = -ENOMEM;

                slots = kmemdup(kvm->memslots, sizeof(struct kvm_memslots),
                                GFP_KERNEL);
                if (!slots)
                slots = kmemdup(kvm->memslots, sizeof(struct kvm_memslots),
                                GFP_KERNEL);
                if (!slots)