From nobody Mon Feb 9 07:06:01 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=1661516418; cv=none; d=zohomail.com; s=zohoarc; b=cwsqYj7oN1RVM477eGhnqLYF0XIFxIuu7R6x/yt+ozltiK0Q0K/QDE17LRMIJ3UL9VexqcbMJbUuS6/ZrHwXsQ7t/JjDl86B6wZSzUNM8CRcgq2gAzi1K2dOz40uH5X89nzEebJ/xl1Vgn2YKLVdiW3hm2m+v0JNhtc7XYmnq0g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1661516418; 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=hGVNmLq9KTmjUEgIehDQvP7j92X1iC2CPSX+4acSJHc=; b=gYLcRBSDpocWZ2TMppnO4TNbt4UayzkX260NkVb/lOBSO8pRxDY4/eaKjHn3iT15Kt+QQIF7v6l9Jc22N7ZhZZBzRS/9t7wyxLWzfB89ZOoOh2pcU1/dwV75Dq57+HBTY3jI+zG6TKHOV7PfXVYdEKDfTEZrYTNGTkGxHOGGTac= 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 1661516418912814.7169882890007; Fri, 26 Aug 2022 05:20:18 -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-635-Vii6q3CdOwWoXZADT8fgGg-1; Fri, 26 Aug 2022 08:20:15 -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 D17AC101E9BA; Fri, 26 Aug 2022 12:20:11 +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 2822C2166B26; Fri, 26 Aug 2022 12:20:11 +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 7F38A1946A51; Fri, 26 Aug 2022 12:20:10 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id E7A541946A43 for ; Fri, 26 Aug 2022 12:20:08 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id D95FC40B40CB; Fri, 26 Aug 2022 12:20:08 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2A22D40E7F28 for ; Fri, 26 Aug 2022 12:20:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1661516417; 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=hGVNmLq9KTmjUEgIehDQvP7j92X1iC2CPSX+4acSJHc=; b=JLaAwsmMnMH8TVr8RyvZ+R4xYS1HiB5Ip7G0HBVSxio37JdN5Wdmc1eYU7DXRqU2V2nnbi YNC1mlSoVPgwQ8WpAHAAwrJd2FXqwQDMbwMuM9xmX66kBeZuhPTY0Tzd+rlkY2B2uTGHqZ J4Eu0cLQoviHa0k1LjimyS5TuIG9Bmk= X-MC-Unique: Vii6q3CdOwWoXZADT8fgGg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 01/10] virDomainControllerDefValidate: Un-break lines in error messages Date: Fri, 26 Aug 2022 14:19:56 +0200 Message-Id: <1969ae9efe72c12a3efb21faef3e4b7792cf8d22.1661516306.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.11.54.1 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.78 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: 1661516420455100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Peter Krempa --- src/conf/domain_validate.c | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/src/conf/domain_validate.c b/src/conf/domain_validate.c index 1c78a3d31c..6ecf6d1c11 100644 --- a/src/conf/domain_validate.c +++ b/src/conf/domain_validate.c @@ -1129,8 +1129,7 @@ virDomainControllerDefValidate(const virDomainControl= lerDef *controller) controller->model =3D=3D VIR_DOMAIN_CONTROLLER_MODEL_PCIE_ROOT= ) { if (controller->info.type !=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_= NONE) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("pci-root and pcie-root controllers " - "should not have an address")); + _("pci-root and pcie-root controllers shoul= d not have an address")); return -1; } } @@ -1147,8 +1146,7 @@ virDomainControllerDefValidate(const virDomainControl= lerDef *controller) if (opts->targetIndex < 0 || opts->targetIndex > 30) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("PCI controller target index '%d' out of " - "range - must be 0-30"), + _("PCI controller target index '%d' out of = range - must be 0-30"), opts->targetIndex); return -1; } @@ -1156,8 +1154,7 @@ virDomainControllerDefValidate(const virDomainControl= lerDef *controller) if ((controller->idx =3D=3D 0 && opts->targetIndex !=3D 0) || (controller->idx !=3D 0 && opts->targetIndex =3D=3D 0)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Only the PCI controller with index 0 can= " - "have target index 0, and vice versa")); + _("Only the PCI controller with index 0 can= have target index 0, and vice versa")); return -1; } } @@ -1165,8 +1162,7 @@ virDomainControllerDefValidate(const virDomainControl= lerDef *controller) if (opts->chassisNr !=3D -1) { if (opts->chassisNr < 1 || opts->chassisNr > 255) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("PCI controller chassisNr '%d' out of ran= ge " - "- must be 1-255"), + _("PCI controller chassisNr '%d' out of ran= ge - must be 1-255"), opts->chassisNr); return -1; } @@ -1175,8 +1171,7 @@ virDomainControllerDefValidate(const virDomainControl= lerDef *controller) if (opts->chassis !=3D -1) { if (opts->chassis < 0 || opts->chassis > 255) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("PCI controller chassis '%d' out of range= " - "- must be 0-255"), + _("PCI controller chassis '%d' out of range= - must be 0-255"), opts->chassis); return -1; } @@ -1185,8 +1180,7 @@ virDomainControllerDefValidate(const virDomainControl= lerDef *controller) if (opts->port !=3D -1) { if (opts->port < 0 || opts->port > 255) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("PCI controller port '%d' out of range " - "- must be 0-255"), + _("PCI controller port '%d' out of range - = must be 0-255"), opts->port); return -1; } @@ -1195,8 +1189,7 @@ virDomainControllerDefValidate(const virDomainControl= lerDef *controller) if (opts->busNr !=3D -1) { if (opts->busNr < 1 || opts->busNr > 254) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("PCI controller busNr '%d' out of range " - "- must be 1-254"), + _("PCI controller busNr '%d' out of range -= must be 1-254"), opts->busNr); return -1; } @@ -1204,8 +1197,7 @@ virDomainControllerDefValidate(const virDomainControl= lerDef *controller) if (opts->numaNode >=3D 0 && controller->idx =3D=3D 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("The PCI controller with index=3D0 can't " - "be associated with a NUMA node")); + _("The PCI controller with index=3D0 can't be a= ssociated with a NUMA node")); return -1; } } --=20 2.37.1