Commit 1a98197d authored by Christian Borntraeger's avatar Christian Borntraeger Committed by Luis Henriques

KVM: remove redundant assignments in __kvm_set_memory_region

commit f2a25160 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: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarLuis Henriques <luis.henriques@canonical.com>
parent 39ae67b0
...@@ -791,7 +791,6 @@ int __kvm_set_memory_region(struct kvm *kvm, ...@@ -791,7 +791,6 @@ int __kvm_set_memory_region(struct kvm *kvm,
base_gfn = mem->guest_phys_addr >> PAGE_SHIFT; base_gfn = mem->guest_phys_addr >> PAGE_SHIFT;
npages = mem->memory_size >> PAGE_SHIFT; npages = mem->memory_size >> PAGE_SHIFT;
r = -EINVAL;
if (npages > KVM_MEM_MAX_NR_PAGES) if (npages > KVM_MEM_MAX_NR_PAGES)
goto out; goto out;
...@@ -805,7 +804,6 @@ int __kvm_set_memory_region(struct kvm *kvm, ...@@ -805,7 +804,6 @@ int __kvm_set_memory_region(struct kvm *kvm,
new.npages = npages; new.npages = npages;
new.flags = mem->flags; new.flags = mem->flags;
r = -EINVAL;
if (npages) { if (npages) {
if (!old.npages) if (!old.npages)
change = KVM_MR_CREATE; change = KVM_MR_CREATE;
...@@ -861,7 +859,6 @@ int __kvm_set_memory_region(struct kvm *kvm, ...@@ -861,7 +859,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), slots = kmemdup(kvm->memslots, sizeof(struct kvm_memslots),
GFP_KERNEL); GFP_KERNEL);
if (!slots) if (!slots)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment