From: Juan Quintela <quintela@redhat.com>
To: qemu-devel@nongnu.org
Cc: Juan Quintela <quintela@redhat.com>, Peter Xu <peterx@redhat.com>,
Leonardo Bras <leobras@redhat.com>
Subject: [PATCH 09/19] migration/rdma: simplify ram_control_load_hook()
Date: Thu, 27 Apr 2023 18:34:39 +0200 [thread overview]
Message-ID: <20230427163449.27473-10-quintela@redhat.com> (raw)
In-Reply-To: <20230427163449.27473-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 22af45a5db..9b5e14a2ef 100644
--- a/migration/qemu-file.c
+++ b/migration/qemu-file.c
@@ -317,10 +317,8 @@ void qemu_fflush(QEMUFile *f)
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);
}
@@ -330,7 +328,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
next prev parent reply other threads:[~2023-04-27 16:35 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-27 16:34 [PATCH 00/19] migration: Remove QEMUFileHooks Juan Quintela
2023-04-27 16:34 ` [PATCH 01/19] multifd: We already account for this packet on the multifd thread Juan Quintela
2023-04-27 18:23 ` Lukas Straub
2023-04-27 16:34 ` [PATCH 02/19] migration: Move ram_stats to its own file migration-stats.[ch] Juan Quintela
2023-04-27 18:30 ` Lukas Straub
2023-04-27 16:34 ` [PATCH 03/19] migration: Rename ram_counters to mig_stats Juan Quintela
2023-04-27 18:31 ` Lukas Straub
2023-04-27 16:34 ` [PATCH 04/19] migration: Rename RAMStats to MigrationAtomicStats Juan Quintela
2023-04-27 18:58 ` Lukas Straub
2023-04-27 16:34 ` [PATCH 05/19] migration/rdma: Split the zero page case from acct_update_position Juan Quintela
2023-04-27 18:59 ` Lukas Straub
2023-04-27 16:34 ` [PATCH 06/19] migration/rdma: Unfold last user of acct_update_position() Juan Quintela
2023-04-27 19:01 ` Lukas Straub
2023-04-27 16:34 ` [PATCH 07/19] migration/rdma: Unflod ram_control_before_iterate() Juan Quintela
2023-04-28 9:06 ` Juan Quintela
2023-04-27 16:34 ` [PATCH 08/19] migration/rdma: Unflod ram_control_after_iterate() Juan Quintela
2023-04-27 16:34 ` Juan Quintela [this message]
2023-04-27 16:34 ` [PATCH 10/19] migration/rdma: Don't pass the QIOChannelRDMA as an opaque Juan Quintela
2023-04-27 16:34 ` [PATCH 11/19] migration/rdma: We can calculate the rioc from the QEMUFile Juan Quintela
2023-04-27 16:34 ` [PATCH 12/19] migration/rdma: It makes no sense to recive that flag without RDMA Juan Quintela
2023-04-27 16:34 ` [PATCH 13/19] migration: Make RAM_SAVE_FLAG_HOOK a normal case entry Juan Quintela
2023-04-27 16:34 ` [PATCH 14/19] migration/rdma: Remove all uses of RAM_CONTROL_HOOK Juan Quintela
2023-04-27 16:34 ` [PATCH 15/19] migration/rdma: Unfold hook_ram_load() Juan Quintela
2023-04-27 16:34 ` [PATCH 16/19] migration/rdma: Make ram_control_save_page() use exported interfaces Juan Quintela
2023-04-27 16:34 ` [PATCH 17/19] migration/rdma: Create rdma_control_save_page() Juan Quintela
2023-04-27 16:34 ` [PATCH 18/19] qemu-file: Remove QEMUFileHooks Juan Quintela
2023-04-27 16:34 ` [PATCH 19/19] migration/rdma: Move rdma constants from qemu-file.h to rdma.h Juan Quintela
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=20230427163449.27473-10-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).