[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 07/16] migration/rdma: simplify ram_control_load_hook()
From: |
Juan Quintela |
Subject: |
[PULL 07/16] migration/rdma: simplify ram_control_load_hook() |
Date: |
Fri, 5 May 2023 02:48:03 +0200 |
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
- [PULL 00/16] Migration 20230505 patches, Juan Quintela, 2023/05/04
- [PULL 01/16] migration: Fix block_bitmap_mapping migration, Juan Quintela, 2023/05/04
- [PULL 03/16] migration: Document all migration_stats, Juan Quintela, 2023/05/04
- [PULL 02/16] migration/rdma: Don't pass the QIOChannelRDMA as an opaque, Juan Quintela, 2023/05/04
- [PULL 05/16] migration: Rename xbzrle_enabled xbzrle_started, Juan Quintela, 2023/05/04
- [PULL 04/16] migration: Put zero_pages in alphabetical order, Juan Quintela, 2023/05/04
- [PULL 06/16] migration: Make RAM_SAVE_FLAG_HOOK a normal case entry, Juan Quintela, 2023/05/04
- [PULL 07/16] migration/rdma: simplify ram_control_load_hook(),
Juan Quintela <=
- [PULL 08/16] migration/rdma: We can calculate the rioc from the QEMUFile, Juan Quintela, 2023/05/04
- [PULL 09/16] migration/rdma: It makes no sense to recive that flag without RDMA, Juan Quintela, 2023/05/04
- [PULL 10/16] migration/rdma: Check for postcopy sooner, Juan Quintela, 2023/05/04
- [PULL 13/16] qemu-file: No need to check for shutdown in qemu_file_rate_limit, Juan Quintela, 2023/05/04
- [PULL 12/16] migration: qemu_file_total_transferred() function is monotonic, Juan Quintela, 2023/05/04
- [PULL 11/16] migration: max_postcopy_bandwidth is a size parameter, Juan Quintela, 2023/05/04
- [PULL 14/16] qemu-file: remove shutdown member, Juan Quintela, 2023/05/04
- [PULL 15/16] qemu-file: Make total_transferred an uint64_t, Juan Quintela, 2023/05/04
- [PULL 16/16] qemu-file: Make ram_control_save_page() use accessors for rate_limit, Juan Quintela, 2023/05/04
- Re: [PULL 00/16] Migration 20230505 patches, Richard Henderson, 2023/05/05