Commit 843574a3 authored by Markus Elfring's avatar Markus Elfring Committed by Paolo Bonzini

KVM: Return an error code only as a constant in kvm_get_dirty_log()

* 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: default avatarMarkus Elfring <>
Signed-off-by: default avatarPaolo Bonzini <>
parent 58d6db34
......@@ -1102,37 +1102,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;
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;
return r;
return 0;
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