From nobody Fri Dec 19 02:51:09 2025 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=1678464668; cv=none; d=zohomail.com; s=zohoarc; b=Zd0E7gpI3SUES/qlDMFa+dxfUcFVILxPLkQhkzmX4QuevCeqChNSzWjxYg2GzJtOkgl8I4gpQL6cNXYtT/5a/3uYIKO/yG4dcmpzVAFoVlMohFQAl8otNCHkGqkPdjcm3wN2MMr6yrlBNSfOHUMc23417+dDFTCnUaOWXeW+eIM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1678464668; 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=f+jTSA1c46bRtFI5fp8hwmKTKe7XZ8pWrrdkBNAqQTw=; b=ieXkIH/pkspMSefjtmeSeo8EmaLW1aIZYj3aplPV81k6yTnKvZGkEvWXXshcAf0iuYKjM9d0vWGY56N/NSBNsNt6MZrL/mWFUoJm370TjCcsWy6hlpBue+X7cojsTOfr/+L2phOtPFNaRR1JkhWRzdJKdiPnmdxoUdaBo9FY+PE= 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 16784646683821001.8041242098549; Fri, 10 Mar 2023 08:11:08 -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-636-HmHij2MhMDufOkr1ZJpzJg-1; Fri, 10 Mar 2023 11:10:52 -0500 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 A138E882845; Fri, 10 Mar 2023 16:10:32 +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 8D6182166B26; Fri, 10 Mar 2023 16:10: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 7105A1946A73; Fri, 10 Mar 2023 16:10:32 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 06CA91946587 for ; Fri, 10 Mar 2023 16:10:32 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id DA7AA44101; Fri, 10 Mar 2023 16:10:31 +0000 (UTC) Received: from rein.int.mamuti.net (unknown [10.45.226.138]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6C8B6440D8 for ; Fri, 10 Mar 2023 16:10:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678464667; 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=f+jTSA1c46bRtFI5fp8hwmKTKe7XZ8pWrrdkBNAqQTw=; b=GN8zC0DtO423KpA/yugiL8p2o7GWHcD0IJfe+WtV0PkpXYHOP6Py2vmdAVI3gooLznZaC3 UrNh8yYZpZv6oH9Xd28kH6oLtJC52aMHVgre6II2Op3b39AMgx+U4+dV2T4DpopHHbawI5 6fa35HPXrdMvcbvjIH+16KS4Pf7y9G4= X-MC-Unique: HmHij2MhMDufOkr1ZJpzJg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Jiri Denemark To: libvir-list@redhat.com Subject: [libvirt PATCH 13/51] hyperv: Update format strings in translated messages Date: Fri, 10 Mar 2023 17:09:29 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 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: 1678464668985100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Jiri Denemark --- src/hyperv/hyperv_driver.c | 46 +++++++++++++++--------------- src/hyperv/hyperv_network_driver.c | 4 +-- src/hyperv/hyperv_util.c | 3 +- src/hyperv/hyperv_wmi.c | 43 ++++++++++++++-------------- 4 files changed, 47 insertions(+), 49 deletions(-) diff --git a/src/hyperv/hyperv_driver.c b/src/hyperv/hyperv_driver.c index 5c3c810ba5..414274fdfd 100644 --- a/src/hyperv/hyperv_driver.c +++ b/src/hyperv/hyperv_driver.c @@ -69,7 +69,7 @@ hypervGetProcessorsByName(hypervPrivate *priv, const char= *name, =20 if (!processorList) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not look up processor(s) on '%s'"), + _("Could not look up processor(s) on '%1$s'"), name); return -1; } @@ -155,7 +155,7 @@ hypervGetVirtualSystemByID(hypervPrivate *priv, int id, return -1; =20 if (*computerSystemList =3D=3D NULL) { - virReportError(VIR_ERR_NO_DOMAIN, _("No domain with ID %d"), id); + virReportError(VIR_ERR_NO_DOMAIN, _("No domain with ID %1$d"), id); return -1; } =20 @@ -179,7 +179,7 @@ hypervGetVirtualSystemByName(hypervPrivate *priv, const= char *name, =20 if (*computerSystemList =3D=3D NULL) { virReportError(VIR_ERR_NO_DOMAIN, - _("No domain with name %s"), name); + _("No domain with name %1$s"), name); return -1; } =20 @@ -250,7 +250,7 @@ hypervLookupHostSystemBiosUuid(hypervPrivate *priv, uns= igned char *uuid) =20 if (virUUIDParse(computerSystem->data->UUID, uuid) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not parse UUID from string '%s'"), + _("Could not parse UUID from string '%1$s'"), computerSystem->data->UUID); return -1; } @@ -384,7 +384,7 @@ hypervGetDeviceParentRasdFromDeviceId(const char *paren= tDeviceId, return 0; =20 virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to locate parent device with ID '%s'"), + _("Failed to locate parent device with ID '%1$s'"), parentDeviceId); =20 return -1; @@ -424,13 +424,13 @@ hypervDomainCreateSCSIController(virDomainPtr domain,= virDomainControllerDef *de if (def->model !=3D VIR_DOMAIN_CONTROLLER_MODEL_SCSI_DEFAULT && def->model !=3D VIR_DOMAIN_CONTROLLER_MODEL_SCSI_AUTO) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Unsupported SCSI controller model '%d'"), def->m= odel); + _("Unsupported SCSI controller model '%1$d'"), def-= >model); return -1; } =20 if (def->info.type !=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Unsupported SCSI controller address type '%d'"),= def->info.type); + _("Unsupported SCSI controller address type '%1$d'"= ), def->info.type); return -1; } =20 @@ -1327,7 +1327,7 @@ hypervDomainDefParseVirtualExtent(hypervPrivate *priv, disk->device =3D VIR_DOMAIN_DISK_DEVICE_FLOPPY; } else { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unrecognized controller type %d"), + _("Unrecognized controller type %1$d"), controller->data->ResourceType); goto cleanup; } @@ -1773,7 +1773,7 @@ hypervConnectOpen(virConnectPtr conn, virConnectAuthP= tr auth, =20 if (!os) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not get version information for host %s"), + _("Could not get version information for host %1$s"= ), conn->uri->server); goto cleanup; } @@ -1818,7 +1818,7 @@ hypervConnectGetVersion(virConnectPtr conn, unsigned = long *version) =20 if (hypervParseVersionString(priv->version, &major, &minor, µ) < = 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not parse version from '%s'"), + _("Could not parse version from '%1$s'"), priv->version); return -1; } @@ -1842,7 +1842,7 @@ hypervConnectGetVersion(virConnectPtr conn, unsigned = long *version) */ if (major > 99 || minor > 99 || micro > 999999) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not produce packed version number from '%s= '"), + _("Could not produce packed version number from '%1= $s'"), priv->version); return -1; } @@ -1891,7 +1891,7 @@ hypervConnectGetMaxVcpus(virConnectPtr conn, const ch= ar *type G_GNUC_UNUSED) =20 if (!processorSettingData) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not get maximum definition of Msvm_Process= orSettingData for host %s"), + _("Could not get maximum definition of Msvm_Process= orSettingData for host %1$s"), conn->uri->server); return -1; } @@ -1943,7 +1943,7 @@ hypervNodeGetInfo(virConnectPtr conn, virNodeInfoPtr = info) /* Fill struct */ if (virStrcpyStatic(info->model, processorList->data->Name) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("CPU model %s too long for destination"), + _("CPU model %1$s too long for destination"), processorList->data->Name); return -1; } @@ -2059,7 +2059,7 @@ hypervDomainLookupByName(virConnectPtr conn, const ch= ar *name) =20 if (computerSystem->next) { virReportError(VIR_ERR_MULTIPLE_DOMAINS, - _("Multiple domains exist with the name '%s': repea= t the request using a UUID"), + _("Multiple domains exist with the name '%1$s': rep= eat the request using a UUID"), name); return NULL; } @@ -2127,7 +2127,7 @@ hypervDomainShutdownFlags(virDomainPtr domain, unsign= ed int flags) if (hypervGetWmiClass(Msvm_ShutdownComponent, &shutdown) < 0 || !shutdown) { virReportError(VIR_ERR_OPERATION_FAILED, - _("Could not get Msvm_ShutdownComponent for domain = with UUID '%s'"), + _("Could not get Msvm_ShutdownComponent for domain = with UUID '%1$s'"), uuid); return -1; } @@ -2464,7 +2464,7 @@ hypervDomainScreenshot(virDomainPtr domain, temporaryDirectory =3D "/tmp"; temporaryFile =3D g_strdup_printf("%s/libvirt.hyperv.screendump.XXXXXX= ", temporaryDirectory); if ((fd =3D g_mkstemp_full(temporaryFile, O_RDWR | O_CLOEXEC, S_IRUSR = | S_IWUSR)) =3D=3D -1) { - virReportSystemError(errno, _("g_mkstemp(\"%s\") failed"), tempora= ryFile); + virReportSystemError(errno, _("g_mkstemp(\"%1$s\") failed"), tempo= raryFile); goto cleanup; } unlinkTemporaryFile =3D true; @@ -2705,7 +2705,7 @@ hypervDomainGetXMLDesc(virDomainPtr domain, unsigned = int flags) =20 if (virUUIDParse(computerSystem->data->Name, def->uuid) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not parse UUID from string '%s'"), + _("Could not parse UUID from string '%1$s'"), computerSystem->data->Name); return NULL; } @@ -2928,7 +2928,7 @@ hypervDomainDefineXML(virConnectPtr conn, const char = *xml) if ((domain =3D hypervDomainLookupByUUID(conn, def->uuid))) { char uuid_string[VIR_UUID_STRING_BUFLEN]; virUUIDFormat(domain->uuid, uuid_string); - virReportError(VIR_ERR_DOM_EXIST, _("Domain already exists with UU= ID '%s'"), uuid_string); + virReportError(VIR_ERR_DOM_EXIST, _("Domain already exists with UU= ID '%1$s'"), uuid_string); =20 // Don't use the 'exit' label, since we don't want to delete the e= xisting domain. virObjectUnref(domain); @@ -2978,7 +2978,7 @@ hypervDomainDefineXML(virConnectPtr conn, const char = *xml) /* Attach serials */ for (i =3D 0; i < def->nserials; i++) { if (hypervDomainAttachSerial(domain, def->serials[i]) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, _("Could not attach ser= ial port %zu"), i); + virReportError(VIR_ERR_INTERNAL_ERROR, _("Could not attach ser= ial port %1$zu"), i); goto error; } } @@ -2986,7 +2986,7 @@ hypervDomainDefineXML(virConnectPtr conn, const char = *xml) /* Attach networks */ for (i =3D 0; i < def->nnets; i++) { if (hypervDomainAttachSyntheticEthernetAdapter(domain, def->nets[i= ], hostname) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, _("Could not attach net= work %zu"), i); + virReportError(VIR_ERR_INTERNAL_ERROR, _("Could not attach net= work %1$zu"), i); goto error; } } @@ -3133,7 +3133,7 @@ hypervDomainAttachDeviceFlags(virDomainPtr domain, co= nst char *xml, unsigned int case VIR_DOMAIN_DEVICE_AUDIO: case VIR_DOMAIN_DEVICE_CRYPTO: virReportError(VIR_ERR_INTERNAL_ERROR, - _("Attaching devices of type %d is not implemented"= ), dev->type); + _("Attaching devices of type %1$d is not implemente= d"), dev->type); return -1; } =20 @@ -3290,7 +3290,7 @@ hypervNodeGetFreeMemory(virConnectPtr conn) =20 if (!operatingSystem) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not get free memory for host %s"), + _("Could not get free memory for host %1$s"), conn->uri->server); return 0; } @@ -3732,7 +3732,7 @@ hypervDebugHandler(const char *message, debug_level_e= level, case DEBUG_LEVEL_ERROR: case DEBUG_LEVEL_CRITICAL: case DEBUG_LEVEL_ALWAYS: - VIR_ERROR(_("openwsman: %s"), message); + VIR_ERROR(_("openwsman: %1$s"), message); break; =20 case DEBUG_LEVEL_WARNING: diff --git a/src/hyperv/hyperv_network_driver.c b/src/hyperv/hyperv_network= _driver.c index a794a681b5..eefcaf05f6 100644 --- a/src/hyperv/hyperv_network_driver.c +++ b/src/hyperv/hyperv_network_driver.c @@ -40,7 +40,7 @@ hypervMsvmVirtualSwitchToNetwork(virConnectPtr conn, Msvm= _VirtualEthernetSwitch =20 if (virUUIDParse(virtualSwitch->data->Name, uuid) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not parse UUID from string '%s'"), + _("Could not parse UUID from string '%1$s'"), virtualSwitch->data->Name); return NULL; } @@ -64,7 +64,7 @@ hypervNetworkLookup(virConnectPtr conn, const char *prope= rty, const char *value) =20 if (!virtualSwitch) { virReportError(VIR_ERR_NO_NETWORK, - _("No network found with property '%s' =3D '%s'"), = property, value); + _("No network found with property '%1$s' =3D '%2$s'= "), property, value); return NULL; } =20 diff --git a/src/hyperv/hyperv_util.c b/src/hyperv/hyperv_util.c index fe71e47285..37a1b1a249 100644 --- a/src/hyperv/hyperv_util.c +++ b/src/hyperv/hyperv_util.c @@ -55,8 +55,7 @@ hypervParseUri(hypervParsedUri **parsedUri, virURI *uri) if (STRNEQ((*parsedUri)->transport, "http") && STRNEQ((*parsedUri)->transport, "https")) { virReportError(VIR_ERR_INVALID_ARG, - _("Query parameter 'transport' has unexpect= ed value " - "'%s' (should be http|https)"), + _("Query parameter 'transport' has unexpect= ed value '%1$s' (should be http|https)"), (*parsedUri)->transport); goto cleanup; } diff --git a/src/hyperv/hyperv_wmi.c b/src/hyperv/hyperv_wmi.c index 7dac5c46d1..8bc376e22f 100644 --- a/src/hyperv/hyperv_wmi.c +++ b/src/hyperv/hyperv_wmi.c @@ -70,7 +70,7 @@ hypervVerifyResponse(WsManClient *client, WsXmlDocH respo= nse, =20 if (lastError !=3D WS_LASTERR_OK) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Transport error during %s: %s (%d)"), + _("Transport error during %1$s: %2$s (%3$d)"), detail, wsman_transport_get_last_error_string(lastE= rror), lastError); return -1; @@ -80,14 +80,14 @@ hypervVerifyResponse(WsManClient *client, WsXmlDocH res= ponse, * 400 (Bad Request) or 500 (Internal Server Error) */ if (responseCode !=3D 200 && responseCode !=3D 400 && responseCode != =3D 500) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unexpected HTTP response during %s: %d"), + _("Unexpected HTTP response during %1$s: %2$d"), detail, responseCode); return -1; } =20 if (response =3D=3D NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Empty response during %s"), detail); + _("Empty response during %1$s"), detail); return -1; } =20 @@ -98,8 +98,7 @@ hypervVerifyResponse(WsManClient *client, WsXmlDocH respo= nse, wsmc_get_fault_data(response, fault); =20 virReportError(VIR_ERR_INTERNAL_ERROR, - _("SOAP fault during %s: code '%s', subcode '%s', " - "reason '%s', detail '%s'"), + _("SOAP fault during %1$s: code '%2$s', subcode '%3= $s', reason '%4$s', detail '%5$s'"), detail, NULLSTR(fault->code), NULLSTR(fault->subcod= e), NULLSTR(fault->reason), NULLSTR(fault->fault_detail= )); =20 @@ -556,7 +555,7 @@ hypervSerializeEmbeddedParam(hypervParam *p, const char= *resourceUri, =20 if (!(xmlNodeParam =3D ws_xml_add_child(*methodNode, resourceUri, p->e= mbedded.name, NULL))) { - virReportError(VIR_ERR_INTERNAL_ERROR, _("Could not add child node= %s"), + virReportError(VIR_ERR_INTERNAL_ERROR, _("Could not add child node= %1$s"), p->embedded.name); return -1; } @@ -780,11 +779,11 @@ hypervInvokeMethod(hypervPrivate *priv, =20 if (faultReason) virReportError(VIR_ERR_INTERNAL_ERROR, - _("WS-Management fault during %s invocation: %s= "), + _("WS-Management fault during %1$s invocation: = %2$s"), params->method, faultReason); else virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not get return value for %s invocation= "), + _("Could not get return value for %1$s invocati= on"), params->method); =20 return -1; @@ -801,7 +800,7 @@ hypervInvokeMethod(hypervPrivate *priv, instanceID =3D ws_xml_get_xpath_value(response, jobcode_instance_x= path); if (!instanceID) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not get instance ID for %s invocation"= ), + _("Could not get instance ID for %1$s invocatio= n"), params->method); return -1; } @@ -854,11 +853,11 @@ hypervInvokeMethod(hypervPrivate *priv, } if (!completed && timeout < 0) { virReportError(VIR_ERR_OPERATION_TIMEOUT, - _("Timeout waiting for %s invocation"), params-= >method); + _("Timeout waiting for %1$s invocation"), param= s->method); return -1; } } else if (returnCode !=3D CIM_RETURNCODE_COMPLETED_WITH_NO_ERROR) { - virReportError(VIR_ERR_INTERNAL_ERROR, _("Invocation of %s returne= d an error: %s (%d)"), + virReportError(VIR_ERR_INTERNAL_ERROR, _("Invocation of %1$s retur= ned an error: %2$s (%3$d)"), params->method, hypervReturnCodeToString(returnCode= ), returnCode); return -1; @@ -1155,14 +1154,14 @@ hypervInvokeMsvmComputerSystemRequestStateChange(vi= rDomainPtr domain, =20 if (returnValue =3D=3D NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not lookup %s for %s invocation"), + _("Could not lookup %1$s for %2$s invocation"), "ReturnValue", "RequestStateChange"); return -1; } =20 if (virStrToLong_i(returnValue, NULL, 10, &returnCode) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not parse return code from '%s'"), returnV= alue); + _("Could not parse return code from '%1$s'"), retur= nValue); return -1; } =20 @@ -1172,7 +1171,7 @@ hypervInvokeMsvmComputerSystemRequestStateChange(virD= omainPtr domain, =20 if (instanceID =3D=3D NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not lookup %s for %s invocation"), + _("Could not lookup %1$s for %2$s invocation"), "InstanceID", "RequestStateChange"); return -1; } @@ -1189,7 +1188,7 @@ hypervInvokeMsvmComputerSystemRequestStateChange(virD= omainPtr domain, =20 if (concreteJob =3D=3D NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not lookup %s for %s invocation"), + _("Could not lookup %1$s for %2$s invocatio= n"), "Msvm_ConcreteJob", "RequestStateChange"); return -1; } @@ -1214,20 +1213,20 @@ hypervInvokeMsvmComputerSystemRequestStateChange(vi= rDomainPtr domain, case MSVM_CONCRETEJOB_JOBSTATE_EXCEPTION: case MSVM_CONCRETEJOB_JOBSTATE_SERVICE: virReportError(VIR_ERR_INTERNAL_ERROR, - _("Concrete job for %s invocation is in err= or state"), + _("Concrete job for %1$s invocation is in e= rror state"), "RequestStateChange"); return -1; =20 default: virReportError(VIR_ERR_INTERNAL_ERROR, - _("Concrete job for %s invocation is in unk= nown state"), + _("Concrete job for %1$s invocation is in u= nknown state"), "RequestStateChange"); return -1; } } } else if (returnCode !=3D CIM_RETURNCODE_COMPLETED_WITH_NO_ERROR) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Invocation of %s returned an error: %s (%d)"), + _("Invocation of %1$s returned an error: %2$s (%3$d= )"), "RequestStateChange", hypervReturnCodeToString(retu= rnCode), returnCode); return -1; @@ -1330,7 +1329,7 @@ hypervMsvmComputerSystemToDomain(virConnectPtr conn, =20 if (virUUIDParse(computerSystem->data->Name, uuid) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not parse UUID from string '%s'"), + _("Could not parse UUID from string '%1$s'"), computerSystem->data->Name); return -1; } @@ -1364,7 +1363,7 @@ hypervMsvmComputerSystemFromUUID(hypervPrivate *priv,= const char *uuid, return -1; =20 if (!*computerSystem) { - virReportError(VIR_ERR_NO_DOMAIN, _("No domain with UUID %s"), uui= d); + virReportError(VIR_ERR_NO_DOMAIN, _("No domain with UUID %1$s"), u= uid); return -1; } =20 @@ -1429,7 +1428,7 @@ hypervGetResourceAllocationSD(hypervPrivate *priv, =20 if (!*data) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not look up resource allocation setting da= ta with virtual system instance ID '%s'"), + _("Could not look up resource allocation setting da= ta with virtual system instance ID '%1$s'"), id); return -1; } @@ -1447,7 +1446,7 @@ hypervGetProcessorSD(hypervPrivate *priv, =20 if (!*data) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not look up processor setting data with vi= rtual system instance ID '%s'"), + _("Could not look up processor setting data with vi= rtual system instance ID '%1$s'"), id); return -1; } --=20 2.39.2