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

qemu: Improve error messages using qemuMigrationJobName

Browse Source 
They were constructed from two separate strings using "%s: %s", which
is ugly and does not work well with translations.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: Martin Kletzander <mkletzan@redhat.com>
This commit is contained in:
Jiri Denemark 2022-06-08 10:05:38 +02:00
parent 87257c76b9
commit 4582267782
1 changed files with 30 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/qemu/qemu_migration.c
View File

@ -1847,24 +1847,23 @@ qemuMigrationJobName(virDomainObj *vm)
switch (priv->job.asyncJob) { switch (priv->job.asyncJob) {
case VIR_ASYNC_JOB_MIGRATION_OUT: case VIR_ASYNC_JOB_MIGRATION_OUT:
return _("migration out job"); return _("migration out");
case VIR_ASYNC_JOB_SAVE: case VIR_ASYNC_JOB_SAVE:
return _("domain save job"); return _("domain save");
case VIR_ASYNC_JOB_DUMP: case VIR_ASYNC_JOB_DUMP:
return _("domain core dump job"); return _("domain core dump");
case VIR_ASYNC_JOB_NONE:
return _("undefined");
case VIR_ASYNC_JOB_MIGRATION_IN: case VIR_ASYNC_JOB_MIGRATION_IN:
return _("migration in job"); return _("migration in");
case VIR_ASYNC_JOB_SNAPSHOT: case VIR_ASYNC_JOB_SNAPSHOT:
return _("snapshot job"); return _("snapshot");
case VIR_ASYNC_JOB_START: case VIR_ASYNC_JOB_START:
return _("start job"); return _("start");
case VIR_ASYNC_JOB_BACKUP: case VIR_ASYNC_JOB_BACKUP:
return _("backup job"); return _("backup");
case VIR_ASYNC_JOB_NONE:
case VIR_ASYNC_JOB_LAST: case VIR_ASYNC_JOB_LAST:
default: default:
return _("job"); return _("undefined");
} }
} }
@ -1888,25 +1887,33 @@ qemuMigrationJobCheckStatus(virQEMUDriver *driver,
switch (jobData->status) { switch (jobData->status) {
case VIR_DOMAIN_JOB_STATUS_NONE: case VIR_DOMAIN_JOB_STATUS_NONE:
virReportError(VIR_ERR_OPERATION_FAILED, _("%s: %s"), virReportError(VIR_ERR_OPERATION_FAILED,
qemuMigrationJobName(vm), _("is not active")); _("job '%s' is not active"),
qemuMigrationJobName(vm));
return -1; return -1;
case VIR_DOMAIN_JOB_STATUS_FAILED: case VIR_DOMAIN_JOB_STATUS_FAILED:
virReportError(VIR_ERR_OPERATION_FAILED, _("%s: %s"), if (error) {
qemuMigrationJobName(vm), virReportError(VIR_ERR_OPERATION_FAILED,
error ? error : _("unexpectedly failed")); _("job '%s' failed: %s"),
qemuMigrationJobName(vm), error);
} else {
virReportError(VIR_ERR_OPERATION_FAILED,
_("job '%s' unexpectedly failed"),
qemuMigrationJobName(vm));
}
return -1; return -1;
case VIR_DOMAIN_JOB_STATUS_CANCELED: case VIR_DOMAIN_JOB_STATUS_CANCELED:
virReportError(VIR_ERR_OPERATION_ABORTED, _("%s: %s"), virReportError(VIR_ERR_OPERATION_ABORTED,
qemuMigrationJobName(vm), _("canceled by client")); _("job '%s' canceled by client"),
qemuMigrationJobName(vm));
return -1; return -1;
case VIR_DOMAIN_JOB_STATUS_POSTCOPY_PAUSED: case VIR_DOMAIN_JOB_STATUS_POSTCOPY_PAUSED:
virReportError(VIR_ERR_OPERATION_FAILED, _("%s: %s"), virReportError(VIR_ERR_OPERATION_FAILED,
qemuMigrationJobName(vm), _("job '%s' failed in post-copy phase"),
_("post-copy phase failed")); qemuMigrationJobName(vm));
return -1; return -1;
case VIR_DOMAIN_JOB_STATUS_COMPLETED: case VIR_DOMAIN_JOB_STATUS_COMPLETED:
@ -1959,8 +1966,9 @@ qemuMigrationAnyCompleted(virQEMUDriver *driver,
if (flags & QEMU_MIGRATION_COMPLETED_ABORT_ON_ERROR && if (flags & QEMU_MIGRATION_COMPLETED_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, _("%s: %s"), virReportError(VIR_ERR_OPERATION_FAILED,
qemuMigrationJobName(vm), _("failed due to I/O error")); _("job '%s' failed due to I/O error"),
qemuMigrationJobName(vm));
goto error; goto error;
} }