| Message ID | 20170717134238.1966-9-quintela@redhat.com |
|---|---|
| State | New |
| Headers | show |
* Juan Quintela (quintela@redhat.com) wrote: > We need that on posterior patches. following/subsequent/later is probably a better word. other than that; Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com> > Signed-off-by: Juan Quintela <quintela@redhat.com> > --- > migration/migration.c | 16 ++++++++++++++-- > 1 file changed, 14 insertions(+), 2 deletions(-) > > diff --git a/migration/migration.c b/migration/migration.c > index 5a82c1c..b81c498 100644 > --- a/migration/migration.c > +++ b/migration/migration.c > @@ -356,19 +356,31 @@ static void process_incoming_migration_co(void *opaque) > qemu_bh_schedule(mis->bh); > } > > -void migration_fd_process_incoming(QEMUFile *f) > +static void migration_incoming_setup(QEMUFile *f) > { > - Coroutine *co = qemu_coroutine_create(process_incoming_migration_co, f); > + MigrationIncomingState *mis = migration_incoming_get_current(); > > if (multifd_load_setup() != 0) { > /* We haven't been able to create multifd threads > nothing better to do */ > exit(EXIT_FAILURE); > } > + mis->from_src_file = f; > qemu_file_set_blocking(f, false); > +} > + > +static void migration_incoming_process(void) > +{ > + Coroutine *co = qemu_coroutine_create(process_incoming_migration_co, NULL); > qemu_coroutine_enter(co); > } > > +void migration_fd_process_incoming(QEMUFile *f) > +{ > + migration_incoming_setup(f); > + migration_incoming_process(); > +} > + > gboolean migration_ioc_process_incoming(QIOChannel *ioc) > { > MigrationIncomingState *mis = migration_incoming_get_current(); > -- > 2.9.4 > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
On 07/19/2017 12:08 PM, Dr. David Alan Gilbert wrote: > * Juan Quintela (quintela@redhat.com) wrote: >> We need that on posterior patches. > > following/subsequent/later is probably a better word. I'd go with 'later'. Also, s/incomming/incoming/ in the subject
diff --git a/migration/migration.c b/migration/migration.c index 5a82c1c..b81c498 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -356,19 +356,31 @@ static void process_incoming_migration_co(void *opaque) qemu_bh_schedule(mis->bh); } -void migration_fd_process_incoming(QEMUFile *f) +static void migration_incoming_setup(QEMUFile *f) { - Coroutine *co = qemu_coroutine_create(process_incoming_migration_co, f); + MigrationIncomingState *mis = migration_incoming_get_current(); if (multifd_load_setup() != 0) { /* We haven't been able to create multifd threads nothing better to do */ exit(EXIT_FAILURE); } + mis->from_src_file = f; qemu_file_set_blocking(f, false); +} + +static void migration_incoming_process(void) +{ + Coroutine *co = qemu_coroutine_create(process_incoming_migration_co, NULL); qemu_coroutine_enter(co); } +void migration_fd_process_incoming(QEMUFile *f) +{ + migration_incoming_setup(f); + migration_incoming_process(); +} + gboolean migration_ioc_process_incoming(QIOChannel *ioc) { MigrationIncomingState *mis = migration_incoming_get_current();
We need that on posterior patches. Signed-off-by: Juan Quintela <quintela@redhat.com> --- migration/migration.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-)