david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

migration: Make failed migration load set file error

Browse Source 
If an error occurs in a section load, set the file error flag
so that the transport can get notified to do a cleanup.

Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Michael R. Hines <michael@hinespot.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
This commit is contained in:
Dr. David Alan Gilbert 2016-09-23 20:14:03 +01:00 committed by Juan Quintela
parent 12c67ffb1f
commit ccb783c312
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
migration/savevm.c
View File

@ -1828,40 +1828,45 @@ qemu_loadvm_section_part_end(QEMUFile *f, MigrationIncomingState *mis)
static int qemu_loadvm_state_main(QEMUFile *f, MigrationIncomingState *mis) static int qemu_loadvm_state_main(QEMUFile *f, MigrationIncomingState *mis)
{ {
uint8_t section_type; uint8_t section_type;
int ret; int ret = 0;
while ((section_type = qemu_get_byte(f)) != QEMU_VM_EOF) { while ((section_type = qemu_get_byte(f)) != QEMU_VM_EOF) {
ret = 0;
trace_qemu_loadvm_state_section(section_type); trace_qemu_loadvm_state_section(section_type);
switch (section_type) { switch (section_type) {
case QEMU_VM_SECTION_START: case QEMU_VM_SECTION_START:
case QEMU_VM_SECTION_FULL: case QEMU_VM_SECTION_FULL:
ret = qemu_loadvm_section_start_full(f, mis); ret = qemu_loadvm_section_start_full(f, mis);
if (ret < 0) { if (ret < 0) {
return ret; goto out;
} }
break; break;
case QEMU_VM_SECTION_PART: case QEMU_VM_SECTION_PART:
case QEMU_VM_SECTION_END: case QEMU_VM_SECTION_END:
ret = qemu_loadvm_section_part_end(f, mis); ret = qemu_loadvm_section_part_end(f, mis);
if (ret < 0) { if (ret < 0) {
return ret; goto out;
} }
break; break;
case QEMU_VM_COMMAND: case QEMU_VM_COMMAND:
ret = loadvm_process_command(f); ret = loadvm_process_command(f);
trace_qemu_loadvm_state_section_command(ret); trace_qemu_loadvm_state_section_command(ret);
if ((ret < 0) || (ret & LOADVM_QUIT)) { if ((ret < 0) || (ret & LOADVM_QUIT)) {
return ret; goto out;
} }
break; break;
default: default:
error_report("Unknown savevm section type %d", section_type); error_report("Unknown savevm section type %d", section_type);
return -EINVAL; ret = -EINVAL;
goto out;
} }
} }
return 0; out:
if (ret < 0) {
qemu_file_set_error(f, ret);
}
return ret;
} }
int qemu_loadvm_state(QEMUFile *f) int qemu_loadvm_state(QEMUFile *f)