From nobody Mon Feb 9 09:34:11 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=1692949509; cv=none; d=zohomail.com; s=zohoarc; b=Hpb6coB/cWryYfK29EfIm7B2FaUYR+BS7uO6bsdQjCbpgjRmPhMejTZOi2jSegYpxc4pUj0fPdJ1PANgEYROIs3OeY1hz4yrFODi3QN3OF7oYCNLSBpoxVCyRinKZ8n716pda+xVlk9R46JpNHb6yQD6pnr+xg8MbLpbmJhxRgM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1692949509; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=/+a2sg0dnWohM5AZhRfdVIvZ1/qjE9Si//RgbPe7Y00=; b=fNClkyiugekS1IZt/Da1rHizBbh5z75BoWpabCzXMAe703O7X73wEY5Ytg2X+jLawZZNe2iyXraDiarHhzncy5FxgK8k4h599XcuCv/xriXBrF/ZfyAYz/uqfXjZXejDdbPNx5tMFm7JDnRa7sEizjev27/C0di9VF5OTpr4dco= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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.129.124]) by mx.zohomail.com with SMTPS id 16929495093811021.3470855451923; Fri, 25 Aug 2023 00:45:09 -0700 (PDT) Received: from mimecast-mx02.redhat.com (66.187.233.73 [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-323-cqW2eXV2Nku2LxKXxrwplg-1; Fri, 25 Aug 2023 03:40:50 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 501441C07597; Fri, 25 Aug 2023 07:40:33 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3624E2166B27; Fri, 25 Aug 2023 07:40:33 +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 E3A5719465BD; Fri, 25 Aug 2023 07:40:31 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 199F71946589 for ; Fri, 25 Aug 2023 07:40:29 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 09EB92026D2B; Fri, 25 Aug 2023 07:40:29 +0000 (UTC) Received: from localhost.localdomain (unknown [10.43.2.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id A550D2026D76 for ; Fri, 25 Aug 2023 07:40:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1692949508; 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: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=/+a2sg0dnWohM5AZhRfdVIvZ1/qjE9Si//RgbPe7Y00=; b=KRKn11W9Tl6kEPXdLfjrhw6JX7cxPKChLyajw3pRz1t0feadVCbbroOcLQsvF8YK9aNCyv PCFBaukqiFucEmbVnNyoV3ioLqb09TB5/c+aRtoVpFWXuFM6uHnxhcc7D1kZaahXWOb636 APKG0yvDpSeawoSAZBNgflK08iADlGw= X-MC-Unique: cqW2eXV2Nku2LxKXxrwplg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 05/27] esx: Move error messages onto a single line Date: Fri, 25 Aug 2023 09:40:02 +0200 Message-ID: <6c63e8239d5781b004201542027ff83a598f7dda.1692949012.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 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 3.1 on 10.11.54.6 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: 1692949510913100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Error messages are exempt from the 80 columns rule. Move them onto one line. Signed-off-by: Michal Privoznik --- src/esx/esx_driver.c | 21 +++++++-------------- src/esx/esx_network_driver.c | 3 +-- src/esx/esx_storage_backend_vmfs.c | 3 +-- src/esx/esx_util.c | 3 +-- src/esx/esx_vi.c | 19 ++++++------------- src/esx/esx_vi_types.c | 3 +-- 6 files changed, 17 insertions(+), 35 deletions(-) diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index b243bbf411..554fb3e18f 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -2916,8 +2916,7 @@ esxDomainDefineXMLFlags(virConnectPtr conn, const cha= r *xml, unsigned int flags) if (virtualMachine) { /* FIXME */ virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Domain already exists, editing existing domains = is not " - "supported yet")); + _("Domain already exists, editing existing domains = is not supported yet")); goto cleanup; } =20 @@ -2952,8 +2951,7 @@ esxDomainDefineXMLFlags(virConnectPtr conn, const cha= r *xml, unsigned int flags) */ if (def->ndisks < 1) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Domain XML doesn't contain any disks, cannot ded= uce " - "datastore and path for VMX file")); + _("Domain XML doesn't contain any disks, cannot ded= uce datastore and path for VMX file")); goto cleanup; } =20 @@ -2967,16 +2965,14 @@ esxDomainDefineXMLFlags(virConnectPtr conn, const c= har *xml, unsigned int flags) =20 if (!disk) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Domain XML doesn't contain any file-based harddi= sks, " - "cannot deduce datastore and path for VMX file")); + _("Domain XML doesn't contain any file-based harddi= sks, cannot deduce datastore and path for VMX file")); goto cleanup; } =20 src =3D virDomainDiskGetSource(disk); if (!src) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("First file-based harddisk has no source, cannot = deduce " - "datastore and path for VMX file")); + _("First file-based harddisk has no source, cannot = deduce datastore and path for VMX file")); goto cleanup; } =20 @@ -3241,8 +3237,7 @@ esxDomainSetAutostart(virDomainPtr domain, int autost= art) powerInfo =3D powerInfo->_next) { if (STRNEQ(powerInfo->key->value, virtualMachine->obj->val= ue)) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", - _("Cannot enable general autostart opti= on " - "without affecting other domains")); + _("Cannot enable general autostart opti= on without affecting other domains")); goto cleanup; } } @@ -3685,8 +3680,7 @@ esxDomainMigratePerform(virDomainPtr domain, =20 if (STRCASENEQ(priv->vCenter->ipAddress, parsedUri->server)) { virReportError(VIR_ERR_INVALID_ARG, "%s", - _("Migration source and destination have to refer t= o " - "the same vCenter")); + _("Migration source and destination have to refer t= o the same vCenter")); goto cleanup; } =20 @@ -3734,8 +3728,7 @@ esxDomainMigratePerform(virDomainPtr domain, eventList->fullFormattedMessage); } else { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Could not migrate domain, validation reporte= d a " - "problem")); + _("Could not migrate domain, validation reporte= d a problem")); } =20 goto cleanup; diff --git a/src/esx/esx_network_driver.c b/src/esx/esx_network_driver.c index 273147af40..1ee4d6c34f 100644 --- a/src/esx/esx_network_driver.c +++ b/src/esx/esx_network_driver.c @@ -311,8 +311,7 @@ esxNetworkDefineXMLFlags(virConnectPtr conn, const char= *xml, if (hostVirtualSwitch) { /* FIXME */ virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("HostVirtualSwitch already exists, editing existi= ng " - "ones is not supported yet")); + _("HostVirtualSwitch already exists, editing existi= ng ones is not supported yet")); goto cleanup; } =20 diff --git a/src/esx/esx_storage_backend_vmfs.c b/src/esx/esx_storage_backe= nd_vmfs.c index 7c5df1c9cd..145aff0c9c 100644 --- a/src/esx/esx_storage_backend_vmfs.c +++ b/src/esx/esx_storage_backend_vmfs.c @@ -726,8 +726,7 @@ esxStorageVolLookupByKey(virConnectPtr conn, const char= *key) =20 if (!priv->primary->hasQueryVirtualDiskUuid) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("QueryVirtualDiskUuid not available, " - "cannot lookup storage volume by UUID")); + _("QueryVirtualDiskUuid not available, cannot looku= p storage volume by UUID")); return NULL; } =20 diff --git a/src/esx/esx_util.c b/src/esx/esx_util.c index 785701a518..cb9638f360 100644 --- a/src/esx/esx_util.c +++ b/src/esx/esx_util.c @@ -119,8 +119,7 @@ esxUtil_ParseUri(esxUtil_ParsedUri **parsedUri, virURI = *uri) if ((tmp =3D strchr((*parsedUri)->proxy_hostname, ':'))) { if (tmp =3D=3D (*parsedUri)->proxy_hostname) { virReportError(VIR_ERR_INVALID_ARG, "%s", - _("Query parameter 'proxy' doesn't cont= ain a " - "hostname")); + _("Query parameter 'proxy' doesn't cont= ain a hostname")); goto cleanup; } =20 diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index 122e5bed2e..3ecd406e1d 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -253,8 +253,7 @@ esxVI_CURL_Perform(esxVI_CURL *curl, const char *url) =20 if (responseCode < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("curl_easy_getinfo(CURLINFO_RESPONSE_CODE) return= ed a " - "negative response code")); + _("curl_easy_getinfo(CURLINFO_RESPONSE_CODE) return= ed a negative response code")); return -1; } =20 @@ -674,15 +673,13 @@ esxVI_MultiCURL_Remove(esxVI_MultiCURL *multi, esxVI_= CURL *curl) { if (!curl->handle) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Cannot remove uninitialized CURL handle from a " - "multi handle")); + _("Cannot remove uninitialized CURL handle from a m= ulti handle")); return -1; } =20 if (!curl->multi) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Cannot remove CURL handle from a multi handle wh= en it " - "wasn't added before")); + _("Cannot remove CURL handle from a multi handle wh= en it wasn't added before")); return -1; } =20 @@ -1909,8 +1906,7 @@ esxVI_EnsureSession(esxVI_Context *ctx) } } else if (STRNEQ(ctx->session->key, currentSession->key)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Key of the current session differs from the key = at " - "last login")); + _("Key of the current session differs from the key = at last login")); goto cleanup; } =20 @@ -4220,13 +4216,10 @@ esxVI_WaitForTaskCompletion(esxVI_Context *ctx, =20 if (taskInfo->cancelable =3D=3D esxVI_Boolean_True) { if (esxVI_CancelTask(ctx, task) < 0 && blocked) { - VIR_ERROR(_("Cancelable task is blocked by an " - "unanswered question but cancellation= " - "failed")); + VIR_ERROR(_("Cancelable task is blocked by an unan= swered question but cancellation failed")); } } else if (blocked) { - VIR_ERROR(_("Non-cancelable task is blocked by an " - "unanswered question")); + VIR_ERROR(_("Non-cancelable task is blocked by an unan= swered question")); } =20 /* FIXME: Enable error reporting here again */ diff --git a/src/esx/esx_vi_types.c b/src/esx/esx_vi_types.c index 96c131f618..9386727fcf 100644 --- a/src/esx/esx_vi_types.c +++ b/src/esx/esx_vi_types.c @@ -1444,8 +1444,7 @@ esxVI_DateTime_Deserialize(xmlNodePtr node, esxVI_Dat= eTime **dateTime) =20 if (!(*dateTime)->value) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("XML node doesn't contain text, expecting an " - "xsd:dateTime value")); + _("XML node doesn't contain text, expecting an xsd:= dateTime value")); goto failure; } =20 --=20 2.41.0