mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

migration: push qemu_savevm_state_cancel out of qemu_savevm_state_*

Browse Source 
This is useful, because it lets us keep the cancellation callbacks
inside the big lock while pushing the others out.

Reviewed-by: Orit Wasserman <owasserm@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
This commit is contained in:
Paolo Bonzini 2013-02-22 17:36:10 +01:00 committed by Juan Quintela
parent 7a2c17216c
commit 04943ebaa9
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
savevm.c
View File

@ -1621,17 +1621,11 @@ int qemu_savevm_state_begin(QEMUFile *f,
ret = se->ops->save_live_setup(f, se->opaque); ret = se->ops->save_live_setup(f, se->opaque);
if (ret < 0) { if (ret < 0) {
qemu_savevm_state_cancel();
return ret; return ret;
} }
} }
ret = qemu_file_get_error(f); ret = qemu_file_get_error(f);
if (ret != 0) {
qemu_savevm_state_cancel();
}
return ret; return ret;
} }
/* /*
@ -1677,9 +1671,6 @@ int qemu_savevm_state_iterate(QEMUFile *f)
return ret; return ret;
} }
ret = qemu_file_get_error(f); ret = qemu_file_get_error(f);
if (ret != 0) {
qemu_savevm_state_cancel();
}
return ret; return ret;
} }
@ -1778,8 +1769,7 @@ static int qemu_savevm_state(QEMUFile *f)
}; };
if (qemu_savevm_state_blocked(NULL)) { if (qemu_savevm_state_blocked(NULL)) {
ret = -EINVAL; return -EINVAL;
goto out;
} }
ret = qemu_savevm_state_begin(f, &params); ret = qemu_savevm_state_begin(f, &params);
@ -1798,6 +1788,9 @@ out:
if (ret == 0) { if (ret == 0) {
ret = qemu_file_get_error(f); ret = qemu_file_get_error(f);
} }
if (ret != 0) {
qemu_savevm_state_cancel();
}
return ret; return ret;
} }