[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 04/13] KVM: Fixup kvm_log_clear_one_slot() ioctl return check
From: |
Peter Xu |
Subject: |
[PATCH v4 04/13] KVM: Fixup kvm_log_clear_one_slot() ioctl return check |
Date: |
Fri, 8 Jan 2021 11:50:41 -0500 |
kvm_vm_ioctl() handles the errno trick already for ioctl() on
returning -1 for errors. Fix this.
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Peter Xu <peterx@redhat.com>
---
accel/kvm/kvm-all.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c
index 389eaace72..9f779b56ae 100644
--- a/accel/kvm/kvm-all.c
+++ b/accel/kvm/kvm-all.c
@@ -771,14 +771,13 @@ static int kvm_log_clear_one_slot(KVMSlot *mem, int
as_id, uint64_t start,
d.num_pages = bmap_npages;
d.slot = mem->slot | (as_id << 16);
- if (kvm_vm_ioctl(s, KVM_CLEAR_DIRTY_LOG, &d) == -1) {
- ret = -errno;
+ ret = kvm_vm_ioctl(s, KVM_CLEAR_DIRTY_LOG, &d);
+ if (ret) {
error_report("%s: KVM_CLEAR_DIRTY_LOG failed, slot=%d, "
"start=0x%"PRIx64", size=0x%"PRIx32", errno=%d",
__func__, d.slot, (uint64_t)d.first_page,
(uint32_t)d.num_pages, ret);
} else {
- ret = 0;
trace_kvm_clear_dirty_log(d.slot, d.first_page, d.num_pages);
}
--
2.26.2
- [PATCH v4 00/13] KVM: Dirty ring support (QEMU part), Peter Xu, 2021/01/08
- [PATCH v4 02/13] Update linux headers to 5.11-rc2, Peter Xu, 2021/01/08
- [PATCH v4 03/13] memory: Introduce log_sync_global() to memory listener, Peter Xu, 2021/01/08
- [PATCH v4 01/13] update-linux-headers: Include const.h, Peter Xu, 2021/01/08
- [PATCH v4 04/13] KVM: Fixup kvm_log_clear_one_slot() ioctl return check,
Peter Xu <=
- [PATCH v4 05/13] KVM: Use a big lock to replace per-kml slots_lock, Peter Xu, 2021/01/08
- [PATCH v4 06/13] KVM: Create the KVMSlot dirty bitmap on flag changes, Peter Xu, 2021/01/08
- [PATCH v4 07/13] KVM: Provide helper to get kvm dirty log, Peter Xu, 2021/01/08
- [PATCH v4 08/13] KVM: Provide helper to sync dirty bitmap from slot to ramblock, Peter Xu, 2021/01/08
- [PATCH v4 09/13] KVM: Simplify dirty log sync in kvm_set_phys_mem, Peter Xu, 2021/01/08
- [PATCH v4 10/13] KVM: Cache kvm slot dirty bitmap size, Peter Xu, 2021/01/08
- [PATCH v4 11/13] KVM: Add dirty-gfn-count property, Peter Xu, 2021/01/08
- [PATCH v4 12/13] KVM: Disable manual dirty log when dirty ring enabled, Peter Xu, 2021/01/08
- [PATCH v4 13/13] KVM: Dirty ring support, Peter Xu, 2021/01/08