qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Juan Quintela <quintela@redhat.com>
To: qemu-devel@nongnu.org
Cc: Juan Quintela <quintela@redhat.com>,
	Leonardo Bras <leobras@redhat.com>, Peter Xu <peterx@redhat.com>
Subject: [PATCH 2/5] migration/rdma: simplify ram_control_load_hook()
Date: Thu,  4 May 2023 13:44:40 +0200	[thread overview]
Message-ID: <20230504114443.23891-3-quintela@redhat.com> (raw)
In-Reply-To: <20230504114443.23891-1-quintela@redhat.com>

Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 migration/qemu-file.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/migration/qemu-file.c b/migration/qemu-file.c
index 309b4c56f4..112ba742fd 100644
--- a/migration/qemu-file.c
+++ b/migration/qemu-file.c
@@ -338,10 +338,8 @@ void ram_control_after_iterate(QEMUFile *f, uint64_t flags)
 
 void ram_control_load_hook(QEMUFile *f, uint64_t flags, void *data)
 {
-    int ret = -EINVAL;
-
     if (f->hooks && f->hooks->hook_ram_load) {
-        ret = f->hooks->hook_ram_load(f, flags, data);
+        int ret = f->hooks->hook_ram_load(f, flags, data);
         if (ret < 0) {
             qemu_file_set_error(f, ret);
         }
@@ -351,7 +349,7 @@ void ram_control_load_hook(QEMUFile *f, uint64_t flags, void *data)
          * that expects there to be a hook on the destination.
          */
         if (flags == RAM_CONTROL_HOOK) {
-            qemu_file_set_error(f, ret);
+            qemu_file_set_error(f, -EINVAL);
         }
     }
 }
-- 
2.40.0



  parent reply	other threads:[~2023-05-04 11:46 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-05-04 11:44 [PATCH 0/5] Migration RDMA cleanup Juan Quintela
2023-05-04 11:44 ` [PATCH 1/5] migration: Make RAM_SAVE_FLAG_HOOK a normal case entry Juan Quintela
2023-05-04 17:03   ` Daniel P. Berrangé
2023-05-26 21:09   ` Peter Xu
2023-05-04 11:44 ` Juan Quintela [this message]
2023-05-04 17:03   ` [PATCH 2/5] migration/rdma: simplify ram_control_load_hook() Daniel P. Berrangé
2023-05-26 21:10   ` Peter Xu
2023-05-04 11:44 ` [PATCH 3/5] migration/rdma: We can calculate the rioc from the QEMUFile Juan Quintela
2023-05-04 17:04   ` Daniel P. Berrangé
2023-05-26 21:10   ` Peter Xu
2023-05-04 11:44 ` [PATCH 4/5] migration/rdma: It makes no sense to recive that flag without RDMA Juan Quintela
2023-05-04 17:05   ` Daniel P. Berrangé
2023-05-04 22:53     ` Juan Quintela
2023-05-26 21:15   ` Peter Xu
2023-05-04 11:44 ` [PATCH 5/5] migration/rdma: Check for postcopy sooner Juan Quintela
2023-05-04 17:05   ` Daniel P. Berrangé

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=20230504114443.23891-3-quintela@redhat.com \
    --to=quintela@redhat.com \
    --cc=leobras@redhat.com \
    --cc=peterx@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).