| Message ID | 20200123115831.36842-7-quintela@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | Multifd Migration Compression | expand |
* Juan Quintela (quintela@redhat.com) wrote: > If we do a cancel, we got out without one error, but we can't do the > rest of the output as in a normal situation. > > Signed-off-by: Juan Quintela <quintela@redhat.com> I think it's the sync that's the main problem being avoided here rather than actually the problem of sending the data. Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com> > --- > migration/ram.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/migration/ram.c b/migration/ram.c > index f95d656c26..3fd7fdffcf 100644 > --- a/migration/ram.c > +++ b/migration/ram.c > @@ -3524,7 +3524,8 @@ static int ram_save_iterate(QEMUFile *f, void *opaque) > ram_control_after_iterate(f, RAM_CONTROL_ROUND); > > out: > - if (ret >= 0) { > + if (ret >= 0 > + && migration_is_setup_or_active(migrate_get_current()->state)) { > multifd_send_sync_main(rs); > qemu_put_be64(f, RAM_SAVE_FLAG_EOS); > qemu_fflush(f); > -- > 2.24.1 > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
diff --git a/migration/ram.c b/migration/ram.c index f95d656c26..3fd7fdffcf 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -3524,7 +3524,8 @@ static int ram_save_iterate(QEMUFile *f, void *opaque) ram_control_after_iterate(f, RAM_CONTROL_ROUND); out: - if (ret >= 0) { + if (ret >= 0 + && migration_is_setup_or_active(migrate_get_current()->state)) { multifd_send_sync_main(rs); qemu_put_be64(f, RAM_SAVE_FLAG_EOS); qemu_fflush(f);
If we do a cancel, we got out without one error, but we can't do the rest of the output as in a normal situation. Signed-off-by: Juan Quintela <quintela@redhat.com> --- migration/ram.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)