From nobody Mon Feb 9 11:06:29 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=1692949563; cv=none; d=zohomail.com; s=zohoarc; b=lMX0OZ7jfRCI5QYevEf0skwp7XVAQ9wW+q9zrWWjeDbQL7QCq9NJN4RlQ/I2jAb9eJXH+FpNC4i0zurNxhmZFRAfYmwQFulUR8iDrRGDCM/xw1NsV7vrF+ErFxOC2aCkRN8xO7z8rNpCV4DnO+EOt9vCxYJ2kYXvUf4px4+tLmM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1692949563; 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=8wWT2x5txO9wFJMgZMU+chHil0R3WWwOgwesqC+pSiY=; b=Bid4xehh46o7/urg1gVlQOlHrMS1epbg8mOo2w/cif+U/sxZ9+eF0bDbwm3nftHCtspBXJ3wCpeIlaZIQi5/eyeIKkJyhsQt1nPwC7KILxfwpAoQzPbdFC7uWjgC41AYD1JPNlZbI/+/irZ/fXIL5ExLCv9iy69nsw8BCCa9Fvg= 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 1692949563625335.26038678449095; Fri, 25 Aug 2023 00:46:03 -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-597-7kBvx0e3Nyiwho0CUf49nA-1; Fri, 25 Aug 2023 03:40:53 -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 9036280CD80; Fri, 25 Aug 2023 07:40:43 +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 3CC2740C6F53; Fri, 25 Aug 2023 07:40:43 +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 ABC081946A4E; 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 308A819465B1 for ; Fri, 25 Aug 2023 07:40:41 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 13E872026D68; Fri, 25 Aug 2023 07:40:41 +0000 (UTC) Received: from localhost.localdomain (unknown [10.43.2.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id B05CB2026D33 for ; Fri, 25 Aug 2023 07:40:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1692949562; 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=8wWT2x5txO9wFJMgZMU+chHil0R3WWwOgwesqC+pSiY=; b=Abst+MJ8YzsxBhZ2OgUfTIIfbktfeqSRYBuTcGGnHBWDXiwBqihfUkLM5wsnE2qBCKI60S I2ABzN/8LjNLbBgDBmk+AM8CTXICs3RJMrQbQy3bf2Y+4SxgSA4Wt1vdZb3wZrgYXCj2UT g132o069DS4N+NBFxafYNgXJ5gM209g= X-MC-Unique: 7kBvx0e3Nyiwho0CUf49nA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 24/27] vmx: Move error messages onto a single line Date: Fri, 25 Aug 2023 09:40:21 +0200 Message-ID: <1b253d512181bbdd41eb68816bc6726260515ec7.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: 1692949565147100001 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/vmx/vmx.c | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index 5c6925be22..26b89776e1 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -938,8 +938,7 @@ virVMXSCSIDiskNameToControllerAndUnit(const char *name,= int *controller, int *un =20 if (! STRPREFIX(name, "sd")) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Expecting domain XML attribute 'dev' of entry " - "'devices/disk/target' to start with 'sd'")); + _("Expecting domain XML attribute 'dev' of entry 'd= evices/disk/target' to start with 'sd'")); return -1; } =20 @@ -977,8 +976,7 @@ virVMXIDEDiskNameToBusAndUnit(const char *name, int *bu= s, int *unit) =20 if (! STRPREFIX(name, "hd")) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Expecting domain XML attribute 'dev' of entry " - "'devices/disk/target' to start with 'hd'")); + _("Expecting domain XML attribute 'dev' of entry 'd= evices/disk/target' to start with 'hd'")); return -1; } =20 @@ -1012,8 +1010,7 @@ virVMXFloppyDiskNameToUnit(const char *name, int *uni= t) =20 if (! STRPREFIX(name, "fd")) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Expecting domain XML attribute 'dev' of entry " - "'devices/disk/target' to start with 'fd'")); + _("Expecting domain XML attribute 'dev' of entry 'd= evices/disk/target' to start with 'fd'")); return -1; } =20 @@ -1505,8 +1502,7 @@ virVMXParseConfig(virVMXContext *ctx, if (def->description !=3D NULL) { if (virVMXUnescapeHexPipe(def->description) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("VMX entry 'annotation' contains invalid esca= pe " - "sequence")); + _("VMX entry 'annotation' contains invalid esca= pe sequence")); goto cleanup; } } @@ -1583,8 +1579,7 @@ virVMXParseConfig(virVMXContext *ctx, cpu->sockets =3D numvcpus / coresPerSocket; if (cpu->sockets <=3D 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("VMX entry 'cpuid.coresPerSocket' smaller tha= n " - "'numvcpus'")); + _("VMX entry 'cpuid.coresPerSocket' smaller tha= n 'numvcpus'")); goto cleanup; } cpu->dies =3D 1; @@ -3348,15 +3343,13 @@ virVMXFormatConfig(virVMXContext *ctx, virDomainXML= Option *xmlopt, virDomainDef /* def:maxvcpus -> vmx:numvcpus */ if (virDomainDefHasVcpusOffline(def)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("No support for domain XML entry 'vcpu' attribute= " - "'current'")); + _("No support for domain XML entry 'vcpu' attribute= 'current'")); goto cleanup; } maxvcpus =3D virDomainDefGetVcpusMax(def); if (maxvcpus =3D=3D 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Expecting domain XML entry 'vcpu' to be greater " - "than 0")); + _("Expecting domain XML entry 'vcpu' to be greater = than 0")); goto cleanup; } =20 --=20 2.41.0