External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-04 10:55:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Don't pass redundant job name around

Browse Source 
Instead of passing current job name to several functions which already
know what the current job is we can generate the name where we actually
need to use it.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
This commit is contained in:
Jiri Denemark 2015-05-28 11:17:17 +02:00
parent c1a7f199e8
commit 92b5bcccaa
1 changed files with 28 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/qemu/qemu_migration.c
View File

@ -2494,6 +2494,24 @@ qemuMigrationFetchJobStatus(virQEMUDriverPtr driver,
} }
static const char *
qemuMigrationJobName(virDomainObjPtr vm)
{
qemuDomainObjPrivatePtr priv = vm->privateData;
switch (priv->job.asyncJob) {
case QEMU_ASYNC_JOB_MIGRATION_OUT:
return _("migration job");
case QEMU_ASYNC_JOB_SAVE:
return _("domain save job");
case QEMU_ASYNC_JOB_DUMP:
return _("domain core dump job");
default:
return _("job");
}
}
static int static int
qemuMigrationUpdateJobStatus(virQEMUDriverPtr driver, qemuMigrationUpdateJobStatus(virQEMUDriverPtr driver,
virDomainObjPtr vm, virDomainObjPtr vm,
@ -2514,7 +2532,6 @@ qemuMigrationUpdateJobStatus(virQEMUDriverPtr driver,
static int static int
qemuMigrationCheckJobStatus(virQEMUDriverPtr driver, qemuMigrationCheckJobStatus(virQEMUDriverPtr driver,
virDomainObjPtr vm, virDomainObjPtr vm,
const char *job,
qemuDomainAsyncJob asyncJob) qemuDomainAsyncJob asyncJob)
{ {
qemuDomainObjPrivatePtr priv = vm->privateData; qemuDomainObjPrivatePtr priv = vm->privateData;
@ -2525,18 +2542,18 @@ qemuMigrationCheckJobStatus(virQEMUDriverPtr driver,
switch (jobInfo->type) { switch (jobInfo->type) {
case VIR_DOMAIN_JOB_NONE: case VIR_DOMAIN_JOB_NONE:
virReportError(VIR_ERR_OPERATION_FAILED, virReportError(VIR_ERR_OPERATION_FAILED, _("%s: %s"),
_("%s: %s"), job, _("is not active")); qemuMigrationJobName(vm), _("is not active"));
return -1; return -1;
case VIR_DOMAIN_JOB_FAILED: case VIR_DOMAIN_JOB_FAILED:
virReportError(VIR_ERR_OPERATION_FAILED, virReportError(VIR_ERR_OPERATION_FAILED, _("%s: %s"),
_("%s: %s"), job, _("unexpectedly failed")); qemuMigrationJobName(vm), _("unexpectedly failed"));
return -1; return -1;
case VIR_DOMAIN_JOB_CANCELLED: case VIR_DOMAIN_JOB_CANCELLED:
virReportError(VIR_ERR_OPERATION_ABORTED, virReportError(VIR_ERR_OPERATION_ABORTED, _("%s: %s"),
_("%s: %s"), job, _("canceled by client")); qemuMigrationJobName(vm), _("canceled by client"));
return -1; return -1;
case VIR_DOMAIN_JOB_BOUNDED: case VIR_DOMAIN_JOB_BOUNDED:
@ -2562,31 +2579,16 @@ qemuMigrationWaitForCompletion(virQEMUDriverPtr driver,
{ {
qemuDomainObjPrivatePtr priv = vm->privateData; qemuDomainObjPrivatePtr priv = vm->privateData;
qemuDomainJobInfoPtr jobInfo = priv->job.current; qemuDomainJobInfoPtr jobInfo = priv->job.current;
const char *job;
int pauseReason; int pauseReason;
int ret = -1; int ret = -1;
switch (priv->job.asyncJob) {
case QEMU_ASYNC_JOB_MIGRATION_OUT:
job = _("migration job");
break;
case QEMU_ASYNC_JOB_SAVE:
job = _("domain save job");
break;
case QEMU_ASYNC_JOB_DUMP:
job = _("domain core dump job");
break;
default:
job = _("job");
}
jobInfo->type = VIR_DOMAIN_JOB_UNBOUNDED; jobInfo->type = VIR_DOMAIN_JOB_UNBOUNDED;
while (jobInfo->type == VIR_DOMAIN_JOB_UNBOUNDED) { while (jobInfo->type == VIR_DOMAIN_JOB_UNBOUNDED) {
/* Poll every 50ms for progress & to allow cancellation */ /* Poll every 50ms for progress & to allow cancellation */
struct timespec ts = { .tv_sec = 0, .tv_nsec = 50 * 1000 * 1000ull }; struct timespec ts = { .tv_sec = 0, .tv_nsec = 50 * 1000 * 1000ull };
if (qemuMigrationCheckJobStatus(driver, vm, job, asyncJob) < 0) if (qemuMigrationCheckJobStatus(driver, vm, asyncJob) < 0)
goto error; goto error;
if (storage && if (storage &&
@ -2597,8 +2599,8 @@ qemuMigrationWaitForCompletion(virQEMUDriverPtr driver,
if (abort_on_error && if (abort_on_error &&
virDomainObjGetState(vm, &pauseReason) == VIR_DOMAIN_PAUSED && virDomainObjGetState(vm, &pauseReason) == VIR_DOMAIN_PAUSED &&
pauseReason == VIR_DOMAIN_PAUSED_IOERROR) { pauseReason == VIR_DOMAIN_PAUSED_IOERROR) {
virReportError(VIR_ERR_OPERATION_FAILED, virReportError(VIR_ERR_OPERATION_FAILED, _("%s: %s"),
_("%s: %s"), job, _("failed due to I/O error")); qemuMigrationJobName(vm), _("failed due to I/O error"));
goto error; goto error;
} }
@ -4251,7 +4253,7 @@ qemuMigrationRun(virQEMUDriverPtr driver,
* rather failed later on. Check its status before waiting for a * rather failed later on. Check its status before waiting for a
* connection from qemu which may never be initiated. * connection from qemu which may never be initiated.
*/ */
if (qemuMigrationCheckJobStatus(driver, vm, _("migration job"), if (qemuMigrationCheckJobStatus(driver, vm,
QEMU_ASYNC_JOB_MIGRATION_OUT) < 0) QEMU_ASYNC_JOB_MIGRATION_OUT) < 0)
goto cancel; goto cancel;