| Message ID | 20191218050439.5989-3-quintela@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Fix multifd + cancel + multifd | expand |
* Juan Quintela (quintela@redhat.com) wrote: > Signed-off-by: Juan Quintela <quintela@redhat.com> Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com> I wonder if the fflush's should happen anyway? > --- > migration/ram.c | 22 +++++++++++++--------- > 1 file changed, 13 insertions(+), 9 deletions(-) > > diff --git a/migration/ram.c b/migration/ram.c > index db90237977..4b44578e57 100644 > --- a/migration/ram.c > +++ b/migration/ram.c > @@ -4132,7 +4132,7 @@ static int ram_save_iterate(QEMUFile *f, void *opaque) > { > RAMState **temp = opaque; > RAMState *rs = *temp; > - int ret; > + int ret = 0; > int i; > int64_t t0; > int done = 0; > @@ -4203,12 +4203,14 @@ static int ram_save_iterate(QEMUFile *f, void *opaque) > ram_control_after_iterate(f, RAM_CONTROL_ROUND); > > out: > - multifd_send_sync_main(rs); > - qemu_put_be64(f, RAM_SAVE_FLAG_EOS); > - qemu_fflush(f); > - ram_counters.transferred += 8; > + if (ret >= 0) { > + multifd_send_sync_main(rs); > + qemu_put_be64(f, RAM_SAVE_FLAG_EOS); > + qemu_fflush(f); > + ram_counters.transferred += 8; > > - ret = qemu_file_get_error(f); > + ret = qemu_file_get_error(f); > + } > if (ret < 0) { > return ret; > } > @@ -4260,9 +4262,11 @@ static int ram_save_complete(QEMUFile *f, void *opaque) > ram_control_after_iterate(f, RAM_CONTROL_FINISH); > } > > - multifd_send_sync_main(rs); > - qemu_put_be64(f, RAM_SAVE_FLAG_EOS); > - qemu_fflush(f); > + if (ret >= 0) { > + multifd_send_sync_main(rs); > + qemu_put_be64(f, RAM_SAVE_FLAG_EOS); > + qemu_fflush(f); > + } > > return ret; > } > -- > 2.23.0 > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
"Dr. David Alan Gilbert" <dgilbert@redhat.com> wrote: > * Juan Quintela (quintela@redhat.com) wrote: >> Signed-off-by: Juan Quintela <quintela@redhat.com> > > Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com> > > I wonder if the fflush's should happen anyway? No, that is the problem that I am really trying to fix. We tried to do a write() after we knew that we have closed it (due to error or cancel). And we get a nice error message on the screen: Unable to write to socket() And everybody gets scared about that message. When we really know that we don't want it. In an ideal world, we would just remove ->last_error() and make every function return errors and check return codes. But this is qemu. This is migration. And we don't do it. Sniff.
diff --git a/migration/ram.c b/migration/ram.c index db90237977..4b44578e57 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -4132,7 +4132,7 @@ static int ram_save_iterate(QEMUFile *f, void *opaque) { RAMState **temp = opaque; RAMState *rs = *temp; - int ret; + int ret = 0; int i; int64_t t0; int done = 0; @@ -4203,12 +4203,14 @@ static int ram_save_iterate(QEMUFile *f, void *opaque) ram_control_after_iterate(f, RAM_CONTROL_ROUND); out: - multifd_send_sync_main(rs); - qemu_put_be64(f, RAM_SAVE_FLAG_EOS); - qemu_fflush(f); - ram_counters.transferred += 8; + if (ret >= 0) { + multifd_send_sync_main(rs); + qemu_put_be64(f, RAM_SAVE_FLAG_EOS); + qemu_fflush(f); + ram_counters.transferred += 8; - ret = qemu_file_get_error(f); + ret = qemu_file_get_error(f); + } if (ret < 0) { return ret; } @@ -4260,9 +4262,11 @@ static int ram_save_complete(QEMUFile *f, void *opaque) ram_control_after_iterate(f, RAM_CONTROL_FINISH); } - multifd_send_sync_main(rs); - qemu_put_be64(f, RAM_SAVE_FLAG_EOS); - qemu_fflush(f); + if (ret >= 0) { + multifd_send_sync_main(rs); + qemu_put_be64(f, RAM_SAVE_FLAG_EOS); + qemu_fflush(f); + } return ret; }
Signed-off-by: Juan Quintela <quintela@redhat.com> --- migration/ram.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-)