From nobody Sat Feb 7 08:03:07 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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.133.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=1680167569; cv=none; d=zohomail.com; s=zohoarc; b=a3TWeXcJJYYqEjaSgSi+GvsroVyk+3Uvzw5+OjNLkaFtCJj2vNs9ymEj/26R9e0NwPXlBlSHrGOotoq6/PrlAx1c0BrcbRvhQhJKtlfyFLiAeGjcHur1uNBfDoRy5OVNjihwct7O3mtH2OZCbDfO0MGtMH4pX3rAH888bJwHKWU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1680167569; 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=sUoyaJo14UIDHElHA9dKwkn+t+7PNb0/M2zy2/7Doyo=; b=ef5lSCykwIEYToGyl2Wz37CZZ7oHJVaWoUnwDbqJjTd5XjaIUV/JynZ/9sm1pu1bmYQFY/+McJODvckroh8Wi2R18LB8NjN4kKCmyM4o5bmQmhLzUaV5E3hoC+DiI8z7WB+CO55Rm2NjW/E4Og84BOsK8lsYB0HqKoWsnlN4Dxg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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.133.124]) by mx.zohomail.com with SMTPS id 1680167569460351.7739333475606; Thu, 30 Mar 2023 02:12:49 -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-528-RTj3Ta43MOCBz53p33l4tw-1; Thu, 30 Mar 2023 05:12:44 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 920C285A5B1; Thu, 30 Mar 2023 09:12:42 +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 7E69640B3ED9; Thu, 30 Mar 2023 09:12: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 4A2B6194658F; Thu, 30 Mar 2023 09:12:42 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id D6C311946587 for ; Thu, 30 Mar 2023 09:12:36 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id BAD2F1121331; Thu, 30 Mar 2023 09:12:36 +0000 (UTC) Received: from virval.usersys.redhat.com (unknown [10.43.2.227]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7B72B1121330 for ; Thu, 30 Mar 2023 09:12:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1680167568; 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=sUoyaJo14UIDHElHA9dKwkn+t+7PNb0/M2zy2/7Doyo=; b=F7O9NRbQbxlnW9LT11O4XAv0HI8NSDq6xLO3R2EfV8Fo0uNaRo0uovEK2SuInUFjP/7YHJ zUEWvuD184P1W9K+YE257EmvRTqR9NZuc03YsLtQf33xxidGFXplR+x1i2tX41er3XCTgO y9lRnIOzfXCjCOeaotOhVqJffI7JxCA= X-MC-Unique: RTj3Ta43MOCBz53p33l4tw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Jiri Denemark To: libvir-list@redhat.com Subject: [libvirt PATCH 1/2] Drop excess whitespace from error messages Date: Thu, 30 Mar 2023 11:12:32 +0200 Message-Id: <6bef12710f103983b40dad43c77c967c40925f93.1680164239.git.jdenemar@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 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.1 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: 1680167571026100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Jiri Denemark Reviewed-by: J=C3=A1n Tomko --- src/conf/domain_conf.c | 3 +-- src/util/virnetdevvportprofile.c | 3 +-- src/util/virsocketaddr.c | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 9f49c6e62d..23fc19a409 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -14881,8 +14881,7 @@ virDomainControllerAliasFind(const virDomainDef *de= f, } if (!def->controllers[contIndex]->info.alias) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Device alias was not set for %s controller " - "with index %d "), + _("Device alias was not set for %s controller with = index %d"), contTypeStr, idx); return NULL; } diff --git a/src/util/virnetdevvportprofile.c b/src/util/virnetdevvportprof= ile.c index ae23f795b2..95f3bd2fc0 100644 --- a/src/util/virnetdevvportprofile.c +++ b/src/util/virnetdevvportprofile.c @@ -577,8 +577,7 @@ virNetDevVPortProfileGetStatus(struct nlattr **tb, int3= 2_t vf, virUUIDFormat(instanceId, instanceIdStr); =20 virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not find vf/instanceId %u/%s " - " in netlink response"), + _("Could not find vf/instanceId %u/%s in ne= tlink response"), vf, instanceIdStr); =20 /* go through all the entries again. This seems tedious, diff --git a/src/util/virsocketaddr.c b/src/util/virsocketaddr.c index 0480485ab7..7db9a7d7e8 100644 --- a/src/util/virsocketaddr.c +++ b/src/util/virsocketaddr.c @@ -906,8 +906,7 @@ virSocketAddrGetRange(virSocketAddr *start, virSocketAd= dr *end, virSocketAddrPrefixToNetmask(prefix, &netmask, VIR_SOCKET_ADDR_FAMILY(network)) = < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("bad prefix %d for network %s when " - " checking range %s - %s"), + _("bad prefix %d for network %s when checking r= ange %s - %s"), prefix, netStr, startStr, endStr); return -1; } --=20 2.40.0 From nobody Sat Feb 7 08:03:07 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=1680167583; cv=none; d=zohomail.com; s=zohoarc; b=iEl83Y1qVYRqan2KwikQjrexn4pskLPlsu7ZOqwMLPDmFP1GntnJhBvR7Ne6sVaS1U8t7QP7Nubbl2WfJXDoQJhcvZwiKCRWVW0PYnwvt/k899dR1ciu+qKBGDC7PUxZMyIAoca/4fIzmMjfD2niwsz4yE2q3gLl6IDIK2xi5DQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1680167583; 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=HOrGqMKfOpks8LB9AHQtICqZzVoFmsXcTj5S26qeo54=; b=bXE3OoinTOSdVD6KA96sk3gcw2/SgsVn2M3BgUH+BirJ8DbE6847qR8dK2umtXj6yT2tyEOo1t07YlH5VK1hNb+rKY5ZZYXzaULm7+qsmI415wxEOTUebQmiLug76dcfacgzJGTc5CZfx6c+eehounZ3Yk/Tkm3izo3WS3+3hiA= 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 1680167583466831.680712031646; Thu, 30 Mar 2023 02:13:03 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [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-672-G6Xd5rsfOuKJlNYVOIP25A-1; Thu, 30 Mar 2023 05:12:41 -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 E1D2129ABA25; Thu, 30 Mar 2023 09:12:38 +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 A5CA12166B39; Thu, 30 Mar 2023 09:12:38 +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 88C2C1946597; Thu, 30 Mar 2023 09:12:38 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id CBDE419465A2 for ; Thu, 30 Mar 2023 09:12:37 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id B420B492B01; Thu, 30 Mar 2023 09:12:37 +0000 (UTC) Received: from virval.usersys.redhat.com (unknown [10.43.2.227]) by smtp.corp.redhat.com (Postfix) with ESMTP id 74120492B00 for ; Thu, 30 Mar 2023 09:12:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1680167582; 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=HOrGqMKfOpks8LB9AHQtICqZzVoFmsXcTj5S26qeo54=; b=NeoNg8mVXO/Sqpdarhc1wnbSRkJxLjCEQIRCVJoTPBBHo26agI0YRfwh0T2utnI/uevhdM cQ+xzNayI3xzgkMibpQTxbWUONWwOsum1VtEtp+or3dS0pjFJDRCvqlok7jpLxektp1kwJ w5FjwqymfzQeHTc/drjRJ5Zu2EcEYvk= X-MC-Unique: G6Xd5rsfOuKJlNYVOIP25A-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Jiri Denemark To: libvir-list@redhat.com Subject: [libvirt PATCH 2/2] Do not use VIR_PCI_DEVICE_ADDRESS_FMT in translations Date: Thu, 30 Mar 2023 11:12:33 +0200 Message-Id: <694e12fc9056ea8fb9596c4ffb4ebae768a628b1.1680164239.git.jdenemar@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 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: 1680167585269100001 Content-Type: text/plain; charset="utf-8" xgettext cannot handle strings concatenated with cpp macros. Signed-off-by: Jiri Denemark Reviewed-by: J=C3=A1n Tomko --- src/conf/domain_conf.c | 3 +-- src/libxl/libxl_driver.c | 15 +++++---------- src/qemu/qemu_hotplug.c | 14 ++++---------- 3 files changed, 10 insertions(+), 22 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 23fc19a409..8f87663e08 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -19585,8 +19585,7 @@ virDomainDeviceInfoCheckABIStability(virDomainDevic= eInfo *src, src->addr.pci.slot !=3D dst->addr.pci.slot || src->addr.pci.function !=3D dst->addr.pci.function) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target device PCI address " VIR_PCI_DEVICE_A= DDRESS_FMT - "does not match source " VIR_PCI_DEVICE_ADDRE= SS_FMT), + _("Target device PCI address %04x:%02x:%02x.%d = does not match source %04x:%02x:%02x.%d"), dst->addr.pci.domain, dst->addr.pci.bus, dst->addr.pci.slot, dst->addr.pci.function, src->addr.pci.domain, src->addr.pci.bus, diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 07dcfcdc05..6e002ab77c 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -3082,8 +3082,7 @@ libxlDomainAttachHostPCIDevice(libxlDriverPrivate *dr= iver, =20 if (virDomainHostdevFind(vm->def, hostdev, &found) >=3D 0) { virReportError(VIR_ERR_OPERATION_FAILED, - _("target pci device " VIR_PCI_DEVICE_ADDRESS_FMT - " already exists"), + _("target pci device %04x:%02x:%02x.%d already exis= ts"), pcisrc->addr.domain, pcisrc->addr.bus, pcisrc->addr.slot, pcisrc->addr.function); goto cleanup; @@ -3101,8 +3100,7 @@ libxlDomainAttachHostPCIDevice(libxlDriverPrivate *dr= iver, =20 if (libxl_device_pci_add(cfg->ctx, vm->def->id, &pcidev, 0) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("libxenlight failed to attach pci device " - VIR_PCI_DEVICE_ADDRESS_FMT), + _("libxenlight failed to attach pci device %04x:%02= x:%02x.%d"), pcisrc->addr.domain, pcisrc->addr.bus, pcisrc->addr.slot, pcisrc->addr.function); goto error; @@ -3659,8 +3657,7 @@ libxlDomainDetachHostPCIDevice(libxlDriverPrivate *dr= iver, idx =3D virDomainHostdevFind(vm->def, hostdev, &detach); if (idx < 0) { virReportError(VIR_ERR_OPERATION_FAILED, - _("host pci device " VIR_PCI_DEVICE_ADDRESS_FMT - " not found"), + _("host pci device %04x:%02x:%02x.%d not found"), pcisrc->addr.domain, pcisrc->addr.bus, pcisrc->addr.slot, pcisrc->addr.function); goto cleanup; @@ -3668,8 +3665,7 @@ libxlDomainDetachHostPCIDevice(libxlDriverPrivate *dr= iver, =20 if (libxlIsMultiFunctionDevice(vm->def, detach->info)) { virReportError(VIR_ERR_OPERATION_FAILED, - _("cannot hot unplug multifunction PCI device: " - VIR_PCI_DEVICE_ADDRESS_FMT), + _("cannot hot unplug multifunction PCI device: %04x= :%02x:%02x.%d"), pcisrc->addr.domain, pcisrc->addr.bus, pcisrc->addr.slot, pcisrc->addr.function); goto error; @@ -3681,8 +3677,7 @@ libxlDomainDetachHostPCIDevice(libxlDriverPrivate *dr= iver, =20 if (libxl_device_pci_remove(cfg->ctx, vm->def->id, &pcidev, 0) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("libxenlight failed to detach pci device " - VIR_PCI_DEVICE_ADDRESS_FMT), + _("libxenlight failed to detach pci device %04x:%02= x:%02x.%d"), pcisrc->addr.domain, pcisrc->addr.bus, pcisrc->addr.slot, pcisrc->addr.function); goto error; diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index f5990d3da6..7f104c28be 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -5520,8 +5520,7 @@ qemuDomainDetachPrepHostdev(virDomainObj *vm, switch (subsys->type) { case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI: virReportError(VIR_ERR_DEVICE_MISSING, - _("host pci device " VIR_PCI_DEVICE_ADDRESS_FMT - " not found"), + _("host pci device %04x:%02x:%02x.%d not found"= ), pcisrc->addr.domain, pcisrc->addr.bus, pcisrc->addr.slot, pcisrc->addr.function); break; @@ -6024,8 +6023,7 @@ qemuDomainDetachDeviceLive(virDomainObj *vm, =20 if (qemuIsMultiFunctionDevice(vm->def, info)) { virReportError(VIR_ERR_OPERATION_FAILED, - _("cannot hot unplug %s device with multifunction P= CI guest address: " - VIR_PCI_DEVICE_ADDRESS_FMT), + _("cannot hot unplug %s device with multifunction P= CI guest address: %04x:%02x:%02x.%d"), virDomainDeviceTypeToString(detach.type), info->addr.pci.domain, info->addr.pci.bus, info->addr.pci.slot, info->addr.pci.function); @@ -6040,9 +6038,7 @@ qemuDomainDetachDeviceLive(virDomainObj *vm, info->addr.pci.bus); if (controllerIdx < 0) { virReportError(VIR_ERR_OPERATION_FAILED, - _("cannot hot unplug %s device with PCI guest a= ddress: " - VIR_PCI_DEVICE_ADDRESS_FMT - " - controller not found"), + _("cannot hot unplug %s device with PCI guest a= ddress: %04x:%02x:%02x.%d - controller not found"), virDomainDeviceTypeToString(detach.type), info->addr.pci.domain, info->addr.pci.bus, info->addr.pci.slot, info->addr.pci.function); @@ -6052,9 +6048,7 @@ qemuDomainDetachDeviceLive(virDomainObj *vm, controller =3D vm->def->controllers[controllerIdx]; if (controller->opts.pciopts.hotplug =3D=3D VIR_TRISTATE_SWITCH_OF= F) { virReportError(VIR_ERR_OPERATION_FAILED, - _("cannot hot unplug %s device with PCI guest a= ddress: " - VIR_PCI_DEVICE_ADDRESS_FMT - " - not allowed by controller"), + _("cannot hot unplug %s device with PCI guest a= ddress: %04x:%02x:%02x.%d - not allowed by controller"), virDomainDeviceTypeToString(detach.type), info->addr.pci.domain, info->addr.pci.bus, info->addr.pci.slot, info->addr.pci.function); --=20 2.40.0