SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

multifd: Make sure that we don't do any IO after an error

Browse Source 
Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
This commit is contained in:
Juan Quintela 2019-12-18 05:12:36 +01:00
parent 334d15d504
commit 3d4095b222
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
migration/ram.c
View File

@ -3445,7 +3445,7 @@ static int ram_save_iterate(QEMUFile *f, void *opaque)
{ {
RAMState **temp = opaque; RAMState **temp = opaque;
RAMState *rs = *temp; RAMState *rs = *temp;
int ret; int ret = 0;
int i; int i;
int64_t t0; int64_t t0;
int done = 0; int done = 0;
@ -3524,12 +3524,14 @@ static int ram_save_iterate(QEMUFile *f, void *opaque)
ram_control_after_iterate(f, RAM_CONTROL_ROUND); ram_control_after_iterate(f, RAM_CONTROL_ROUND);
out: out:
if (ret >= 0) {
multifd_send_sync_main(rs); multifd_send_sync_main(rs);
qemu_put_be64(f, RAM_SAVE_FLAG_EOS); qemu_put_be64(f, RAM_SAVE_FLAG_EOS);
qemu_fflush(f); qemu_fflush(f);
ram_counters.transferred += 8; ram_counters.transferred += 8;
ret = qemu_file_get_error(f); ret = qemu_file_get_error(f);
}
if (ret < 0) { if (ret < 0) {
return ret; return ret;
} }
@ -3581,9 +3583,11 @@ static int ram_save_complete(QEMUFile *f, void *opaque)
ram_control_after_iterate(f, RAM_CONTROL_FINISH); ram_control_after_iterate(f, RAM_CONTROL_FINISH);
} }
if (ret >= 0) {
multifd_send_sync_main(rs); multifd_send_sync_main(rs);
qemu_put_be64(f, RAM_SAVE_FLAG_EOS); qemu_put_be64(f, RAM_SAVE_FLAG_EOS);
qemu_fflush(f); qemu_fflush(f);
}
return ret; return ret;
} }