| Message ID | 1612339311-114805-12-git-send-email-zhengchuan@huawei.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Support Multifd for RDMA migration | expand |
* Chuan Zheng (zhengchuan@huawei.com) wrote: > Signed-off-by: Chuan Zheng <zhengchuan@huawei.com> > --- > migration/migration.c | 1 + > migration/migration.h | 3 +++ > migration/rdma.c | 3 +++ > 3 files changed, 7 insertions(+) > > diff --git a/migration/migration.c b/migration/migration.c > index 129c81a..b8f4844 100644 > --- a/migration/migration.c > +++ b/migration/migration.c > @@ -1925,6 +1925,7 @@ void migrate_init(MigrationState *s) > s->postcopy_after_devices = false; > s->migration_thread_running = false; > s->enabled_rdma_migration = false; > + s->host_port = NULL; > error_free(s->error); > s->error = NULL; > s->hostname = NULL; > diff --git a/migration/migration.h b/migration/migration.h > index da5681b..537ee09 100644 > --- a/migration/migration.h > +++ b/migration/migration.h > @@ -285,6 +285,9 @@ struct MigrationState { > * Enable RDMA migration > */ > bool enabled_rdma_migration; > + > + /* Need by Multi-RDMA */ > + char *host_port; Please keep that next to the char *hostname, since they go together. Also, 'Needed' Dave > }; > > void migrate_set_state(int *state, int old_state, int new_state); > diff --git a/migration/rdma.c b/migration/rdma.c > index ed8a015..9654b87 100644 > --- a/migration/rdma.c > +++ b/migration/rdma.c > @@ -4206,6 +4206,8 @@ void rdma_start_outgoing_migration(void *opaque, > goto err; > } > > + s->host_port = g_strdup(host_port); > + > ret = qemu_rdma_source_init(rdma, > s->enabled_capabilities[MIGRATION_CAPABILITY_RDMA_PIN_ALL], errp); > > @@ -4250,6 +4252,7 @@ void rdma_start_outgoing_migration(void *opaque, > > s->to_dst_file = qemu_fopen_rdma(rdma, "wb"); > migrate_fd_connect(s, NULL); > + g_free(s->host_port); > return; > return_path_err: > qemu_rdma_cleanup(rdma); > -- > 1.8.3.1 >
On 2021/2/4 3:04, Dr. David Alan Gilbert wrote: > * Chuan Zheng (zhengchuan@huawei.com) wrote: >> Signed-off-by: Chuan Zheng <zhengchuan@huawei.com> >> --- >> migration/migration.c | 1 + >> migration/migration.h | 3 +++ >> migration/rdma.c | 3 +++ >> 3 files changed, 7 insertions(+) >> >> diff --git a/migration/migration.c b/migration/migration.c >> index 129c81a..b8f4844 100644 >> --- a/migration/migration.c >> +++ b/migration/migration.c >> @@ -1925,6 +1925,7 @@ void migrate_init(MigrationState *s) >> s->postcopy_after_devices = false; >> s->migration_thread_running = false; >> s->enabled_rdma_migration = false; >> + s->host_port = NULL; >> error_free(s->error); >> s->error = NULL; >> s->hostname = NULL; >> diff --git a/migration/migration.h b/migration/migration.h >> index da5681b..537ee09 100644 >> --- a/migration/migration.h >> +++ b/migration/migration.h >> @@ -285,6 +285,9 @@ struct MigrationState { >> * Enable RDMA migration >> */ >> bool enabled_rdma_migration; >> + >> + /* Need by Multi-RDMA */ >> + char *host_port; > > Please keep that next to the char *hostname, since they go together. > Also, 'Needed' > > Dave > OK, will fix it in V5. >> }; >> >> void migrate_set_state(int *state, int old_state, int new_state); >> diff --git a/migration/rdma.c b/migration/rdma.c >> index ed8a015..9654b87 100644 >> --- a/migration/rdma.c >> +++ b/migration/rdma.c >> @@ -4206,6 +4206,8 @@ void rdma_start_outgoing_migration(void *opaque, >> goto err; >> } >> >> + s->host_port = g_strdup(host_port); >> + >> ret = qemu_rdma_source_init(rdma, >> s->enabled_capabilities[MIGRATION_CAPABILITY_RDMA_PIN_ALL], errp); >> >> @@ -4250,6 +4252,7 @@ void rdma_start_outgoing_migration(void *opaque, >> >> s->to_dst_file = qemu_fopen_rdma(rdma, "wb"); >> migrate_fd_connect(s, NULL); >> + g_free(s->host_port); >> return; >> return_path_err: >> qemu_rdma_cleanup(rdma); >> -- >> 1.8.3.1 >>
diff --git a/migration/migration.c b/migration/migration.c index 129c81a..b8f4844 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -1925,6 +1925,7 @@ void migrate_init(MigrationState *s) s->postcopy_after_devices = false; s->migration_thread_running = false; s->enabled_rdma_migration = false; + s->host_port = NULL; error_free(s->error); s->error = NULL; s->hostname = NULL; diff --git a/migration/migration.h b/migration/migration.h index da5681b..537ee09 100644 --- a/migration/migration.h +++ b/migration/migration.h @@ -285,6 +285,9 @@ struct MigrationState { * Enable RDMA migration */ bool enabled_rdma_migration; + + /* Need by Multi-RDMA */ + char *host_port; }; void migrate_set_state(int *state, int old_state, int new_state); diff --git a/migration/rdma.c b/migration/rdma.c index ed8a015..9654b87 100644 --- a/migration/rdma.c +++ b/migration/rdma.c @@ -4206,6 +4206,8 @@ void rdma_start_outgoing_migration(void *opaque, goto err; } + s->host_port = g_strdup(host_port); + ret = qemu_rdma_source_init(rdma, s->enabled_capabilities[MIGRATION_CAPABILITY_RDMA_PIN_ALL], errp); @@ -4250,6 +4252,7 @@ void rdma_start_outgoing_migration(void *opaque, s->to_dst_file = qemu_fopen_rdma(rdma, "wb"); migrate_fd_connect(s, NULL); + g_free(s->host_port); return; return_path_err: qemu_rdma_cleanup(rdma);
Signed-off-by: Chuan Zheng <zhengchuan@huawei.com> --- migration/migration.c | 1 + migration/migration.h | 3 +++ migration/rdma.c | 3 +++ 3 files changed, 7 insertions(+)