diff options
| author | Christian Borntraeger <borntraeger@de.ibm.com> | 2014-09-04 21:13:33 +0200 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2015-04-27 19:59:54 +0200 |
| commit | 53cc322aa81ff2cdbc37f9a6c9fefe55c04e5765 (patch) | |
| tree | 0b97383224c3f11c8c5e971410a79dc582b9501c | |
| parent | fb6a2a8ebe2741cd15d9f4c613c6b40cf0e40ea5 (diff) | |
| download | lwn-53cc322aa81ff2cdbc37f9a6c9fefe55c04e5765.tar.gz lwn-53cc322aa81ff2cdbc37f9a6c9fefe55c04e5765.zip | |
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 <borntraeger@de.ibm.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
| -rw-r--r-- | virt/kvm/kvm_main.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index b9bf29490b12..feffb3f7c393 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -774,7 +774,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; @@ -788,7 +787,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; @@ -844,7 +842,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) |