| Message ID | 20200116154616.11569-2-quintela@redhat.com |
|---|---|
| State | New |
| 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> > --- > migration/ram.c | 22 +++++++++++++--------- > 1 file changed, 13 insertions(+), 9 deletions(-) > > diff --git a/migration/ram.c b/migration/ram.c > index ba6e0eea15..8f9f3bba5b 100644 > --- a/migration/ram.c > +++ b/migration/ram.c > @@ -3442,7 +3442,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; > @@ -3521,12 +3521,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; > } > @@ -3578,9 +3580,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.24.1 > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
diff --git a/migration/ram.c b/migration/ram.c index ba6e0eea15..8f9f3bba5b 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -3442,7 +3442,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; @@ -3521,12 +3521,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; } @@ -3578,9 +3580,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(-)