From nobody Mon Feb 9 09:34:05 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=1692949254; cv=none; d=zohomail.com; s=zohoarc; b=R8j/cfDs5xACEomvwifmvo/VK5qkd45VHRV9YXUaKPNSYMthOGpHGdRoaf8Xfej3Mqa/u3cFX+VM+64lhiC9YPJJRKE2b5mYZOSqObrZ+4jUeEmMM30xqmvBlanqgSOjYrorzU4IdPnNc8kpF+SAQ5VJ5bcEFxCLTH3CKvF8/bI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1692949254; 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=qcKhv318tYUJF9Ejl9R+00BwbSxp+L9rEXXdomJIl3E=; b=X2c1gy6OINEQU9GrdXtBa8ZLGbjLli1PfDelWGeSe/O9sPsUEDv2wupk8kdkI7ASnErDYOV4LRLVUnBx59mYYVaqgYFQacVYSxGl58+K2xtK5T0H9FikBH+D7KhdUzw7URqNx3AkKhg3TA3qnIdy9hkWR3dOqzdd8R4t7V1yT88= 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 1692949254944608.0114087095025; Fri, 25 Aug 2023 00:40:54 -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-119-EugS3LFtP0uSdHPrQdreig-1; Fri, 25 Aug 2023 03:40:45 -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 2B6ED3827E0C; 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 AD27F40D283A; Fri, 25 Aug 2023 07:40:32 +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 A9BB31946A67; 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 BE6501946589 for ; Fri, 25 Aug 2023 07:40:30 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id A0A542026D2B; Fri, 25 Aug 2023 07:40:30 +0000 (UTC) Received: from localhost.localdomain (unknown [10.43.2.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4774A2026D76 for ; Fri, 25 Aug 2023 07:40:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1692949254; 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=qcKhv318tYUJF9Ejl9R+00BwbSxp+L9rEXXdomJIl3E=; b=BEs2FliYfrMBP5WVVksHTol6SKNFqWJHoBPSDS0nF0949nwEZ0Yu1zuNmUK49ATzxDJs/n 4zsYNhTgBm6aQ1KgMPhkjn0gc1nA0+HCyu3o8QqMfa1RgmIhDYPwAG873yOKMQ+f/vWt7T cIGwpYKyTnVmgn1ww4ZhyVyORFjyqTo= X-MC-Unique: EugS3LFtP0uSdHPrQdreig-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 07/27] libxl: Move error messages onto a single line Date: Fri, 25 Aug 2023 09:40:04 +0200 Message-ID: <8c380f4794f40af7c2edaa930475110b562d7363.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: 1692949255159100009 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/libxl/libxl_conf.c | 12 ++++-------- src/libxl/libxl_driver.c | 6 ++---- src/libxl/libxl_migration.c | 11 ++++------- 3 files changed, 10 insertions(+), 19 deletions(-) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 14ad320023..3ffb46fddd 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -1284,8 +1284,7 @@ libxlMakeNic(virDomainDef *def, if (l_nic->script && !(actual_type =3D=3D VIR_DOMAIN_NET_TYPE_BRIDGE || actual_type =3D=3D VIR_DOMAIN_NET_TYPE_ETHERNET= )) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("specifying a script is only supported with " - "interface types bridge and ethernet")); + _("specifying a script is only supported with inter= face types bridge and ethernet")); return -1; } =20 @@ -1310,8 +1309,7 @@ libxlMakeNic(virDomainDef *def, def->os.type =3D=3D VIR_DOMAIN_OSTYPE_XENPVH) && l_nic->model !=3D VIR_DOMAIN_NET_MODEL_NETFRONT) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("only model 'netfront' is supported for " - "Xen PV(H) domains")); + _("only model 'netfront' is supported for Xen P= V(H) domains")); return -1; } x_nic->model =3D g_strdup(virDomainNetGetModelString(l_nic)); @@ -1802,14 +1800,12 @@ libxlDriverConfigInit(libxlDriverConfig *cfg) } =20 if (libxl_ctx_alloc(&cfg->ctx, LIBXL_VERSION, 0, (xentoollog_logger *)= cfg->logger)) { - VIR_ERROR(_("cannot initialize libxenlight context, probably not " - "running in a Xen Dom0, disabling driver")); + VIR_ERROR(_("cannot initialize libxenlight context, probably not r= unning in a Xen Dom0, disabling driver")); return -1; } =20 if ((cfg->verInfo =3D libxl_get_version_info(cfg->ctx)) =3D=3D NULL) { - VIR_ERROR(_("cannot version information from libxenlight, " - "disabling driver")); + VIR_ERROR(_("cannot version information from libxenlight, disablin= g driver")); return -1; } cfg->version =3D (cfg->verInfo->xen_version_major * 1000000) + diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 079922dd32..c8ca903050 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -2904,8 +2904,7 @@ libxlDomainUndefineFlags(virDomainPtr dom, } } else { virReportError(VIR_ERR_OPERATION_INVALID, "%s", - _("Refusing to undefine while domain managed " - "save image exists")); + _("Refusing to undefine while domain managed sa= ve image exists")); goto cleanup; } } @@ -3212,8 +3211,7 @@ libxlDomainAttachHostUSBDevice(libxlDriverPrivate *dr= iver, =20 if (libxlDomainAttachControllerDevice(driver, vm, controller) < 0)= { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("No available USB controller and port, and " - "failed to attach a new one")); + _("No available USB controller and port, and fa= iled to attach a new one")); virDomainControllerDefFree(controller); goto cleanup; } diff --git a/src/libxl/libxl_migration.c b/src/libxl/libxl_migration.c index a91091f5e8..f5dee7627b 100644 --- a/src/libxl/libxl_migration.c +++ b/src/libxl/libxl_migration.c @@ -679,8 +679,7 @@ libxlDomainMigrationDstPrepare(virConnectPtr dconn, =20 if (STRPREFIX(hostname, "localhost")) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("hostname on destination resolved to localhos= t," - " but migration requires an FQDN")); + _("hostname on destination resolved to localhos= t, but migration requires an FQDN")); goto endjob; } =20 @@ -1142,8 +1141,7 @@ libxlDomainMigrationSrcPerformP2P(libxlDriverPrivate = *driver, if (useParams <=3D 0) { if (useParams =3D=3D 0) virReportError(VIR_ERR_OPERATION_FAILED, "%s", - _("Destination libvirt does not support migrati= on" - " with extensible parameters")); + _("Destination libvirt does not support migrati= on with extensible parameters")); goto cleanup; } =20 @@ -1260,9 +1258,8 @@ libxlDomainMigrationDstFinish(virConnectPtr dconn, /* Check if domain is alive */ if (!virDomainObjIsActive(vm)) { /* Migration failed if domain is inactive */ - virReportError(VIR_ERR_OPERATION_FAILED, - "%s", _("Migration failed. Domain is not running " - "on destination host")); + virReportError(VIR_ERR_OPERATION_FAILED, "%s", + _("Migration failed. Domain is not running on desti= nation host")); goto cleanup; } =20 --=20 2.41.0