On Tue, May 30, 2023 at 08:25:24PM +0200, Juan Quintela wrote: > Once there: > - Remove unused data parameter > - unfold it in its callers > - change all callers to call qemu_rdma_registration_stop() > > Reviewed-by: Peter Xu <pet...@redhat.com> > Signed-off-by: Juan Quintela <quint...@redhat.com> > Message-Id: <20230509120700.78359-4-quint...@redhat.com> > --- > migration/qemu-file.h | 2 -- > migration/rdma.h | 3 +++ > migration/qemu-file.c | 12 ------------ > migration/ram.c | 17 ++++++++++++++--- > migration/rdma.c | 6 ++---- > 5 files changed, 19 insertions(+), 21 deletions(-) >
> diff --git a/migration/rdma.c b/migration/rdma.c > index 6ca89ff090..8001dcb960 100644 > --- a/migration/rdma.c > +++ b/migration/rdma.c > @@ -3891,15 +3891,14 @@ int qemu_rdma_registration_start(QEMUFile *f, > uint64_t flags) > * Inform dest that dynamic registrations are done for now. > * First, flush writes, if any. > */ > -static int qemu_rdma_registration_stop(QEMUFile *f, > - uint64_t flags, void *data) > +int qemu_rdma_registration_stop(QEMUFile *f, uint64_t flags) > { > QIOChannelRDMA *rioc = QIO_CHANNEL_RDMA(qemu_file_get_ioc(f)); Again casting to a QIOChannelRDMA.... > RDMAContext *rdma; > RDMAControlHeader head = { .len = 0, .repeat = 1 }; > int ret = 0; > > - if (migration_in_postcopy()) { > + if (!migrate_rdma() || migration_in_postcopy()) { ...before checking if this is actually an RDMA migration With regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|