From nobody Fri Dec 19 06:21:02 2025 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=1678464633; cv=none; d=zohomail.com; s=zohoarc; b=HheyN3LCnyaUV+5KuoHxRQ28jaqlMvyYP/5mKZoPd4sO1LtteuGFD9UzEtQTLVXKz8J6MiVCaFvsllCXeu2vru/gq28RCcU7MaE2Fo1SX+6YgX7LMdnwBc1ufRbiT5ZmNRsasxXghh8QVhKpChluSVjdHCxPqvIcXLfftVGgEyI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1678464633; 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=+++Zws+XEt5D7RAvMmjBvdX8DNBNtgmESDdhBU75M7c=; b=SeS32qCahnsbvCN5eKPFwQwxKNhTDz8tgIfl509pQdmRcAXHnC6Lki2Z2IDbEl0w0nuolCUBNjJ7eyLobsu5P4Jlo/+j6YEbg6YkYF1sEvF5TNrGjkxyXJCHBsY37j2KvyWoqHn3cVNQGAihLrzC2X662DGjaue0NfNm0DLsbYw= 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 1678464633094790.4846439349274; Fri, 10 Mar 2023 08:10:33 -0800 (PST) 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-373-T8jvP13LNveuq4fS9JmUIw-1; Fri, 10 Mar 2023 11:10:29 -0500 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 97F821C0896E; Fri, 10 Mar 2023 16:10:22 +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 7FA5340C945A; Fri, 10 Mar 2023 16:10:22 +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 605B11946A6F; Fri, 10 Mar 2023 16:10:22 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 62A111946A4A for ; Fri, 10 Mar 2023 16:10:21 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 55AC32166B2B; Fri, 10 Mar 2023 16:10:21 +0000 (UTC) Received: from rein.int.mamuti.net (unknown [10.45.226.138]) by smtp.corp.redhat.com (Postfix) with ESMTP id F03882166B26 for ; Fri, 10 Mar 2023 16:10:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678464632; 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=+++Zws+XEt5D7RAvMmjBvdX8DNBNtgmESDdhBU75M7c=; b=QI0zK5AwDuEl1yzcr4Wt05JF2rYdpVM9O/1y154P02DCS1hBUKjmrhOXNBajiyrKvGWr3H 89vK3MpuoWb4S5PZBBDrt0gH/EVmd97d45oHjpkMQ726PPZ1O4dhJPYzEXQ8J+XE2g8uq5 yNqE5/H5FJOgEHvGp4artPOsyQBO4I4= X-MC-Unique: T8jvP13LNveuq4fS9JmUIw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Jiri Denemark To: libvir-list@redhat.com Subject: [libvirt PATCH 05/51] ch: Update format strings in translated messages Date: Fri, 10 Mar 2023 17:09:21 +0100 Message-Id: <83c567e3c6529185b3185c533d84ec12b4184071.1678463799.git.jdenemar@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 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: 1678464634703100007 Content-Type: text/plain; charset="utf-8" Signed-off-by: Jiri Denemark --- src/ch/ch_conf.c | 2 +- src/ch/ch_domain.c | 4 ++-- src/ch/ch_driver.c | 20 ++++++++++---------- src/ch/ch_monitor.c | 27 ++++++++++++++------------- src/ch/ch_process.c | 6 +++--- 5 files changed, 30 insertions(+), 29 deletions(-) diff --git a/src/ch/ch_conf.c b/src/ch/ch_conf.c index 0d07fa270c..2bb2eaf820 100644 --- a/src/ch/ch_conf.c +++ b/src/ch/ch_conf.c @@ -202,7 +202,7 @@ chExtractVersion(virCHDriver *driver) =20 if (virStringParseVersion(&version, tmp, true) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to parse cloud-hypervisor version: %s"), = tmp); + _("Unable to parse cloud-hypervisor version: %1$s")= , tmp); return -1; } =20 diff --git a/src/ch/ch_domain.c b/src/ch/ch_domain.c index cf98654479..35e3471cba 100644 --- a/src/ch/ch_domain.c +++ b/src/ch/ch_domain.c @@ -176,7 +176,7 @@ chValidateDomainDeviceDef(const virDomainDeviceDef *dev, case VIR_DOMAIN_DEVICE_AUDIO: case VIR_DOMAIN_DEVICE_CRYPTO: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Cloud-Hypervisor doesn't support '%s' device"), + _("Cloud-Hypervisor doesn't support '%1$s' device"), virDomainDeviceTypeToString(dev->type)); return -1; =20 @@ -340,7 +340,7 @@ virCHDomainObjFromDomain(virDomainPtr domain) if (!vm) { virUUIDFormat(domain->uuid, uuidstr); virReportError(VIR_ERR_NO_DOMAIN, - _("no domain with matching uuid '%s' (%s)"), + _("no domain with matching uuid '%1$s' (%2$s)"), uuidstr, domain->name); return NULL; } diff --git a/src/ch/ch_driver.c b/src/ch/ch_driver.c index 12fbe31c24..72fe3198b2 100644 --- a/src/ch/ch_driver.c +++ b/src/ch/ch_driver.c @@ -631,7 +631,7 @@ static virDomainPtr chDomainLookupByID(virConnectPtr co= nn, =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 @@ -656,7 +656,7 @@ static virDomainPtr chDomainLookupByName(virConnectPtr = 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 @@ -683,7 +683,7 @@ static virDomainPtr chDomainLookupByUUID(virConnectPtr = conn, char uuidstr[VIR_UUID_STRING_BUFLEN]; virUUIDFormat(uuid, uuidstr); virReportError(VIR_ERR_NO_DOMAIN, - _("no domain with matching uuid '%s'"), uuidstr); + _("no domain with matching uuid '%1$s'"), uuidstr); goto cleanup; } =20 @@ -817,14 +817,14 @@ chDomainOpenConsole(virDomainPtr dom, } =20 if (!chr) { - virReportError(VIR_ERR_INTERNAL_ERROR, _("cannot find character = device %s"), + virReportError(VIR_ERR_INTERNAL_ERROR, _("cannot find character = device %1$s"), NULLSTR(dev_name)); goto cleanup; } =20 if (chr->source->type !=3D VIR_DOMAIN_CHR_TYPE_PTY) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("character device %s is not using a PTY"), + _("character device %1$s is not using a PTY"), dev_name ? dev_name : NULLSTR(chr->info.alias)); goto cleanup; } @@ -930,7 +930,7 @@ chConnectSupportsFeature(virConnectPtr conn, 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 h= andled"), + _("Global feature %1$d should have already been= handled"), feature); return -1; case VIR_DRV_FEATURE_MIGRATION_V2: @@ -1158,7 +1158,7 @@ chDomainPinVcpuLive(virDomainObj *vm, =20 if (!(vcpuinfo =3D virDomainDefGetVcpu(def, vcpu))) { virReportError(VIR_ERR_INVALID_ARG, - _("vcpu %d is out of range of live cpu count %d"), + _("vcpu %1$d is out of range of live cpu count %2$d= "), vcpu, virDomainDefGetVcpusMax(def)); return -1; } @@ -1228,7 +1228,7 @@ chDomainPinVcpuFlags(virDomainPtr dom, if (persistentDef && !(vcpuinfo =3D virDomainDefGetVcpu(persistentDef, vcpu))) { virReportError(VIR_ERR_INVALID_ARG, - _("vcpu %d is out of range of persistent cpu count = %d"), + _("vcpu %1$d is out of range of persistent cpu coun= t %2$d"), vcpu, virDomainDefGetVcpus(persistentDef)); goto endjob; } @@ -1609,7 +1609,7 @@ chDomainSetNumaParameters(virDomainPtr dom, =20 if (mode < 0 || mode >=3D VIR_DOMAIN_NUMATUNE_MEM_LAST) { virReportError(VIR_ERR_INVALID_ARG, - _("unsupported numatune mode: '%d'"), mode); + _("unsupported numatune mode: '%1$d'"), mod= e); goto cleanup; } =20 @@ -1620,7 +1620,7 @@ chDomainSetNumaParameters(virDomainPtr dom, =20 if (virBitmapIsAllClear(nodeset)) { virReportError(VIR_ERR_OPERATION_INVALID, - _("Invalid nodeset of 'numatune': %s"), + _("Invalid nodeset of 'numatune': %1$s"), param->value.s); goto cleanup; } diff --git a/src/ch/ch_monitor.c b/src/ch/ch_monitor.c index 7b8f0a8077..d902bc6959 100644 --- a/src/ch/ch_monitor.c +++ b/src/ch/ch_monitor.c @@ -176,7 +176,8 @@ virCHMonitorBuildDiskJson(virJSONValue *disks, virDomai= nDiskDef *diskdef) } if (diskdef->bus !=3D VIR_DOMAIN_DISK_BUS_VIRTIO) { virReportError(VIR_ERR_INVALID_ARG, - _("Only virtio bus types are supported for '%s'= "), diskdef->src->path); + _("Only virtio bus types are supported for '%1$= s'"), + diskdef->src->path); return -1; } if (virJSONValueObjectAppendString(disk, "path", diskdef->src->pat= h) < 0) @@ -253,7 +254,7 @@ virCHMonitorBuildNetJson(virJSONValue *nets, =20 if (virSocketAddrPrefixToNetmask(ip->prefix, &netmask, AF_= INET) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to translate net prefix %d to= netmask"), + _("Failed to translate net prefix %1$d = to netmask"), ip->prefix); return -1; } @@ -331,7 +332,7 @@ virCHMonitorBuildNetJson(virJSONValue *nets, if (netdef->driver.virtio.rx_queue_size || netdef->driver.virtio.tx_qu= eue_size) { if (netdef->driver.virtio.rx_queue_size !=3D netdef->driver.virtio= .tx_queue_size) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("virtio rx_queue_size option %d is not same with tx_queue= _size %d"), + _("virtio rx_queue_size option %1$d is not same with tx_que= ue_size %2$d"), netdef->driver.virtio.rx_queue_size, netdef->driver.virtio.tx_queue_size); return -1; @@ -388,7 +389,7 @@ virCHMonitorBuildDeviceJson(virJSONValue *devices, path =3D g_strdup_printf("/sys/bus/pci/devices/%s/", name); if (!virFileExists(path)) { virReportError(VIR_ERR_DEVICE_MISSING, - _("host pci device %s not found"), path); + _("host pci device %1$s not found"), path); return -1; } if (virJSONValueObjectAppendString(device, "path", path) < 0) @@ -481,28 +482,28 @@ chMonitorCreateSocket(const char *socket_path) addr.sun_family =3D AF_UNIX; if (virStrcpyStatic(addr.sun_path, socket_path) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("UNIX socket path '%s' too long"), + _("UNIX socket path '%1$s' too long"), socket_path); goto error; } =20 if (unlink(socket_path) < 0 && errno !=3D ENOENT) { virReportSystemError(errno, - _("Unable to unlink %s"), + _("Unable to unlink %1$s"), socket_path); goto error; } =20 if (bind(fd, (struct sockaddr *)&addr, addrlen) < 0) { virReportSystemError(errno, - _("Unable to bind to UNIX socket path '%s'"), + _("Unable to bind to UNIX socket path '%1$s'"= ), socket_path); goto error; } =20 if (listen(fd, 1) < 0) { virReportSystemError(errno, - _("Unable to listen to UNIX socket path '%s'"= ), + _("Unable to listen to UNIX socket path '%1$s= '"), socket_path); goto error; } @@ -543,7 +544,7 @@ virCHMonitorNew(virDomainObj *vm, const char *socketdir) mon->socketpath =3D g_strdup_printf("%s/%s-socket", socketdir, vm->def= ->name); if (g_mkdir_with_parents(socketdir, 0777) < 0) { virReportSystemError(errno, - _("Cannot create socket directory '%s'"), + _("Cannot create socket directory '%1$s'"), socketdir); return NULL; } @@ -553,7 +554,7 @@ virCHMonitorNew(virDomainObj *vm, const char *socketdir) socket_fd =3D chMonitorCreateSocket(mon->socketpath); if (socket_fd < 0) { virReportSystemError(errno, - _("Cannot create socket '%s'"), + _("Cannot create socket '%1$s'"), mon->socketpath); return NULL; } @@ -619,7 +620,7 @@ virCHMonitorCurlPerform(CURL *handle) =20 if (errorCode !=3D CURLE_OK) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("curl_easy_perform() returned an error: %s (%d)"), + _("curl_easy_perform() returned an error: %1$s (%2$= d)"), curl_easy_strerror(errorCode), errorCode); return -1; } @@ -629,8 +630,8 @@ virCHMonitorCurlPerform(CURL *handle) =20 if (errorCode !=3D CURLE_OK) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("curl_easy_getinfo(CURLINFO_RESPONSE_CODE) return= ed an " - "error: %s (%d)"), curl_easy_strerror(errorCode), + _("curl_easy_getinfo(CURLINFO_RESPONSE_CODE) return= ed an error: %1$s (%2$d)"), + curl_easy_strerror(errorCode), errorCode); return -1; } diff --git a/src/ch/ch_process.c b/src/ch/ch_process.c index 77f55e777b..c145a78496 100644 --- a/src/ch/ch_process.c +++ b/src/ch/ch_process.c @@ -67,7 +67,7 @@ virCHProcessUpdateConsoleDevice(virDomainObj *vm, dev =3D virJSONValueObjectGet(config, device); if (!dev) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("missing '%s' in 'config' from cloud-hypervisor"), + _("missing '%1$s' in 'config' from cloud-hypervisor= "), device); return; } @@ -75,7 +75,7 @@ virCHProcessUpdateConsoleDevice(virDomainObj *vm, file =3D virJSONValueObjectGet(dev, "file"); if (!file) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("missing 'file' in '%s' from cloud-hypervisor"), + _("missing 'file' in '%1$s' from cloud-hypervisor"), device); return; } @@ -83,7 +83,7 @@ virCHProcessUpdateConsoleDevice(virDomainObj *vm, path =3D virJSONValueGetString(file); if (!path) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unable to parse contents of 'file' field in '%s'= from cloud-hypervisor"), + _("unable to parse contents of 'file' field in '%1$= s' from cloud-hypervisor"), device); return; } --=20 2.39.2