[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 10/19] migration/rdma: Don't pass the QIOChannelRDMA as an opaque
From: |
Juan Quintela |
Subject: |
[PATCH 10/19] migration/rdma: Don't pass the QIOChannelRDMA as an opaque |
Date: |
Thu, 27 Apr 2023 18:34:40 +0200 |
We can calculate it from the QEMUFile like the caller.
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
migration/rdma.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/migration/rdma.c b/migration/rdma.c
index 77bbe3da36..40b8e2da51 100644
--- a/migration/rdma.c
+++ b/migration/rdma.c
@@ -3527,7 +3527,7 @@ static int dest_ram_sort_func(const void *a, const void
*b)
*
* Keep doing this until the source tells us to stop.
*/
-static int qemu_rdma_registration_handle(QEMUFile *f, void *opaque)
+static int qemu_rdma_registration_handle(QEMUFile *f)
{
RDMAControlHeader reg_resp = { .len = sizeof(RDMARegisterResult),
.type = RDMA_CONTROL_REGISTER_RESULT,
@@ -3539,7 +3539,7 @@ static int qemu_rdma_registration_handle(QEMUFile *f,
void *opaque)
};
RDMAControlHeader blocks = { .type = RDMA_CONTROL_RAM_BLOCKS_RESULT,
.repeat = 1 };
- QIOChannelRDMA *rioc = QIO_CHANNEL_RDMA(opaque);
+ QIOChannelRDMA *rioc = QIO_CHANNEL_RDMA(qemu_file_get_ioc(f));
RDMAContext *rdma;
RDMALocalBlocks *local;
RDMAControlHeader head;
@@ -3852,7 +3852,7 @@ static int rdma_load_hook(QEMUFile *f, uint64_t flags,
void *data)
return rdma_block_notification_handle(rioc, data);
case RAM_CONTROL_HOOK:
- return qemu_rdma_registration_handle(f, rioc);
+ return qemu_rdma_registration_handle(f);
default:
/* Shouldn't be called with any other values */
--
2.40.0
- [PATCH 09/19] migration/rdma: simplify ram_control_load_hook(), (continued)
- [PATCH 09/19] migration/rdma: simplify ram_control_load_hook(), Juan Quintela, 2023/04/27
- [PATCH 13/19] migration: Make RAM_SAVE_FLAG_HOOK a normal case entry, Juan Quintela, 2023/04/27
- [PATCH 14/19] migration/rdma: Remove all uses of RAM_CONTROL_HOOK, Juan Quintela, 2023/04/27
- [PATCH 17/19] migration/rdma: Create rdma_control_save_page(), Juan Quintela, 2023/04/27
- [PATCH 19/19] migration/rdma: Move rdma constants from qemu-file.h to rdma.h, Juan Quintela, 2023/04/27
- [PATCH 11/19] migration/rdma: We can calculate the rioc from the QEMUFile, Juan Quintela, 2023/04/27
- [PATCH 03/19] migration: Rename ram_counters to mig_stats, Juan Quintela, 2023/04/27
- [PATCH 18/19] qemu-file: Remove QEMUFileHooks, Juan Quintela, 2023/04/27
- [PATCH 16/19] migration/rdma: Make ram_control_save_page() use exported interfaces, Juan Quintela, 2023/04/27
- [PATCH 10/19] migration/rdma: Don't pass the QIOChannelRDMA as an opaque,
Juan Quintela <=
- [PATCH 15/19] migration/rdma: Unfold hook_ram_load(), Juan Quintela, 2023/04/27
- [PATCH 08/19] migration/rdma: Unflod ram_control_after_iterate(), Juan Quintela, 2023/04/27