qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Juan Quintela <quintela@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Eric Blake" <eblake@redhat.com>,
	"Vladimir Sementsov-Ogievskiy" <vsementsov@yandex-team.ru>,
	"Stefan Hajnoczi" <stefanha@redhat.com>,
	"John Snow" <jsnow@redhat.com>,
	"Juan Quintela" <quintela@redhat.com>,
	qemu-block@nongnu.org, "Leonardo Bras" <leobras@redhat.com>,
	"Fam Zheng" <fam@euphon.net>, "Peter Xu" <peterx@redhat.com>,
	"Daniel P . Berrangé" <berrange@redhat.com>
Subject: [PULL 07/16] migration/rdma: simplify ram_control_load_hook()
Date: Fri,  5 May 2023 02:48:03 +0200	[thread overview]
Message-ID: <20230505004812.31583-8-quintela@redhat.com> (raw)
In-Reply-To: <20230505004812.31583-1-quintela@redhat.com>

Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20230504114443.23891-3-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 ee04240a21..b7afc8d498 100644
--- a/migration/qemu-file.c
+++ b/migration/qemu-file.c
@@ -340,10 +340,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);
         }
@@ -353,7 +351,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-05  0:52 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-05-05  0:47 [PULL 00/16] Migration 20230505 patches Juan Quintela
2023-05-05  0:47 ` [PULL 01/16] migration: Fix block_bitmap_mapping migration Juan Quintela
2023-05-05  0:47 ` [PULL 02/16] migration/rdma: Don't pass the QIOChannelRDMA as an opaque Juan Quintela
2023-05-05  0:47 ` [PULL 03/16] migration: Document all migration_stats Juan Quintela
2023-05-05  0:48 ` [PULL 04/16] migration: Put zero_pages in alphabetical order Juan Quintela
2023-05-05  0:48 ` [PULL 05/16] migration: Rename xbzrle_enabled xbzrle_started Juan Quintela
2023-05-05  0:48 ` [PULL 06/16] migration: Make RAM_SAVE_FLAG_HOOK a normal case entry Juan Quintela
2023-05-05  0:48 ` Juan Quintela [this message]
2023-05-05  0:48 ` [PULL 08/16] migration/rdma: We can calculate the rioc from the QEMUFile Juan Quintela
2023-05-05  0:48 ` [PULL 09/16] migration/rdma: It makes no sense to recive that flag without RDMA Juan Quintela
2023-05-05  0:48 ` [PULL 10/16] migration/rdma: Check for postcopy sooner Juan Quintela
2023-05-05  0:48 ` [PULL 11/16] migration: max_postcopy_bandwidth is a size parameter Juan Quintela
2023-05-05  0:48 ` [PULL 12/16] migration: qemu_file_total_transferred() function is monotonic Juan Quintela
2023-05-05  0:48 ` [PULL 13/16] qemu-file: No need to check for shutdown in qemu_file_rate_limit Juan Quintela
2023-05-05  0:48 ` [PULL 14/16] qemu-file: remove shutdown member Juan Quintela
2023-05-05  0:48 ` [PULL 15/16] qemu-file: Make total_transferred an uint64_t Juan Quintela
2023-05-05  0:48 ` [PULL 16/16] qemu-file: Make ram_control_save_page() use accessors for rate_limit Juan Quintela
2023-05-05 21:18 ` [PULL 00/16] Migration 20230505 patches Richard Henderson

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=20230505004812.31583-8-quintela@redhat.com \
    --to=quintela@redhat.com \
    --cc=berrange@redhat.com \
    --cc=eblake@redhat.com \
    --cc=fam@euphon.net \
    --cc=jsnow@redhat.com \
    --cc=leobras@redhat.com \
    --cc=peterx@redhat.com \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=stefanha@redhat.com \
    --cc=vsementsov@yandex-team.ru \
    /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).