[PATCH 7/9] KVM: Return an error code only as a constant in kvm_get_dirty_log()

[SF Markus Elfring]

From: Markus Elfring <elfr...@users.sourceforge.net>
Date: Sun, 22 Jan 2017 17:41:07 +0100

* Return an error code without storing it in an intermediate variable.

* Delete the local variable "r" and the jump label "out" which became
  unnecessary with this refactoring.

Signed-off-by: Markus Elfring <elfr...@users.sourceforge.net>
---
 virt/kvm/kvm_main.c | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index a651a137ef21..ca88f3620ee3 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -1094,37 +1094,31 @@ int kvm_get_dirty_log(struct kvm *kvm,
 {
        struct kvm_memslots *slots;
        struct kvm_memory_slot *memslot;
-       int r, i, as_id, id;
+       int i, as_id, id;
        unsigned long n;
        unsigned long any = 0;
 
-       r = -EINVAL;
        as_id = log->slot >> 16;
        id = (u16)log->slot;
        if (as_id >= KVM_ADDRESS_SPACE_NUM || id >= KVM_USER_MEM_SLOTS)
-               goto out;
+               return -EINVAL;
 
        slots = __kvm_memslots(kvm, as_id);
        memslot = id_to_memslot(slots, id);
-       r = -ENOENT;
        if (!memslot->dirty_bitmap)
-               goto out;
+               return -ENOENT;
 
        n = kvm_dirty_bitmap_bytes(memslot);
 
        for (i = 0; !any && i < n/sizeof(long); ++i)
                any = memslot->dirty_bitmap[i];
 
-       r = -EFAULT;
        if (copy_to_user(log->dirty_bitmap, memslot->dirty_bitmap, n))
-               goto out;
+               return -EFAULT;
 
        if (any)
                *is_dirty = 1;
-
-       r = 0;
-out:
-       return r;
+       return 0;
 }
 EXPORT_SYMBOL_GPL(kvm_get_dirty_log);
 
-- 
2.11.0