[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 02/16] migration/rdma: Don't pass the QIOChannelRDMA as an opaque
From: |
Juan Quintela |
Subject: |
[PULL 02/16] migration/rdma: Don't pass the QIOChannelRDMA as an opaque |
Date: |
Fri, 5 May 2023 02:47:58 +0200 |
We can calculate it from the QEMUFile like the caller.
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20230503131847.11603-6-quintela@redhat.com>
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 7e747b2595..5b82085bd7 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
- [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 <=
- [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, 2023/05/04
- [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