From nobody Sun Feb 8 18:24:28 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1544028484822303.61922105658937; Wed, 5 Dec 2018 08:48:04 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 75E1E307CDDA; Wed, 5 Dec 2018 16:48:02 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3EF1A5D756; Wed, 5 Dec 2018 16:48:02 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id D85423F6E4; Wed, 5 Dec 2018 16:48:01 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id wB5Gm0Cj028426 for ; Wed, 5 Dec 2018 11:48:00 -0500 Received: by smtp.corp.redhat.com (Postfix) id 2EA5D5DA60; Wed, 5 Dec 2018 16:48:00 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.229]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8094B5D96F; Wed, 5 Dec 2018 16:47:59 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Wed, 5 Dec 2018 17:47:44 +0100 Message-Id: <13c03bc3f9c9dd464b4600cc582aff255d9ed67f.1544028281.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com Cc: Peter Krempa Subject: [libvirt] [PATCH 03/10] util: error: Add error message versions with info for some error codes X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.49]); Wed, 05 Dec 2018 16:48:03 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Few error codes were missing the version of the message with additional info. In case of the modified messages it's not very likely they'll ever report any additional data, but for the sake of consistency we'll provide them. Signed-off-by: Peter Krempa Reviewed-by: Erik Skultety --- src/util/virerror.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/util/virerror.c b/src/util/virerror.c index 5d515bde57..64be00dc75 100644 --- a/src/util/virerror.c +++ b/src/util/virerror.c @@ -926,7 +926,10 @@ virErrorMsg(virErrorNumber error, const char *info) errmsg =3D _("internal error"); break; case VIR_ERR_NO_MEMORY: - errmsg =3D _("out of memory"); + if (info =3D=3D NULL) + errmsg =3D _("out of memory"); + else + errmsg =3D _("out of memory: %s"); break; case VIR_ERR_NO_SUPPORT: if (info =3D=3D NULL) @@ -1019,7 +1022,10 @@ virErrorMsg(virErrorNumber error, const char *info) errmsg =3D _("unknown OS type %s"); break; case VIR_ERR_NO_KERNEL: - errmsg =3D _("missing kernel information"); + if (info =3D=3D NULL) + errmsg =3D _("missing kernel information"); + else + errmsg =3D _("missing kernel information: %s"); break; case VIR_ERR_NO_ROOT: if (info =3D=3D NULL) @@ -1472,7 +1478,10 @@ virErrorMsg(virErrorNumber error, const char *info) errmsg =3D _("XML document failed to validate against sche= ma: %s"); break; case VIR_ERR_MIGRATE_FINISH_OK: - errmsg =3D _("migration successfully aborted"); + if (info =3D=3D NULL) + errmsg =3D _("migration successfully aborted"); + else + errmsg =3D _("migration successfully aborted: %s"); break; case VIR_ERR_NO_SERVER: if (info =3D=3D NULL) --=20 2.19.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list