Skip to content

Commit

Permalink
migration/rdma: Don't pass the QIOChannelRDMA as an opaque
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Juan Quintela committed May 4, 2023
1 parent 3cba22c commit 3ec6828
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions migration/rdma.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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;
Expand Down Expand Up @@ -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 */
Expand Down

0 comments on commit 3ec6828

Please sign in to comment.