From nobody Sun Feb 8 16:40:16 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=1678465004; cv=none; d=zohomail.com; s=zohoarc; b=mr74GBXAtBcS05uMKZqjKG6zpHZZ+gEZS/5Qo4LwkHcfcPewKQaT+Y3lNWvtbSepWg29XYoI0Z3MQ/kH15NS8p9udXLcNTsK4IAbJv2Yzet3hl9PwRiDtUXbkZNfb3qy+5KzS8hEkfqWpMbGJkMhUHuiXCuZA29pcDjkMDrxXX4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1678465004; 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=IdPjxOErqmfkZ8EV4vuzmhVXPX7ULUIrxIDaPUEIOos=; b=FgloI6shn1rPp3Adg8x8Cq1lyYtqesU7V2Liai/kkLJsoJDIuKkovUV35R/IYVcC8CdRjDqRou00wFx530nOuuaItiQ6i41rsqHpX2xnrhf4+QSEIlaKGH23IkMlsh82UOKN2Evk0rFPIQ10JL7oJpJA4DhDdvsmzZJxGr7ITiY= 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 1678465004342147.96043854353388; Fri, 10 Mar 2023 08:16:44 -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-589-rXvjxMJONA2mx3Gv4OPPQw-1; Fri, 10 Mar 2023 11:11:40 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 6EDD6884369; Fri, 10 Mar 2023 16:10:47 +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 58D162026D4B; Fri, 10 Mar 2023 16:10:47 +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 47A8019472CA; Fri, 10 Mar 2023 16:10:47 +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 8CEF519472D1 for ; Fri, 10 Mar 2023 16:10:44 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 94FE14051E44; Fri, 10 Mar 2023 16:10:43 +0000 (UTC) Received: from rein.int.mamuti.net (unknown [10.45.226.138]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3AA8C4051E4A for ; Fri, 10 Mar 2023 16:10:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678465003; 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=IdPjxOErqmfkZ8EV4vuzmhVXPX7ULUIrxIDaPUEIOos=; b=Qfpry5OE/51qOqKO+oZt7ZMHwUEj0Os/f8E4URejttbNptyiES/zsWeAVLvk9qSmQOPbCJ GSLwT0YqKGeSCTtVuhfNXg2Zb4+N90ur8OALUwEDKT50xcD3Ozwort2ab59hjUtkkHnUZZ i9PinR2OCqVirsGhlVY8BYi8K76niM8= X-MC-Unique: rXvjxMJONA2mx3Gv4OPPQw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Jiri Denemark To: libvir-list@redhat.com Subject: [libvirt PATCH 23/51] openvz: Update format strings in translated messages Date: Fri, 10 Mar 2023 17:09:39 +0100 Message-Id: <4895d5bbbed401e4baa6bac7a573ebd41d1b5fd8.1678463799.git.jdenemar@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 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 3.1 on 10.11.54.4 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: 1678465005145100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Jiri Denemark --- src/openvz/openvz_conf.c | 29 +++++++++++++------------ src/openvz/openvz_driver.c | 43 +++++++++++++++++++------------------- 2 files changed, 35 insertions(+), 37 deletions(-) diff --git a/src/openvz/openvz_conf.c b/src/openvz/openvz_conf.c index c28d0e9f43..1331860a82 100644 --- a/src/openvz/openvz_conf.c +++ b/src/openvz/openvz_conf.c @@ -174,7 +174,7 @@ openvzReadNetworkConf(virDomainDef *def, ret =3D openvzReadVPSConfigParam(veid, "IP_ADDRESS", &temp); if (ret < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not read 'IP_ADDRESS' from config for cont= ainer %d"), + _("Could not read 'IP_ADDRESS' from config for cont= ainer %1$d"), veid); goto error; } else if (ret > 0) { @@ -200,7 +200,7 @@ openvzReadNetworkConf(virDomainDef *def, ret =3D openvzReadVPSConfigParam(veid, "NETIF", &temp); if (ret < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not read 'NETIF' from config for container= %d"), + _("Could not read 'NETIF' from config for container= %1$d"), veid); goto error; } else if (ret > 0) { @@ -283,7 +283,7 @@ openvzReadFSConf(virDomainDef *def, ret =3D openvzReadVPSConfigParam(veid, "OSTEMPLATE", &temp); if (ret < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not read 'OSTEMPLATE' from config for cont= ainer %d"), + _("Could not read 'OSTEMPLATE' from config for cont= ainer %1$d"), veid); goto error; } else if (ret > 0) { @@ -297,7 +297,7 @@ openvzReadFSConf(virDomainDef *def, ret =3D openvzReadVPSConfigParam(veid, "VE_PRIVATE", &temp); if (ret <=3D 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not read 'VE_PRIVATE' from config for = container %d"), + _("Could not read 'VE_PRIVATE' from config for = container %1$d"), veid); goto error; } @@ -319,7 +319,7 @@ openvzReadFSConf(virDomainDef *def, if (ret > 0) { if (openvzParseBarrierLimit(temp, &barrier, &limit)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not read '%s' from config for containe= r %d"), + _("Could not read '%1$s' from config for contai= ner %2$d"), param, veid); goto error; } else { @@ -365,15 +365,15 @@ openvzReadMemConf(virDomainDef *def, int veid) ret =3D openvzReadVPSConfigParam(veid, param, &temp); if (ret < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not read '%s' from config for container %d= "), + _("Could not read '%1$s' from config for container = %2$d"), param, veid); goto error; } else if (ret > 0) { ret =3D openvzParseBarrierLimit(temp, &barrier, NULL); if (ret < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not parse barrier of '%s' " - "from config for container %d"), param, veid); + _("Could not parse barrier of '%1$s' from confi= g for container %2$d"), + param, veid); goto error; } if (barrier =3D=3D LONG_MAX) @@ -387,15 +387,15 @@ openvzReadMemConf(virDomainDef *def, int veid) ret =3D openvzReadVPSConfigParam(veid, param, &temp); if (ret < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not read '%s' from config for container %d= "), + _("Could not read '%1$s' from config for container = %2$d"), param, veid); goto error; } else if (ret > 0) { ret =3D openvzParseBarrierLimit(temp, &barrier, &limit); if (ret < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not parse barrier and limit of '%s' " - "from config for container %d"), param, veid); + _("Could not parse barrier and limit of '%1$s' = from config for container %2$d"), + param, veid); goto error; } if (barrier =3D=3D LONG_MAX) @@ -490,7 +490,7 @@ int openvzLoadDomains(struct openvz_driver *driver) ret =3D openvzReadVPSConfigParam(veid, "CPUS", &temp); if (ret < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not read config for container %d"), + _("Could not read config for container %1$d"), veid); return -1; } else if (ret > 0) { @@ -860,7 +860,7 @@ openvzGetVPSUUID(int vpsid, char *uuidstr, size_t len) if (iden !=3D NULL && uuidbuf !=3D NULL && STREQ(iden, "#UUID:")) { if (virStrcpy(uuidstr, uuidbuf, len) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("invalid uuid %s"), uuidbuf); + _("invalid uuid %1$s"), uuidbuf); goto cleanup; } break; @@ -1034,8 +1034,7 @@ openvzDomainDeviceDefPostParse(virDomainDeviceDef *de= v, if (dev->type =3D=3D VIR_DOMAIN_DEVICE_HOSTDEV && dev->data.hostdev->mode =3D=3D VIR_DOMAIN_HOSTDEV_MODE_CAPABILITIE= S) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("hostdev mode 'capabilities' is not " - "supported in %s"), + _("hostdev mode 'capabilities' is not supported in = %1$s"), virDomainVirtTypeToString(def->virtType)); return -1; } diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c index 5c18f5238b..69e4c9899b 100644 --- a/src/openvz/openvz_driver.c +++ b/src/openvz/openvz_driver.c @@ -79,7 +79,7 @@ openvzDomObjFromDomainLocked(struct openvz_driver *driver, virUUIDFormat(uuid, uuidstr); =20 virReportError(VIR_ERR_NO_DOMAIN, - _("no domain with matching uuid '%s'"), uuidstr); + _("no domain with matching uuid '%1$s'"), uuidstr); return NULL; } =20 @@ -235,7 +235,7 @@ openvzDomainGetHostname(virDomainPtr dom, unsigned int = flags) /* vzlist prints an unset hostname as '-' */ if (STREQ(hostname, "-")) { virReportError(VIR_ERR_OPERATION_FAILED, - _("Hostname of '%s' is unset"), vm->def->name); + _("Hostname of '%1$s' is unset"), vm->def->name); VIR_FREE(hostname); } =20 @@ -258,7 +258,7 @@ static virDomainPtr openvzDomainLookupByID(virConnectPt= r conn, =20 if (!vm) { virReportError(VIR_ERR_NO_DOMAIN, - _("no domain with matching id '%d'"), id); + _("no domain with matching id '%1$d'"), id); goto cleanup; } =20 @@ -330,7 +330,7 @@ static virDomainPtr openvzDomainLookupByName(virConnect= Ptr conn, =20 if (!vm) { virReportError(VIR_ERR_NO_DOMAIN, - _("no domain with matching name '%s'"), name); + _("no domain with matching name '%1$s'"), name); goto cleanup; } =20 @@ -361,7 +361,7 @@ static int openvzDomainGetInfo(virDomainPtr dom, } else { if (openvzGetProcessInfo(&(info->cpuTime), dom->id) < 0) { virReportError(VIR_ERR_OPERATION_FAILED, - _("cannot read cputime for domain %d"), dom->id= ); + _("cannot read cputime for domain %1$d"), dom->= id); goto cleanup; } } @@ -969,7 +969,7 @@ openvzDomainCreateWithFlags(virDomainPtr dom, unsigned = int flags) =20 if (!vm) { virReportError(VIR_ERR_NO_DOMAIN, - _("no domain with matching name '%s'"), dom->name); + _("no domain with matching name '%1$s'"), dom->name= ); goto cleanup; } =20 @@ -1106,7 +1106,7 @@ static int openvzConnectGetMaxVcpus(virConnectPtr con= n G_GNUC_UNUSED, return 1028; /* OpenVZ has no limitation */ =20 virReportError(VIR_ERR_INVALID_ARG, - _("unknown type '%s'"), type); + _("unknown type '%1$s'"), type); return -1; } =20 @@ -1116,7 +1116,7 @@ openvzDomainGetVcpusFlags(virDomainPtr dom G_GNUC_UNU= SED, { if (flags !=3D (VIR_DOMAIN_AFFECT_LIVE | VIR_DOMAIN_VCPU_MAXIMUM)) { virReportError(VIR_ERR_INVALID_ARG, - _("unsupported flags (0x%x)"), flags); + _("unsupported flags (0x%1$x)"), flags); return -1; } =20 @@ -1166,7 +1166,7 @@ static int openvzDomainSetVcpusFlags(virDomainPtr dom= , unsigned int nvcpus, =20 if (flags !=3D VIR_DOMAIN_AFFECT_LIVE) { virReportError(VIR_ERR_INVALID_ARG, - _("unsupported flags (0x%x)"), flags); + _("unsupported flags (0x%1$x)"), flags); return -1; } =20 @@ -1225,7 +1225,7 @@ static virDrvOpenStatus openvzConnectOpen(virConnectP= tr conn, /* If path isn't /system, then they typoed, so tell them correct path = */ if (STRNEQ(conn->uri->path, "/system")) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unexpected OpenVZ URI path '%s', try openvz:///s= ystem"), + _("unexpected OpenVZ URI path '%1$s', try openvz://= /system"), conn->uri->path); return VIR_DRV_OPEN_ERROR; } @@ -1330,7 +1330,7 @@ static int openvzConnectListDomains(virConnectPtr con= n G_GNUC_UNUSED, break; if (virStrToLong_i(buf, &endptr, 10, &veid) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not parse VPS ID %s"), buf); + _("Could not parse VPS ID %1$s"), buf); continue; } ids[got++] =3D veid; @@ -1378,7 +1378,7 @@ static int openvzConnectListDefinedDomains(virConnect= Ptr conn G_GNUC_UNUSED, break; if (virStrToLong_i(buf, &endptr, 10, &veid) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not parse VPS ID %s"), buf); + _("Could not parse VPS ID %1$s"), buf); continue; } g_snprintf(vpsname, sizeof(vpsname), "%d", veid); @@ -1502,14 +1502,14 @@ openvzDomainGetBarrierLimit(virDomainPtr domain, virSkipSpaces(&tmp); if (virStrToLong_ull(tmp, &endp, 10, barrier) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Can't parse limit from vzlist output '%s'"), out= put); + _("Can't parse limit from vzlist output '%1$s'"), o= utput); return -1; } tmp =3D endp; virSkipSpaces(&tmp); if (virStrToLong_ull(tmp, &endp, 10, limit) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Can't parse barrier from vzlist output '%s'"), o= utput); + _("Can't parse barrier from vzlist output '%1$s'"),= output); return -1; } =20 @@ -1528,7 +1528,7 @@ openvzDomainSetBarrierLimit(virDomainPtr domain, /* LONG_MAX indicates unlimited so reject larger values */ if (barrier > LONG_MAX || limit > LONG_MAX) { virReportError(VIR_ERR_OPERATION_FAILED, - _("Failed to set %s for %s: value too large"), para= m, + _("Failed to set %1$s for %2$s: value too large"), = param, domain->name); return -1; } @@ -1748,7 +1748,7 @@ openvzUpdateDevice(virDomainDef *vmdef, =20 if (pos < 0) { virReportError(VIR_ERR_INVALID_ARG, - _("target %s doesn't exist."), fs->dst); + _("target %1$s doesn't exist."), fs->dst); return -1; } cur =3D vmdef->fss[pos]; @@ -1770,7 +1770,7 @@ openvzUpdateDevice(virDomainDef *vmdef, cur->space_soft_limit =3D fs->space_soft_limit; } else { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Can't modify device type '%s'"), + _("Can't modify device type '%1$s'"), virDomainDeviceTypeToString(dev->type)); return -1; } @@ -1917,7 +1917,7 @@ openvzConnectSupportsFeature(virConnectPtr conn G_GNU= C_UNUSED, int feature) case VIR_DRV_FEATURE_NETWORK_UPDATE_HAS_CORRECT_ORDER: case VIR_DRV_FEATURE_FD_PASSING: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Global feature %d should have already been handl= ed"), + _("Global feature %1$d should have already been han= dled"), feature); return -1; case VIR_DRV_FEATURE_MIGRATION_PARAMS: @@ -2044,14 +2044,14 @@ openvzDomainMigratePrepare3Params(virConnectPtr dco= nn, =20 if (uri =3D=3D NULL) { virReportError(VIR_ERR_INVALID_ARG, - _("unable to parse URI: %s"), + _("unable to parse URI: %1$s"), uri_in); goto error; } =20 if (uri->server =3D=3D NULL) { virReportError(VIR_ERR_INVALID_ARG, - _("missing host in migration URI: %s"), + _("missing host in migration URI: %1$s"), uri_in); goto error; } @@ -2157,8 +2157,7 @@ openvzDomainMigrateFinish3Params(virConnectPtr dconn, !(vm =3D virDomainObjListFindByName(driver->domains, dname))) { /* Migration obviously failed if the domain doesn't exist */ virReportError(VIR_ERR_OPERATION_FAILED, - _("Migration failed. No domain on destination host " - "with matching name '%s'"), + _("Migration failed. No domain on destination host = with matching name '%1$s'"), NULLSTR(dname)); goto cleanup; } --=20 2.39.2