From nobody Sun Feb 8 12:17:22 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=1678464650; cv=none; d=zohomail.com; s=zohoarc; b=NaTgDNMxop/J73I+KwSR9FS6HWpsp3HgdPfSt9q2GiRsppuQON7tR1hLYH6NibpTz6Ymo2Nbm25f9nxziJMvZ56zeXFnfRaUkKJjEHNpd+2CNtz31QBUiN3ugOPcq8qkSCui1zBzAEbAfdqJDOejN92xzk8gkr46ZoQHSzvTsO0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1678464650; 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=HN0kahEMZWR69+3D9n5/dvAxavQWaI2fDawQPZ5kZiM=; b=LYI16c4Okj2Eh+EilpICSo4KmG/cmAiLjXvmRivx7Ai+tD+2MN690gt4xMP+CjnsMqMoXLID8iz59Ds4L75hre5G0b3tfEMKdt3rfrKiACpQfIKV+w5Lwnls/gG2BbPvjyqF9IHyTAL4UCc5Ny9JuJAgMqGqgD86lPDIcXTyIFg= 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 1678464650081592.7506254855134; Fri, 10 Mar 2023 08:10:50 -0800 (PST) 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-107--n2sZBmBPx2Q2BKLBdhs7A-1; Fri, 10 Mar 2023 11:10:36 -0500 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 5AF03183B3CB; Fri, 10 Mar 2023 16:10:29 +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 45FB240C83B6; Fri, 10 Mar 2023 16:10:29 +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 2779C1946A54; Fri, 10 Mar 2023 16:10:29 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id D13D41946A5E for ; Fri, 10 Mar 2023 16:10:26 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id A74F340C945A; Fri, 10 Mar 2023 16:10:26 +0000 (UTC) Received: from rein.int.mamuti.net (unknown [10.45.226.138]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3208C40C1106 for ; Fri, 10 Mar 2023 16:10:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678464649; 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=HN0kahEMZWR69+3D9n5/dvAxavQWaI2fDawQPZ5kZiM=; b=DCeknZo2+h1m4VQYxbhjUNckr3GOdRUkP1Be0qTxRomGQVhIREqR4uNQqlbx278r4EwAL/ 5i1ln1KBoCdbZHHPsN7Jk5wapu2pbcwea9SbcHmIFczdFoKyYvKdmhMOZPFJFE4WIscYGu bAfjSUGXSWCuN8IspJV7UD/NZpmYd1M= X-MC-Unique: -n2sZBmBPx2Q2BKLBdhs7A-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Jiri Denemark To: libvir-list@redhat.com Subject: [libvirt PATCH 09/51] conf/node_device_conf: Update format strings in translated messages Date: Fri, 10 Mar 2023 17:09:25 +0100 Message-Id: <4a0bd15f00115801fe2c4685ff6fa012f4dc8ec7.1678463799.git.jdenemar@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 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: 1678464650956100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Jiri Denemark --- src/conf/node_device_conf.c | 178 ++++++++++++++++++------------------ 1 file changed, 87 insertions(+), 91 deletions(-) diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index af331baaf3..fcee9c027c 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -892,7 +892,7 @@ virNodeDevCapDRMParseXML(xmlXPathContextPtr ctxt, =20 if ((val =3D virNodeDevDRMTypeFromString(type)) < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown drm type '%s' for '%s'"), type, def->nam= e); + _("unknown drm type '%1$s' for '%2$s'"), type, def-= >name); return -1; } drm->type =3D val; @@ -937,7 +937,7 @@ virNodeDevCapMdevTypesParseXML(xmlXPathContextPtr ctxt, =20 if (!(type->device_api =3D virXPathString("string(./deviceAPI[1])"= , ctxt))) { virReportError(VIR_ERR_XML_ERROR, - _("missing device API for mediated device type = '%s'"), + _("missing device API for mediated device type = '%1$s'"), type->id); goto cleanup; } @@ -945,8 +945,7 @@ virNodeDevCapMdevTypesParseXML(xmlXPathContextPtr ctxt, if (virXPathUInt("string(./availableInstances)", ctxt, &type->available_instances) < 0) { virReportError(VIR_ERR_XML_ERROR, - _("missing number of available instances for " - "mediated device type '%s'"), + _("missing number of available instances for me= diated device type '%1$s'"), type->id); goto cleanup; } @@ -1104,17 +1103,18 @@ virNodeDeviceCapVPDParseXML(xmlXPathContextPtr ctxt= , virPCIVPDResource **res) if (STREQ(access, "readonly")) { if (virNodeDeviceCapVPDParseReadOnlyFields(ctxt, newres) < 0) { virReportError(VIR_ERR_XML_ERROR, - _("Could not parse %s VPD resource fields"), acces= s); + _("Could not parse %1$s VPD resource fields"), acc= ess); return -1; } } else if (STREQ(access, "readwrite")) { if (virNodeDeviceCapVPDParseReadWriteFields(ctxt, newres) < 0)= { virReportError(VIR_ERR_XML_ERROR, - _("Could not parse %s VPD resource fields"), acces= s); + _("Could not parse %1$s VPD resource fields"), acc= ess); return -1; } } else { - virReportError(VIR_ERR_XML_ERROR, _("Unsupported VPD field acc= ess type specified %s"), + virReportError(VIR_ERR_XML_ERROR, + _("Unsupported VPD field access type specified = %1$s"), access); return -1; } @@ -1170,36 +1170,36 @@ virNodeDevCCWDeviceAddressParseXML(xmlXPathContextP= tr ctxt, =20 if (!(cssid =3D virXPathString("string(./cssid[1])", ctxt))) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("missing cssid value for '%s'"), dev_name); + _("missing cssid value for '%1$s'"), dev_name); return -1; } if (virStrToLong_uip(cssid, NULL, 0, &ccw_addr->cssid) < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("invalid cssid value '%s' for '%s'"), + _("invalid cssid value '%1$s' for '%2$s'"), cssid, dev_name); return -1; } =20 if (!(ssid =3D virXPathString("string(./ssid[1])", ctxt))) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("missing ssid value for '%s'"), dev_name); + _("missing ssid value for '%1$s'"), dev_name); return -1; } if (virStrToLong_uip(ssid, NULL, 0, &ccw_addr->ssid) < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("invalid ssid value '%s' for '%s'"), + _("invalid ssid value '%1$s' for '%2$s'"), ssid, dev_name); return -1; } =20 if (!(devno =3D virXPathString("string(./devno[1])", ctxt))) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("missing devno value for '%s'"), dev_name); + _("missing devno value for '%1$s'"), dev_name); return -1; } if (virStrToLong_uip(devno, NULL, 16, &ccw_addr->devno) < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("invalid devno value '%s' for '%s'"), + _("invalid devno value '%1$s' for '%2$s'"), devno, dev_name); return -1; } @@ -1312,13 +1312,13 @@ virNodeDevCapAPAdapterParseXML(xmlXPathContextPtr c= txt, =20 if (!(adapter =3D virXPathString("string(./ap-adapter[1])", ctxt))) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("missing ap-adapter value for '%s'"), def->name); + _("missing ap-adapter value for '%1$s'"), def->name= ); return -1; } =20 if (virStrToLong_uip(adapter, NULL, 0, ap_adapter) < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("invalid ap-adapter value '%s' for '%s'"), + _("invalid ap-adapter value '%1$s' for '%2$s'"), adapter, def->name); return -1; } @@ -1359,20 +1359,20 @@ virNodeDevCapAPQueueParseXML(xmlXPathContextPtr ctx= t, =20 if (!(dom =3D virXPathString("string(./ap-domain[1])", ctxt))) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("missing ap-domain value for '%s'"), def->name); + _("missing ap-domain value for '%1$s'"), def->name); return -1; } =20 if (virStrToLong_uip(dom, NULL, 0, &ap_queue->ap_domain) < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("invalid ap-domain value '%s' for '%s'"), + _("invalid ap-domain value '%1$s' for '%2$s'"), dom, def->name); return -1; } =20 if (ap_queue->ap_domain > 255) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("ap-domain value '%s' is out of range for '%s'"), + _("ap-domain value '%1$s' is out of range for '%2$s= '"), dom, def->name); return -1; } @@ -1423,7 +1423,7 @@ virNodeDevCapStorageParseXML(xmlXPathContextPtr ctxt, storage->block =3D virXPathString("string(./block[1])", ctxt); if (!storage->block) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("no block device path supplied for '%s'"), + _("no block device path supplied for '%1$s'"), def->name); return -1; } @@ -1442,7 +1442,7 @@ virNodeDevCapStorageParseXML(xmlXPathContextPtr ctxt, =20 if (!type) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("missing storage capability type for '%s'"), + _("missing storage capability type for '%1$s'"), def->name); return -1; } @@ -1464,8 +1464,8 @@ virNodeDevCapStorageParseXML(xmlXPathContextPtr ctxt, =20 val =3D 0; if (virNodeDevCapsDefParseULongLong("string(./media_size[1])",= ctxt, &val, def, - _("no removable media size= supplied for '%s'"), - _("invalid removable media= size supplied for '%s'")) < 0) { + _("no removable media size= supplied for '%1$s'"), + _("invalid removable media= size supplied for '%1$s'")) < 0) { return -1; } storage->removable_media_size =3D val; @@ -1473,7 +1473,7 @@ virNodeDevCapStorageParseXML(xmlXPathContextPtr ctxt, ctxt->node =3D orignode2; } else { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unknown storage capability type '%s' for '%s= '"), + _("unknown storage capability type '%1$s' for '= %2$s'"), type, def->name); return -1; } @@ -1482,8 +1482,8 @@ virNodeDevCapStorageParseXML(xmlXPathContextPtr ctxt, if (!(storage->flags & VIR_NODE_DEV_CAP_STORAGE_REMOVABLE)) { val =3D 0; if (virNodeDevCapsDefParseULongLong("string(./size[1])", ctxt, &va= l, def, - _("no size supplied for '%s'"), - _("invalid size supplied for '= %s'")) < 0) + _("no size supplied for '%1$s'= "), + _("invalid size supplied for '= %1$s'")) < 0) return -1; storage->size =3D val; } @@ -1504,26 +1504,26 @@ virNodeDevCapSCSIParseXML(xmlXPathContextPtr ctxt, =20 if (virNodeDevCapsDefParseUInt("string(./host[1])", ctxt, &scsi->host, def, - _("no SCSI host ID supplied for '%s'"), - _("invalid SCSI host ID supplied for '%= s'")) < 0) + _("no SCSI host ID supplied for '%1$s'"= ), + _("invalid SCSI host ID supplied for '%= 1$s'")) < 0) return -1; =20 if (virNodeDevCapsDefParseUInt("string(./bus[1])", ctxt, &scsi->bus, def, - _("no SCSI bus ID supplied for '%s'"), - _("invalid SCSI bus ID supplied for '%s= '")) < 0) + _("no SCSI bus ID supplied for '%1$s'"), + _("invalid SCSI bus ID supplied for '%1= $s'")) < 0) return -1; =20 if (virNodeDevCapsDefParseUInt("string(./target[1])", ctxt, &scsi->target, def, - _("no SCSI target ID supplied for '%s'"= ), - _("invalid SCSI target ID supplied for = '%s'")) < 0) + _("no SCSI target ID supplied for '%1$s= '"), + _("invalid SCSI target ID supplied for = '%1$s'")) < 0) return -1; =20 if (virNodeDevCapsDefParseUInt("string(./lun[1])", ctxt, &scsi->lun, def, - _("no SCSI LUN ID supplied for '%s'"), - _("invalid SCSI LUN ID supplied for '%s= '")) < 0) + _("no SCSI LUN ID supplied for '%1$s'"), + _("invalid SCSI LUN ID supplied for '%1= $s'")) < 0) return -1; =20 scsi->type =3D virXPathString("string(./type[1])", ctxt); @@ -1548,7 +1548,7 @@ virNodeDevCapSCSITargetParseXML(xmlXPathContextPtr ct= xt, scsi_target->name =3D virXPathString("string(./target[1])", ctxt); if (!scsi_target->name) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("no target name supplied for '%s'"), + _("no target name supplied for '%1$s'"), def->name); return -1; } @@ -1562,7 +1562,7 @@ virNodeDevCapSCSITargetParseXML(xmlXPathContextPtr ct= xt, =20 if (!type) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("missing type for SCSI target capability for = '%s'"), + _("missing type for SCSI target capability for = '%1$s'"), def->name); return -1; } @@ -1576,20 +1576,20 @@ virNodeDevCapSCSITargetParseXML(xmlXPathContextPtr = ctxt, ctxt, &scsi_target->rport) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("missing rport name for '%s'"), def->name= ); + _("missing rport name for '%1$s'"), def->na= me); return -1; } =20 if (virNodeDevCapsDefParseString("string(./wwpn[1])", ctxt, &scsi_target->wwpn) < 0= ) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("missing wwpn identifier for '%s'"), + _("missing wwpn identifier for '%1$s'"), def->name); return -1; } } else { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unknown SCSI target capability type '%s' for= '%s'"), + _("unknown SCSI target capability type '%1$s' f= or '%2$s'"), type, def->name); return -1; } @@ -1617,15 +1617,15 @@ virNodeDevCapSCSIHostParseXML(xmlXPathContextPtr ct= xt, if (create =3D=3D EXISTING_DEVICE) { if (virNodeDevCapsDefParseUInt("string(./host[1])", ctxt, &scsi_host->host, def, - _("no SCSI host ID supplied for '%s= '"), - _("invalid SCSI host ID supplied fo= r '%s'")) < 0) { + _("no SCSI host ID supplied for '%1= $s'"), + _("invalid SCSI host ID supplied fo= r '%1$s'")) < 0) { return -1; } /* Optional unique_id value */ scsi_host->unique_id =3D -1; if (virNodeDevCapsDefParseIntOptional("string(./unique_id[1])", ct= xt, &scsi_host->unique_id, def, - _("invalid unique_id supplie= d for '%s'")) < 0) { + _("invalid unique_id supplie= d for '%1$s'")) < 0) { return -1; } } @@ -1639,7 +1639,7 @@ virNodeDevCapSCSIHostParseXML(xmlXPathContextPtr ctxt, =20 if (!type) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("missing SCSI host capability type for '%s'"), + _("missing SCSI host capability type for '%1$s'= "), def->name); return -1; } @@ -1658,8 +1658,7 @@ virNodeDevCapSCSIHostParseXML(xmlXPathContextPtr ctxt, &scsi_host->wwnn) < 0) { if (virRandomGenerateWWN(&scsi_host->wwnn, virt_type) < 0)= { virReportError(VIR_ERR_INTERNAL_ERROR, - _("no WWNN supplied for '%s', and " - "auto-generation failed"), + _("no WWNN supplied for '%1$s', and aut= o-generation failed"), def->name); return -1; } @@ -1670,8 +1669,7 @@ virNodeDevCapSCSIHostParseXML(xmlXPathContextPtr ctxt, &scsi_host->wwpn) < 0) { if (virRandomGenerateWWN(&scsi_host->wwpn, virt_type) < 0)= { virReportError(VIR_ERR_INTERNAL_ERROR, - _("no WWPN supplied for '%s', and " - "auto-generation failed"), + _("no WWPN supplied for '%1$s', and aut= o-generation failed"), def->name); return -1; } @@ -1684,7 +1682,7 @@ virNodeDevCapSCSIHostParseXML(xmlXPathContextPtr ctxt, =20 } else { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unknown SCSI host capability type '%s' for '= %s'"), + _("unknown SCSI host capability type '%1$s' for= '%2$s'"), type, def->name); return -1; } @@ -1712,7 +1710,7 @@ virNodeDevCapNetParseXML(xmlXPathContextPtr ctxt, net->ifname =3D virXPathString("string(./interface[1])", ctxt); if (!net->ifname) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("no network interface supplied for '%s'"), + _("no network interface supplied for '%1$s'"), def->name); return -1; } @@ -1736,7 +1734,7 @@ virNodeDevCapNetParseXML(xmlXPathContextPtr ctxt, =20 if ((val =3D virNetDevFeatureTypeFromString(tmp)) < 0) { virReportError(VIR_ERR_XML_ERROR, - _("unknown network device feature '%s'"), + _("unknown network device feature '%1$s'"), tmp); return -1; } @@ -1750,7 +1748,7 @@ virNodeDevCapNetParseXML(xmlXPathContextPtr ctxt, int val =3D virNodeDevNetCapTypeFromString(type); if (val < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("invalid network type supplied for '%s'"), + _("invalid network type supplied for '%1$s'"), def->name); return -1; } @@ -1777,26 +1775,26 @@ virNodeDevCapUSBInterfaceParseXML(xmlXPathContextPt= r ctxt, =20 if (virNodeDevCapsDefParseUInt("string(./number[1])", ctxt, &usb_if->number, def, - _("no USB interface number supplied for= '%s'"), - _("invalid USB interface number supplie= d for '%s'")) < 0) + _("no USB interface number supplied for= '%1$s'"), + _("invalid USB interface number supplie= d for '%1$s'")) < 0) return -1; =20 if (virNodeDevCapsDefParseUInt("string(./class[1])", ctxt, &usb_if->klass, def, - _("no USB interface class supplied for = '%s'"), - _("invalid USB interface class supplied= for '%s'")) < 0) + _("no USB interface class supplied for = '%1$s'"), + _("invalid USB interface class supplied= for '%1$s'")) < 0) return -1; =20 if (virNodeDevCapsDefParseUInt("string(./subclass[1])", ctxt, &usb_if->subclass, def, - _("no USB interface subclass supplied f= or '%s'"), - _("invalid USB interface subclass suppl= ied for '%s'")) < 0) + _("no USB interface subclass supplied f= or '%1$s'"), + _("invalid USB interface subclass suppl= ied for '%1$s'")) < 0) return -1; =20 if (virNodeDevCapsDefParseUInt("string(./protocol[1])", ctxt, &usb_if->protocol, def, - _("no USB interface protocol supplied f= or '%s'"), - _("invalid USB interface protocol suppl= ied for '%s'")) < 0) + _("no USB interface protocol supplied f= or '%1$s'"), + _("invalid USB interface protocol suppl= ied for '%1$s'")) < 0) return -1; =20 usb_if->description =3D virXPathString("string(./description[1])", ctx= t); @@ -1839,26 +1837,26 @@ virNodeDevCapUSBDevParseXML(xmlXPathContextPtr ctxt, =20 if (virNodeDevCapsDefParseUInt("string(./bus[1])", ctxt, &usb_dev->bus, def, - _("no USB bus number supplied for '%s'"= ), - _("invalid USB bus number supplied for = '%s'")) < 0) + _("no USB bus number supplied for '%1$s= '"), + _("invalid USB bus number supplied for = '%1$s'")) < 0) return -1; =20 if (virNodeDevCapsDefParseUInt("string(./device[1])", ctxt, &usb_dev->device, def, - _("no USB device number supplied for '%= s'"), - _("invalid USB device number supplied f= or '%s'")) < 0) + _("no USB device number supplied for '%= 1$s'"), + _("invalid USB device number supplied f= or '%1$s'")) < 0) return -1; =20 if (virNodeDevCapsDefParseHexId("string(./vendor[1]/@id)", ctxt, &usb_dev->vendor, def, - _("no USB vendor ID supplied for '%s'"= ), - _("invalid USB vendor ID supplied for = '%s'")) < 0) + _("no USB vendor ID supplied for '%1$s= '"), + _("invalid USB vendor ID supplied for = '%1$s'")) < 0) return -1; =20 if (virNodeDevCapsDefParseHexId("string(./product[1]/@id)", ctxt, &usb_dev->product, def, - _("no USB product ID supplied for '%s'= "), - _("invalid USB product ID supplied for= '%s'")) < 0) + _("no USB product ID supplied for '%1$= s'"), + _("invalid USB product ID supplied for= '%1$s'")) < 0) return -1; =20 usb_dev->vendor_name =3D virXPathString("string(./vendor[1])", ctxt); @@ -2075,7 +2073,7 @@ virNodeDevCapPCIDevParseXML(xmlXPathContextPtr ctxt, if (virStrToLong_i(tmp, NULL, 16, &pci_dev->klass) < 0 || pci_dev->klass > 0xffffff) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("invalid PCI class supplied for '%s'"), def->= name); + _("invalid PCI class supplied for '%1$s'"), def= ->name); goto out; } } else { @@ -2084,38 +2082,38 @@ virNodeDevCapPCIDevParseXML(xmlXPathContextPtr ctxt, =20 if (virNodeDevCapsDefParseUInt("string(./domain[1])", ctxt, &pci_dev->domain, def, - _("no PCI domain ID supplied for '%s'"), - _("invalid PCI domain ID supplied for '= %s'")) < 0) + _("no PCI domain ID supplied for '%1$s'= "), + _("invalid PCI domain ID supplied for '= %1$s'")) < 0) goto out; =20 if (virNodeDevCapsDefParseUInt("string(./bus[1])", ctxt, &pci_dev->bus, def, - _("no PCI bus ID supplied for '%s'"), - _("invalid PCI bus ID supplied for '%s'= ")) < 0) + _("no PCI bus ID supplied for '%1$s'"), + _("invalid PCI bus ID supplied for '%1$= s'")) < 0) goto out; =20 if (virNodeDevCapsDefParseUInt("string(./slot[1])", ctxt, &pci_dev->slot, def, - _("no PCI slot ID supplied for '%s'"), - _("invalid PCI slot ID supplied for '%s= '")) < 0) + _("no PCI slot ID supplied for '%1$s'"), + _("invalid PCI slot ID supplied for '%1= $s'")) < 0) goto out; =20 if (virNodeDevCapsDefParseUInt("string(./function[1])", ctxt, &pci_dev->function, def, - _("no PCI function ID supplied for '%s'= "), - _("invalid PCI function ID supplied for= '%s'")) < 0) + _("no PCI function ID supplied for '%1$= s'"), + _("invalid PCI function ID supplied for= '%1$s'")) < 0) goto out; =20 if (virNodeDevCapsDefParseHexId("string(./vendor[1]/@id)", ctxt, &pci_dev->vendor, def, - _("no PCI vendor ID supplied for '%s'"= ), - _("invalid PCI vendor ID supplied for = '%s'")) < 0) + _("no PCI vendor ID supplied for '%1$s= '"), + _("invalid PCI vendor ID supplied for = '%1$s'")) < 0) goto out; =20 if (virNodeDevCapsDefParseHexId("string(./product[1]/@id)", ctxt, &pci_dev->product, def, - _("no PCI product ID supplied for '%s'= "), - _("invalid PCI product ID supplied for= '%s'")) < 0) + _("no PCI product ID supplied for '%1$= s'"), + _("invalid PCI product ID supplied for= '%1$s'")) < 0) goto out; =20 pci_dev->vendor_name =3D virXPathString("string(./vendor[1])", ctxt); @@ -2140,7 +2138,7 @@ virNodeDevCapPCIDevParseXML(xmlXPathContextPtr ctxt, pci_dev->numa_node =3D -1; if (virNodeDevCapsDefParseIntOptional("string(./numa[1]/@node)", ctxt, &pci_dev->numa_node, def, - _("invalid NUMA node ID supplied= for '%s'")) < 0) + _("invalid NUMA node ID supplied= for '%1$s'")) < 0) goto out; =20 if ((pciExpress =3D virXPathNode("./pci-express[1]", ctxt))) { @@ -2182,13 +2180,13 @@ virNodeDevCapSystemParseXML(xmlXPathContextPtr ctxt, tmp =3D virXPathString("string(./hardware/uuid[1])", ctxt); if (!tmp) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("no system UUID supplied for '%s'"), def->name); + _("no system UUID supplied for '%1$s'"), def->name); return -1; } =20 if (virUUIDParse(tmp, hardware->uuid) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("malformed uuid element for '%s'"), def->name); + _("malformed uuid element for '%1$s'"), def->name); return -1; } =20 @@ -2237,7 +2235,7 @@ virNodeDevCapMdevParseXML(xmlXPathContextPtr ctxt, =20 if (!(mdev->type =3D virXPathString("string(./type[1]/@id)", ctxt))) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("missing type id attribute for '%s'"), def->name); + _("missing type id attribute for '%1$s'"), def->nam= e); return -1; } =20 @@ -2246,7 +2244,7 @@ virNodeDevCapMdevParseXML(xmlXPathContextPtr ctxt, /* make sure that the provided uuid is valid */ if (virUUIDParse(uuidstr, uuidbuf) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Invalid uuid '%s' for new mdev device"), uui= dstr); + _("Invalid uuid '%1$s' for new mdev device"), u= uidstr); return -1; } mdev->uuid =3D g_new0(char, VIR_UUID_STRING_BUFLEN); @@ -2258,7 +2256,7 @@ virNodeDevCapMdevParseXML(xmlXPathContextPtr ctxt, if (virXPathUInt("string(./iommuGroup[1]/@number)", ctxt, &mdev->iommuGroupNumber) < -1) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("invalid iommuGroup number attribute for '%s'"), + _("invalid iommuGroup number attribute for '%1$s'"), def->name); return -1; } @@ -2353,7 +2351,7 @@ virNodeDevCapsDefParseXML(xmlXPathContextPtr ctxt, case VIR_NODE_DEV_CAP_VPD: case VIR_NODE_DEV_CAP_LAST: virReportError(VIR_ERR_INTERNAL_ERROR, - _("unknown capability type '%d' for '%s'"), + _("unknown capability type '%1$d' for '%2$s'"), caps->data.type, def->name); ret =3D -1; break; @@ -2426,16 +2424,14 @@ virNodeDeviceDefParseXML(xmlXPathContextPtr ctxt, def->parent_wwpn =3D virXPathString("string(./parent[1]/@wwpn)", ctxt); if (def->parent_wwnn && !def->parent_wwpn) { virReportError(VIR_ERR_XML_ERROR, - _("when providing parent wwnn=3D'%s', the " - "wwpn must also be provided"), + _("when providing parent wwnn=3D'%1$s', the wwpn mu= st also be provided"), def->parent_wwnn); return NULL; } =20 if (!def->parent_wwnn && def->parent_wwpn) { virReportError(VIR_ERR_XML_ERROR, - _("when providing parent wwpn=3D'%s', the " - "wwnn must also be provided"), + _("when providing parent wwpn=3D'%1$s', the wwnn mu= st also be provided"), def->parent_wwpn); return NULL; } @@ -2448,7 +2444,7 @@ virNodeDeviceDefParseXML(xmlXPathContextPtr ctxt, =20 if (n =3D=3D 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("no device capabilities for '%s'"), + _("no device capabilities for '%1$s'"), def->name); return NULL; } --=20 2.39.2