ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

migration/rdma: Don't pass the QIOChannelRDMA as an opaque 

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>
This commit is contained in:
Juan Quintela 2023-05-03 15:18:36 +02:00
parent 3cba22c9ad
commit 3ec6828a79
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
migration/rdma.c
View File

@ -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. * 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), RDMAControlHeader reg_resp = { .len = sizeof(RDMARegisterResult),
.type = RDMA_CONTROL_REGISTER_RESULT, .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, RDMAControlHeader blocks = { .type = RDMA_CONTROL_RAM_BLOCKS_RESULT,
.repeat = 1 }; .repeat = 1 };
QIOChannelRDMA *rioc = QIO_CHANNEL_RDMA(opaque); QIOChannelRDMA *rioc = QIO_CHANNEL_RDMA(qemu_file_get_ioc(f));
RDMAContext *rdma; RDMAContext *rdma;
RDMALocalBlocks *local; RDMALocalBlocks *local;
RDMAControlHeader head; 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); return rdma_block_notification_handle(rioc, data);
case RAM_CONTROL_HOOK: case RAM_CONTROL_HOOK:
return qemu_rdma_registration_handle(f, rioc); return qemu_rdma_registration_handle(f);
default: default:
/* Shouldn't be called with any other values */ /* Shouldn't be called with any other values */