From nobody Mon Feb 9 12:42:38 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=1692949253; cv=none; d=zohomail.com; s=zohoarc; b=Z8MZdVDP5k2JxDjT7+TM+dw5ZlUhre+FG3aPFG8grN152I1F39wh3Y7A/L598Z2Gg/M0RhksLu00GDFemRzB1NDwDk3nSxTr4aGbZU3/+3IC7OwrcOEEaujJWv7P+RU5uhJXgH0ir1fa+3uajflbvxZvGPyhT6dv/ekwGS9J/T8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1692949253; 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=NyUAScDebt38PVmGHi9+i6U3gE9FsBpUlFdOOkNoyH4=; b=C4lGllr8FAX+wrzry6Fo0dmL/9A+QyCJOOlLDJ36mL8cSLj6NNhvNxs+5vp2FEQ/9HC6+92FNkyqEGkWPB4AGB48zSQqPZmDtkCOIZV7r+Y0e/g4iZhqzOXhFGoarNIZYF39Q8sEp5Nw8MXc9KHMwBBX978ap/albpEuRJHXSBU= 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 1692949253477572.938935085392; Fri, 25 Aug 2023 00:40:53 -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-519-MDoapdq3Pl-loy-9NX_4hw-1; Fri, 25 Aug 2023 03:40:49 -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 780601C0CCC2; Fri, 25 Aug 2023 07:40:42 +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 59DE440D283F; Fri, 25 Aug 2023 07:40:42 +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 214701946A43; Fri, 25 Aug 2023 07:40:42 +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 859221946589 for ; Fri, 25 Aug 2023 07:40:40 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 79A722026D76; Fri, 25 Aug 2023 07:40:40 +0000 (UTC) Received: from localhost.localdomain (unknown [10.43.2.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id E2DAB2026FFF for ; Fri, 25 Aug 2023 07:40:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1692949252; 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=NyUAScDebt38PVmGHi9+i6U3gE9FsBpUlFdOOkNoyH4=; b=ZcU1vNgurGhOQbRSFf7uGobMUHibdmTBc7LIsDpfX+eDpXsmUzFIDucyrANEhxj3vuMmms uCPzGjcwfV67/lbCzdWQln5bCT0K2X1ffrgJvrUhSZ3eCOyqjKEKjKKigWnx07Q9V+8+gb AL8rMsqsB8gZ1n05I2Np7BsCJ5XPcAc= X-MC-Unique: MDoapdq3Pl-loy-9NX_4hw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 23/27] vmware: Move error messages onto a single line Date: Fri, 25 Aug 2023 09:40:20 +0200 Message-ID: <5f41236783cab5f8d4adf80bc73cd0f3df07d98f.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.2 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: 1692949254774100003 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/vmware/vmware_conf.c | 9 +++------ src/vmware/vmware_driver.c | 6 ++---- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/src/vmware/vmware_conf.c b/src/vmware/vmware_conf.c index ba4e4d28dc..a598b512dc 100644 --- a/src/vmware/vmware_conf.c +++ b/src/vmware/vmware_conf.c @@ -355,8 +355,7 @@ vmwareVmxPath(virDomainDef *vmdef, char **vmxPath) */ if (vmdef->ndisks < 1) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Domain XML doesn't contain any disks, " - "cannot deduce datastore and path for VMX file")); + _("Domain XML doesn't contain any disks, cannot ded= uce datastore and path for VMX file")); return -1; } =20 @@ -370,16 +369,14 @@ vmwareVmxPath(virDomainDef *vmdef, char **vmxPath) =20 if (disk =3D=3D NULL) { 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")); return -1; } =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")); return -1; } =20 diff --git a/src/vmware/vmware_driver.c b/src/vmware/vmware_driver.c index 259d00cacd..416ce126e8 100644 --- a/src/vmware/vmware_driver.c +++ b/src/vmware/vmware_driver.c @@ -509,8 +509,7 @@ vmwareDomainSuspend(virDomainPtr dom) =20 if (driver->type =3D=3D VMWARE_DRIVER_PLAYER) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("vmplayer does not support libvirt suspend/resume" - " (vmware pause/unpause) operation ")); + _("vmplayer does not support libvirt suspend/resume= (vmware pause/unpause) operation ")); return ret; } =20 @@ -549,8 +548,7 @@ vmwareDomainResume(virDomainPtr dom) =20 if (driver->type =3D=3D VMWARE_DRIVER_PLAYER) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("vmplayer does not support libvirt suspend/resume= " - "(vmware pause/unpause) operation ")); + _("vmplayer does not support libvirt suspend/resume= (vmware pause/unpause) operation ")); return ret; } =20 --=20 2.41.0