All of lore.kernel.org
 help / color / mirror / Atom feed
From: Peter Xu <peterx@redhat.com>
To: qemu-devel@nongnu.org
Cc: Paolo Bonzini <pbonzini@redhat.com>,
	"Dr . David Alan Gilbert" <dgilbert@redhat.com>,
	peterx@redhat.com
Subject: [PATCH RFC v2 1/9] KVM: Fixup kvm_log_clear_one_slot() ioctl return check
Date: Tue, 28 Apr 2020 15:56:59 -0400	[thread overview]
Message-ID: <20200428195707.11980-2-peterx@redhat.com> (raw)
In-Reply-To: <20200428195707.11980-1-peterx@redhat.com>

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>
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 e1c87fa4e1..1f1fd5316e 100644
--- a/accel/kvm/kvm-all.c
+++ b/accel/kvm/kvm-all.c
@@ -698,14 +698,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.24.1



  reply	other threads:[~2020-04-28 20:00 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-04-28 19:56 [PATCH RFC v2 0/9] KVM: Dirty ring support (QEMU part) Peter Xu
2020-04-28 19:56 ` Peter Xu [this message]
2020-04-28 19:57 ` [PATCH RFC v2 2/9] linux-headers: Update Peter Xu
2020-04-28 20:05 ` [PATCH RFC v2 3/9] memory: Introduce log_sync_global() to memory listener Peter Xu
2020-04-28 20:05 ` [PATCH RFC v2 4/9] KVM: Create the KVMSlot dirty bitmap on flag changes Peter Xu
2020-04-28 20:05 ` [PATCH RFC v2 5/9] KVM: Provide helper to get kvm dirty log Peter Xu
2020-04-28 20:05 ` [PATCH RFC v2 6/9] KVM: Provide helper to sync dirty bitmap from slot to ramblock Peter Xu
2020-04-28 20:05 ` [PATCH RFC v2 7/9] KVM: Cache kvm slot dirty bitmap size Peter Xu
2020-04-28 20:05 ` [PATCH RFC v2 8/9] KVM: Add dirty-gfn-count property Peter Xu
2020-04-28 20:05 ` [PATCH RFC v2 9/9] KVM: Dirty ring support Peter Xu
2020-04-28 20:20   ` Peter Xu

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200428195707.11980-2-peterx@redhat.com \
    --to=peterx@redhat.com \
    --cc=dgilbert@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.