From nobody Mon Feb 9 01:21:46 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1654675945; cv=none; d=zohomail.com; s=zohoarc; b=kpcosD3NTHZFCflp08ucmC3gGmbyO+4uq0iuUcftwQLEWFtEKaiXtpaIvsSj7eK7RvlyTARmO9r4DLNIRQiuGhTwre/oMmYtEB+Z99U5zZegpZ71F7Mb47ys9Q3LT7Wtc4Pp0U+NfI2DKU8PjsnMnQy/MiHawIC2PMPyXXVmRII= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1654675945; h=Content-Type:Content-Transfer-Encoding:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=XZqBSLnPcxHcBArVF/gf9g2bR0SUkztrz/OxQcbjx84=; b=Rbfv1AxrJfL83NnKQat7BC7N856lJWiNeb+TeOA/T9HxUuMoUGsOjIEnCVLly7X0HwC+ZI6Y21I3Vcvgs/M5184reVxJ+z7VNEK0y7dnDjbb8IHq3DB2SFyFT7ttGmMCAej93OzHKFqclnTyhh3/YPvaD2m32hYjobWHwdDluMg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1654675945463749.0213902756815; Wed, 8 Jun 2022 01:12:25 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-398-DXsVh1qnPriTBglycrswTQ-1; Wed, 08 Jun 2022 04:12:16 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E1CF1801755; Wed, 8 Jun 2022 08:12:14 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id DBD5340D2962; Wed, 8 Jun 2022 08:12:12 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 9D5AE194704C; Wed, 8 Jun 2022 08:12:12 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id F39391947042 for ; Wed, 8 Jun 2022 08:12:11 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id E258A492CA3; Wed, 8 Jun 2022 08:12:11 +0000 (UTC) Received: from virval.usersys.redhat.com (unknown [10.43.2.227]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C2AE6492C3B for ; Wed, 8 Jun 2022 08:12:11 +0000 (UTC) Received: by virval.usersys.redhat.com (Postfix, from userid 500) id B398A2404DD; Wed, 8 Jun 2022 10:12:10 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1654675944; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=XZqBSLnPcxHcBArVF/gf9g2bR0SUkztrz/OxQcbjx84=; b=eXfZvLnwSyJZCPKOiVDrB3ptMUV06Bgj2+S+IwwhRWDaS4PqoIJA3sZoyewznMY7TWzl4r 6lr9amYp2cSx/XFlRpZMh1RCXHZkyfSPEk7O7RCuZvpsdFAPxJuQQN6ww5WzD+7T3ogzY1 qqcxSn5n8JHVDxpy20na73nIM1VXJEU= X-MC-Unique: DXsVh1qnPriTBglycrswTQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Jiri Denemark To: libvir-list@redhat.com Subject: [libvirt PATCH] qemu: Improve error messages using qemuMigrationJobName Date: Wed, 8 Jun 2022 10:12:08 +0200 Message-Id: <820556f8cf7cbaffcbada927ba769b432b6ed383.1654675928.git.jdenemar@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.9 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.84 on 10.11.54.2 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1654675946429100001 Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: Martin Kletzander --- src/qemu/qemu_migration.c | 52 ++++++++++++++++++++++----------------- 1 file changed, 30 insertions(+), 22 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 341395ac6d..849c25b168 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1847,24 +1847,23 @@ qemuMigrationJobName(virDomainObj *vm) =20 switch (priv->job.asyncJob) { case VIR_ASYNC_JOB_MIGRATION_OUT: - return _("migration out job"); + return _("migration out"); case VIR_ASYNC_JOB_SAVE: - return _("domain save job"); + return _("domain save"); case VIR_ASYNC_JOB_DUMP: - return _("domain core dump job"); - case VIR_ASYNC_JOB_NONE: - return _("undefined"); + return _("domain core dump"); case VIR_ASYNC_JOB_MIGRATION_IN: - return _("migration in job"); + return _("migration in"); case VIR_ASYNC_JOB_SNAPSHOT: - return _("snapshot job"); + return _("snapshot"); case VIR_ASYNC_JOB_START: - return _("start job"); + return _("start"); case VIR_ASYNC_JOB_BACKUP: - return _("backup job"); + return _("backup"); + case VIR_ASYNC_JOB_NONE: case VIR_ASYNC_JOB_LAST: default: - return _("job"); + return _("undefined"); } } =20 @@ -1888,25 +1887,33 @@ qemuMigrationJobCheckStatus(virQEMUDriver *driver, =20 switch (jobData->status) { case VIR_DOMAIN_JOB_STATUS_NONE: - virReportError(VIR_ERR_OPERATION_FAILED, _("%s: %s"), - qemuMigrationJobName(vm), _("is not active")); + virReportError(VIR_ERR_OPERATION_FAILED, + _("job '%s' is not active"), + qemuMigrationJobName(vm)); return -1; =20 case VIR_DOMAIN_JOB_STATUS_FAILED: - virReportError(VIR_ERR_OPERATION_FAILED, _("%s: %s"), - qemuMigrationJobName(vm), - error ? error : _("unexpectedly failed")); + if (error) { + virReportError(VIR_ERR_OPERATION_FAILED, + _("job '%s' failed: %s"), + qemuMigrationJobName(vm), error); + } else { + virReportError(VIR_ERR_OPERATION_FAILED, + _("job '%s' unexpectedly failed"), + qemuMigrationJobName(vm)); + } return -1; =20 case VIR_DOMAIN_JOB_STATUS_CANCELED: - virReportError(VIR_ERR_OPERATION_ABORTED, _("%s: %s"), - qemuMigrationJobName(vm), _("canceled by client")); + virReportError(VIR_ERR_OPERATION_ABORTED, + _("job '%s' canceled by client"), + qemuMigrationJobName(vm)); return -1; =20 case VIR_DOMAIN_JOB_STATUS_POSTCOPY_PAUSED: - virReportError(VIR_ERR_OPERATION_FAILED, _("%s: %s"), - qemuMigrationJobName(vm), - _("post-copy phase failed")); + virReportError(VIR_ERR_OPERATION_FAILED, + _("job '%s' failed in post-copy phase"), + qemuMigrationJobName(vm)); return -1; =20 case VIR_DOMAIN_JOB_STATUS_COMPLETED: @@ -1959,8 +1966,9 @@ qemuMigrationAnyCompleted(virQEMUDriver *driver, if (flags & QEMU_MIGRATION_COMPLETED_ABORT_ON_ERROR && virDomainObjGetState(vm, &pauseReason) =3D=3D VIR_DOMAIN_PAUSED && pauseReason =3D=3D VIR_DOMAIN_PAUSED_IOERROR) { - virReportError(VIR_ERR_OPERATION_FAILED, _("%s: %s"), - qemuMigrationJobName(vm), _("failed due to I/O erro= r")); + virReportError(VIR_ERR_OPERATION_FAILED, + _("job '%s' failed due to I/O error"), + qemuMigrationJobName(vm)); goto error; } =20 --=20 2.35.1