External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

qemu: Don't give up on first error in qemuMigrationCancelDriverMirror

Browse Source 
When cancelling drive mirror, always try to do that for all disks even
if it fails for some of them. Report the first error we saw.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
This commit is contained in:
Jiri Denemark 2015-05-11 20:15:43 +02:00
parent 5139924b8d
commit a692277873
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/qemu/qemu_migration.c
View File

@ -1862,6 +1862,8 @@ static int
qemuMigrationCancelDriveMirror(virQEMUDriverPtr driver,
virDomainObjPtr vm)
{
virErrorPtr err = NULL;
int ret = 0;
size_t i;
for (i = 0; i < vm->def->ndisks; i++) {
@ -1871,13 +1873,20 @@ qemuMigrationCancelDriveMirror(virQEMUDriverPtr driver,
if (!diskPriv->migrating || !diskPriv->blockJobSync)
continue;
if (qemuMigrationCancelOneDriveMirror(driver, vm, disk) < 0)
return -1;
if (qemuMigrationCancelOneDriveMirror(driver, vm, disk) < 0) {
ret = -1;
if (!err)
err = virSaveLastError();
}
diskPriv->migrating = false;
}
return 0;
if (err) {
virSetError(err);
virFreeError(err);
}
return ret;
}