openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

virsh: be consistent with style of loop exit 

When waiting for a block job, the various statuses (COMPLETED, READY,
CANCELED, etc.) should all be treated consistently by having the loop be
exited with "break". Use "goto cleanup" for the error cases only, when
no block job status is available.

Signed-off-by: Michael Chapman <mike@very.puzzling.org>
This commit is contained in:
Michael Chapman 2016-01-27 13:24:52 +11:00 committed by Peter Krempa
parent 704dfd6b0f
commit 15dee2ef24
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tools/virsh-domain.c
View File

@ -1876,21 +1876,23 @@ virshBlockJobWait(virshBlockJobWaitDataPtr data)
* the waiting loop */ * the waiting loop */
if ((data->cb_id >= 0 || data->cb_id2 >= 0) && data->status != -1) { if ((data->cb_id >= 0 || data->cb_id2 >= 0) && data->status != -1) {
ret = data->status; ret = data->status;
goto cleanup; break;
} }
/* since virsh can't guarantee that the path provided by the user will /* since virsh can't guarantee that the path provided by the user will
* later be matched in the event we will need to keep the fallback * later be matched in the event we will need to keep the fallback
* approach and claim success if the block job finishes or vanishes. */ * approach and claim success if the block job finishes or vanishes. */
if (result == 0) if (result == 0) {
ret = VIR_DOMAIN_BLOCK_JOB_COMPLETED;
break; break;
}
/* for two-phase jobs we will try to wait in the synchronized phase /* for two-phase jobs we will try to wait in the synchronized phase
* for event arrival since 100% completion doesn't necessarily mean that * for event arrival since 100% completion doesn't necessarily mean that
* the block job has finished and can be terminated with success */ * the block job has finished and can be terminated with success */
if (info.end == info.cur && --retries == 0) { if (info.end == info.cur && --retries == 0) {
ret = VIR_DOMAIN_BLOCK_JOB_READY; ret = VIR_DOMAIN_BLOCK_JOB_READY;
goto cleanup; break;
} }
if (data->verbose && (info.cur != last.cur || info.end != last.end)) if (data->verbose && (info.cur != last.cur || info.end != last.end))
@ -1911,21 +1913,19 @@ virshBlockJobWait(virshBlockJobWaitDataPtr data)
} }
ret = VIR_DOMAIN_BLOCK_JOB_CANCELED; ret = VIR_DOMAIN_BLOCK_JOB_CANCELED;
goto cleanup; break;
} }
usleep(500 * 1000); usleep(500 * 1000);
} }
ret = VIR_DOMAIN_BLOCK_JOB_COMPLETED;
cleanup:
/* print 100% completed */ /* print 100% completed */
if (data->verbose && if (data->verbose &&
(ret == VIR_DOMAIN_BLOCK_JOB_COMPLETED || (ret == VIR_DOMAIN_BLOCK_JOB_COMPLETED ||
ret == VIR_DOMAIN_BLOCK_JOB_READY)) ret == VIR_DOMAIN_BLOCK_JOB_READY))
virshPrintJobProgress(data->job_name, 0, 1); virshPrintJobProgress(data->job_name, 0, 1);
cleanup:
sigaction(SIGINT, &old_sig_action, NULL); sigaction(SIGINT, &old_sig_action, NULL);
return ret; return ret;
} }