From nobody Fri Dec 19 06:34:35 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=1678464853; cv=none; d=zohomail.com; s=zohoarc; b=H2/nbhThY6mI08zxqxFoO6RAlNAS5MMTGL7jep464KcO+6/1xDLQeuF9L3Xx56Uxec8A4Yw0BSrCW9IMFUqEMkzHElwPjkCWUm49ulgGPFQ2MOlOQDxhA5E54HF2ntt4XoOfpCK+mvI6ZqMDZZSMWHYVh8ms1hNKYh1HBXySBpI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1678464853; 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=jlQewjEWnH2XDW/f+oF5I7AhQLSzASfDgp3LjFEgzXM=; b=dXCSinGniXIzyDl2XbBCwXwOXlyabS1kc8wW7bHLAz6PLCudCvsz5+DDfYnkRQ53YEP5noYQQVMgPzPUvb86AoHjP7G5PBTqNLa5392NogauafA6PTFDToU/+OaGW5lzOoDMxkANvDAYWXkfNDFOW0MKKs5Zyl98nbPl3FAku54= 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 1678464853311565.1326400127872; Fri, 10 Mar 2023 08:14:13 -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-329-p_59pp7NOWGuUvQvGb1RlQ-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 77390823D6C; Fri, 10 Mar 2023 16:11:14 +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 27F312026D4B; Fri, 10 Mar 2023 16:11:14 +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 173021946A5E; Fri, 10 Mar 2023 16:11:14 +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 97C851946A66 for ; Fri, 10 Mar 2023 16:11:12 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 7AC721121319; Fri, 10 Mar 2023 16:11:12 +0000 (UTC) Received: from rein.int.mamuti.net (unknown [10.45.226.138]) by smtp.corp.redhat.com (Postfix) with ESMTP id 04AF71121315 for ; Fri, 10 Mar 2023 16:11:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678464852; 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=jlQewjEWnH2XDW/f+oF5I7AhQLSzASfDgp3LjFEgzXM=; b=HUcGNlAznh4Jwx9Y40eBzBtq68001ceuSbVOXW8B3lPWVm02JLkQapfoJKr3WudGFQ4fxE HGwUqMAbbbXHA9uMLp7gmsEEFohvFkqLlklg9H4pLzdpR6MQYcXk59vR9J7/gB4tIJqfdg U09NNL3xQb1jZTdDUCkHiqD0pKtnKUA= X-MC-Unique: p_59pp7NOWGuUvQvGb1RlQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Jiri Denemark To: libvir-list@redhat.com Subject: [libvirt PATCH 46/51] vz: Update format strings in translated messages Date: Fri, 10 Mar 2023 17:10:02 +0100 Message-Id: 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.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: 1678464854100100003 Content-Type: text/plain; charset="utf-8" Signed-off-by: Jiri Denemark --- src/vz/vz_driver.c | 32 ++++++++++---------- src/vz/vz_sdk.c | 74 ++++++++++++++++++++++------------------------ src/vz/vz_utils.c | 31 +++++++++---------- src/vz/vz_utils.h | 2 +- 4 files changed, 67 insertions(+), 72 deletions(-) diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index 4a7b14997f..56dc236233 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -364,7 +364,7 @@ vzConnectOpen(virConnectPtr conn, /* From this point on, the connection is for us. */ if (STRNEQ(conn->uri->path, "/system")) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unexpected Virtuozzo URI path '%s', try vz:///sy= stem"), + _("Unexpected Virtuozzo URI path '%1$s', try vz:///= system"), conn->uri->path); return VIR_DRV_OPEN_ERROR; } @@ -575,7 +575,7 @@ vzDomainLookupByUUID(virConnectPtr conn, const unsigned= char *uuid) 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); return NULL; } =20 @@ -600,7 +600,7 @@ vzDomainLookupByName(virConnectPtr conn, const char *na= me) =20 if (dom =3D=3D NULL) { virReportError(VIR_ERR_NO_DOMAIN, - _("no domain with matching name '%s'"), name); + _("no domain with matching name '%1$s'"), name); return NULL; } =20 @@ -773,7 +773,7 @@ vzEnsureDomainExists(virDomainObj *dom) =20 virUUIDFormat(dom->def->uuid, uuidstr); virReportError(VIR_ERR_NO_DOMAIN, - _("no domain with matching uuid '%s' (%s)"), + _("no domain with matching uuid '%1$s' (%2$s)"), uuidstr, dom->def->name); =20 return -1; @@ -816,7 +816,7 @@ vzDomainDefineXMLFlags(virConnectPtr conn, const char *= xml, unsigned int flags) goto cleanup; } else { virReportError(VIR_ERR_INVALID_ARG, - _("Unsupported OS type: %s"), + _("Unsupported OS type: %1$s"), virDomainOSTypeToString(def->os.type)); goto cleanup; } @@ -1705,7 +1705,7 @@ vzDomainBlockStatsImpl(virDomainObj *dom, =20 if (*path) { if ((idx =3D virDomainDiskIndexByName(dom->def, path, false)) < 0)= { - virReportError(VIR_ERR_INVALID_ARG, _("invalid path: %s"), pat= h); + virReportError(VIR_ERR_INVALID_ARG, _("invalid path: %1$s"), p= ath); return -1; } if (prlsdkGetBlockStats(privdom->stats, @@ -1956,7 +1956,7 @@ static int vzConnectGetMaxVcpus(virConnectPtr conn, return 1028; =20 virReportError(VIR_ERR_INVALID_ARG, - _("unknown type '%s'"), type); + _("unknown type '%1$s'"), type); return -1; } =20 @@ -2129,7 +2129,7 @@ vzSnapObjFromName(virDomainSnapshotObjList *snapshots= , const char *name) snap =3D virDomainSnapshotFindByName(snapshots, name); if (!snap) virReportError(VIR_ERR_NO_DOMAIN_SNAPSHOT, - _("no domain snapshot with matching name '%s'"), na= me); + _("no domain snapshot with matching name '%1$s'"), = name); =20 return snap; } @@ -2452,7 +2452,7 @@ vzDomainSnapshotGetParent(virDomainSnapshotPtr snapsh= ot, unsigned int flags) =20 if (!snap->def->parent_name) { virReportError(VIR_ERR_NO_DOMAIN_SNAPSHOT, - _("snapshot '%s' does not have a parent"), + _("snapshot '%1$s' does not have a parent"), snap->def->name); goto cleanup; } @@ -3037,21 +3037,21 @@ vzParseVzURI(const char *uri_str) =20 if (!uri->scheme || !uri->server) { virReportError(VIR_ERR_INVALID_ARG, - _("scheme and host are mandatory vz migration URI: = %s"), + _("scheme and host are mandatory vz migration URI: = %1$s"), uri_str); goto error; } =20 if (uri->user || uri->path || uri->query || uri->fragment) { virReportError(VIR_ERR_INVALID_ARG, - _("only scheme, host and port are supported in " - "vz migration URI: %s"), uri_str); + _("only scheme, host and port are supported in vz m= igration URI: %1$s"), + uri_str); goto error; } =20 if (STRNEQ(uri->scheme, "vzmigr")) { virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, - _("unsupported scheme %s in migration URI %s"), + _("unsupported scheme %1$s in migration URI %2$s"), uri->scheme, uri_str); goto error; } @@ -3760,7 +3760,7 @@ vzConnectGetAllDomainStats(virConnectPtr conn, } else if ((flags & VIR_CONNECT_GET_ALL_DOMAINS_STATS_ENFORCE_STATS) && (stats & ~supported)) { virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, - _("Stats types bits 0x%x are not supported by this = daemon"), + _("Stats types bits 0x%1$x are not supported by thi= s daemon"), stats & ~supported); return -1; } @@ -3937,7 +3937,7 @@ vzDomainBlockResize(virDomainPtr domain, =20 if (!(disk =3D virDomainDiskByName(dom->def, path, false))) { virReportError(VIR_ERR_INVALID_ARG, - _("invalid path: %s"), path); + _("invalid path: %1$s"), path); goto cleanup; } =20 @@ -4091,7 +4091,7 @@ vzStateInitialize(bool privileged, vz_driver_privileged =3D privileged; =20 if (g_mkdir_with_parents(VZ_STATEDIR, S_IRWXU) < 0) { - virReportSystemError(errno, _("cannot create state directory '%s'"= ), + virReportSystemError(errno, _("cannot create state directory '%1$s= '"), VZ_STATEDIR); return VIR_DRV_STATE_INIT_ERROR; } diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c index 269dc3bb9e..286b52a29e 100644 --- a/src/vz/vz_sdk.c +++ b/src/vz/vz_sdk.c @@ -84,7 +84,7 @@ logPrlErrorHelper(PRL_RESULT err, const char *filename, =20 virReportErrorHelper(VIR_FROM_THIS, VIR_ERR_INTERNAL_ERROR, filename, funcname, linenr, - _("%s %s"), msg1, msg2); + _("%1$s %2$s"), msg1, msg2); =20 VIR_FREE(msg1); VIR_FREE(msg2); @@ -131,7 +131,7 @@ logPrlEventErrorHelper(PRL_HANDLE event, const char *fi= lename, =20 virReportErrorHelper(VIR_FROM_THIS, VIR_ERR_INTERNAL_ERROR, filename, funcname, linenr, - _("%s %s"), msg1, msg2); + _("%1$s %2$s"), msg1, msg2); VIR_FREE(msg1); VIR_FREE(msg2); } @@ -463,7 +463,7 @@ prlsdkSdkDomainLookupByUUID(struct _vzDriver *driver, c= onst unsigned char *uuid) PGVC_SEARCH_BY_UUID, &sdkdom) < 0) { virUUIDFormat(uuid, uuidstr); virReportError(VIR_ERR_NO_DOMAIN, - _("no domain with matching uuid '%s'"), uuidstr); + _("no domain with matching uuid '%1$s'"), uuidstr); return PRL_INVALID_HANDLE; } =20 @@ -478,7 +478,7 @@ prlsdkSdkDomainLookupByName(struct _vzDriver *driver, c= onst char *name) if (prlsdkSdkDomainLookup(driver, name, PGVC_SEARCH_BY_NAME, &sdkdom) < 0) { virReportError(VIR_ERR_NO_DOMAIN, - _("no domain with matching name '%s'"), name); + _("no domain with matching name '%1$s'"), name); return PRL_INVALID_HANDLE; } =20 @@ -609,7 +609,7 @@ prlsdkGetDiskId(PRL_HANDLE disk, virDomainDiskBus *bus,= char **dst) break; default: virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unknown disk bus: %X"), ifType); + _("Unknown disk bus: %1$X"), ifType); return -1; } =20 @@ -724,7 +724,7 @@ prlsdkGetFSInfo(PRL_HANDLE prldisk, goto cleanup; if (STRNEQ("libvirt", uri->scheme)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unknown uri scheme: '%s'"), + _("Unknown uri scheme: '%1$s'"), uri->scheme); goto cleanup; } @@ -732,17 +732,17 @@ prlsdkGetFSInfo(PRL_HANDLE prldisk, if (!(matches =3D g_strsplit(uri->path, "/", 0)) || !matches[0]) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("splitting StorageUrl failed %s"), uri->path); + _("splitting StorageUrl failed %1$s"), uri->pat= h); goto cleanup; } if (!matches[1]) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("can't identify pool in uri %s "), uri->path); + _("can't identify pool in uri %1$s "), uri->pat= h); goto cleanup; } if (!matches[2]) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("can't identify volume in uri %s"), uri->path= ); + _("can't identify volume in uri %1$s"), uri->pa= th); goto cleanup; } fs->type =3D VIR_DOMAIN_FS_TYPE_VOLUME; @@ -1068,7 +1068,7 @@ prlsdkGetNetInfo(PRL_HANDLE netAdapter, virDomainNetD= ef *net, bool isCt) break; default: virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unknown adapter type: %X"), type); + _("Unknown adapter type: %1$X"), type); return -1; } } @@ -1185,7 +1185,7 @@ prlsdkGetSerialInfo(PRL_HANDLE serialPort, virDomainC= hrDef *chr) break; default: virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unknown serial type: %X"), emulatedType); + _("Unknown serial type: %1$X"), emulatedType); return -1; } =20 @@ -1450,7 +1450,7 @@ prlsdkConvertDomainType(PRL_HANDLE sdkdom, virDomainD= ef *def) break; default: virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unknown domain type: %X"), domainType); + _("Unknown domain type: %1$X"), domainType); return -1; } =20 @@ -1475,7 +1475,7 @@ prlsdkConvertCpuMode(PRL_HANDLE sdkdom, virDomainDef = *def) break; default: virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unknown CPU mode: %X"), cpuMode); + _("Unknown CPU mode: %1$X"), cpuMode); return -1; } =20 @@ -1600,7 +1600,7 @@ prlsdkBootOrderCheck(PRL_HANDLE sdkdom, PRL_DEVICE_TY= PE sdkType, int sdkIndex, dev =3D prlsdkGetDevByDevIndex(sdkdom, sdkType, sdkIndex); if (dev =3D=3D PRL_INVALID_HANDLE) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Can't find boot device of type: %d, device index= : %d"), + _("Can't find boot device of type: %1$d, device ind= ex: %2$d"), sdkType, sdkIndex); return -1; } @@ -1617,13 +1617,13 @@ prlsdkBootOrderCheck(PRL_HANDLE sdkdom, PRL_DEVICE_= TYPE sdkType, int sdkIndex, break; default: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Unsupported disk type %d"), sdkType); + _("Unsupported disk type %1$d"), sdkType); goto cleanup; } =20 if (!(disk =3D virFindDiskBootIndex(def, device, bootIndex))) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Can't find boot device of type: %s, index: %= d"), + _("Can't find boot device of type: %1$s, index:= %2$d"), virDomainDiskDeviceTypeToString(device), bootIn= dex); goto cleanup; } @@ -1642,7 +1642,7 @@ prlsdkBootOrderCheck(PRL_HANDLE sdkdom, PRL_DEVICE_TY= PE sdkType, int sdkIndex, =20 if (bootIndex >=3D def->nnets) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Can't find network boot device for index: %d= "), + _("Can't find network boot device for index: %1= $d"), bootIndex); goto cleanup; } @@ -1653,7 +1653,7 @@ prlsdkBootOrderCheck(PRL_HANDLE sdkdom, PRL_DEVICE_TY= PE sdkType, int sdkIndex, break; default: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Unexpected device type %d"), sdkType); + _("Unexpected device type %1$d"), sdkType); goto cleanup; } =20 @@ -1732,7 +1732,7 @@ prlsdkConvertBootOrderVm(PRL_HANDLE sdkdom, virDomain= Def *def) break; default: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Unexpected boot device type %i"), sdkType); + _("Unexpected boot device type %1$i"), sdkType); goto cleanup; } =20 @@ -1835,7 +1835,7 @@ prlsdkLoadDomain(struct _vzDriver *driver, if (autostart !=3D PAO_VM_START_ON_LOAD && autostart !=3D PAO_VM_START_MANUAL) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unknown autostart mode: %X"), autostart); + _("Unknown autostart mode: %1$X"), autostart); return NULL; } =20 @@ -2801,8 +2801,7 @@ static int prlsdkCheckSerialUnsupportedParams(virDoma= inChrDef *chr) if (chr->source->type =3D=3D VIR_DOMAIN_CHR_TYPE_TCP && chr->source->data.tcp.protocol !=3D VIR_DOMAIN_CHR_TCP_PROTOCOL_RA= W) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Protocol '%s' is not supported for " - "tcp character device."), + _("Protocol '%1$s' is not supported for tcp charact= er device."), virDomainChrTcpProtocolTypeToString(chr->source->da= ta.tcp.protocol)); return -1; } @@ -3151,8 +3150,7 @@ static int prlsdkConfigureGateways(PRL_HANDLE sdknet,= virDomainNetDef *net) break; default: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Unsupported address family %d " - "Only IPv4 or IPv6 default gateway"), + _("Unsupported address family %1$d Only IPv4 or= IPv6 default gateway"), VIR_SOCKET_ADDR_FAMILY(gateway)); =20 return -1; @@ -3354,7 +3352,7 @@ prlsdkFindNetByMAC(PRL_HANDLE sdkdom, virMacAddr *mac) } =20 virReportError(VIR_ERR_INTERNAL_ERROR, - _("No net with mac '%s'"), virMacAddrFormat(mac, virMac= )); + _("No net with mac '%1$s'"), virMacAddrFormat(mac, virM= ac)); =20 cleanup: PrlHandle_Free(adapter); @@ -3502,7 +3500,7 @@ prlsdkGetDisk(PRL_HANDLE sdkdom, virDomainDiskDef *di= sk) } =20 virReportError(VIR_ERR_INTERNAL_ERROR, - _("No disk with bus '%s' and target '%s'"), + _("No disk with bus '%1$s' and target '%2$s'"), virDomainDiskBusTypeToString(disk->bus), disk->dst); return PRL_INVALID_HANDLE; =20 @@ -3581,7 +3579,7 @@ prlsdkAttachDevice(struct _vzDriver *driver, case VIR_DOMAIN_DEVICE_AUDIO: case VIR_DOMAIN_DEVICE_CRYPTO: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("attaching device type '%s' is unsupported"), + _("attaching device type '%1$s' is unsupported"), virDomainDeviceTypeToString(dev->type)); return -1; } @@ -3671,7 +3669,7 @@ prlsdkDetachDevice(struct _vzDriver *driver G_GNUC_UN= USED, case VIR_DOMAIN_DEVICE_AUDIO: case VIR_DOMAIN_DEVICE_CRYPTO: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("detaching device type '%s' is unsupported"), + _("detaching device type '%1$s' is unsupported"), virDomainDeviceTypeToString(dev->type)); goto cleanup; } @@ -3751,7 +3749,7 @@ prlsdkUpdateDevice(struct _vzDriver *driver, case VIR_DOMAIN_DEVICE_AUDIO: case VIR_DOMAIN_DEVICE_CRYPTO: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("updating device type '%s' is unsupported"), + _("updating device type '%1$s' is unsupported"), virDomainDeviceTypeToString(dev->type)); return -1; } @@ -3878,7 +3876,7 @@ prlsdkSetBootOrderVm(PRL_HANDLE sdkdom, virDomainDef = *def) case VIR_DOMAIN_BOOT_LAST: default: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Unsupported boot device type: '%s'"), + _("Unsupported boot device type: '%1$s'"), virDomainBootTypeToString(virType)); return -1; } @@ -3965,7 +3963,7 @@ prlsdkDoApplyConfig(struct _vzDriver *driver, break; default: virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unknown CPU mode: %s"), + _("Unknown CPU mode: %1$s"), virArchToString(def->os.arch)); goto error; } @@ -4111,8 +4109,8 @@ virStorageTranslatePoolLocal(virConnectPtr conn, virS= torageSource *src) return -1; if (virStoragePoolIsActive(pool) !=3D 1) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("storage pool '%s' containing volume '%s' " - "is not active"), src->srcpool->pool, + _("storage pool '%1$s' containing volume '%2$s' is = not active"), + src->srcpool->pool, src->srcpool->volume); goto cleanup; } @@ -4125,7 +4123,7 @@ virStorageTranslatePoolLocal(virConnectPtr conn, virS= torageSource *src) =20 if (info.type !=3D VIR_STORAGE_VOL_PLOOP) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Unsupported volume format '%s'"), + _("Unsupported volume format '%1$s'"), virStorageVolTypeToString(info.type)); goto cleanup; } @@ -4398,7 +4396,7 @@ prlsdkGetBlockStats(PRL_HANDLE sdkstats, case VIR_DOMAIN_DISK_BUS_LAST: default: virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unknown disk bus: %X"), disk->bus); + _("Unknown disk bus: %1$X"), disk->bus); goto cleanup; } } @@ -4453,7 +4451,7 @@ prlsdkFindNetByPath(PRL_HANDLE sdkdom, const char *pa= th) =20 if (net =3D=3D PRL_INVALID_HANDLE) virReportError(VIR_ERR_INVALID_ARG, - _("invalid path, '%s' is not a known interface"), p= ath); + _("invalid path, '%1$s' is not a known interface"),= path); return net; =20 error: @@ -4627,7 +4625,7 @@ prlsdkParseDateTime(const char *str) /* second */ virStrToLong_i(tmp+1, &tmp, 10, &sec) < 0 || *tmp !=3D '\0') { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unexpected DateTime format: '%s'"), str); + _("unexpected DateTime format: '%1$s'"), str); return -1; } =20 @@ -4712,7 +4710,7 @@ prlsdkParseSnapshotTree(const char *treexml) def->state =3D VIR_DOMAIN_SHUTOFF; } else { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unexpected snapshot state: %s"), xmlstr); + _("unexpected snapshot state: %1$s"), xmlstr); } VIR_FREE(xmlstr); =20 diff --git a/src/vz/vz_utils.c b/src/vz/vz_utils.c index 219d13823b..239d0db277 100644 --- a/src/vz/vz_utils.c +++ b/src/vz/vz_utils.c @@ -81,7 +81,7 @@ vzDomObjFromDomain(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; } @@ -202,15 +202,15 @@ vzCheckDiskAddressDriveUnsupportedParams(virDomainDis= kDef *disk) if (drive->controller > 0) { /* We have only one controller of each type */ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Invalid drive address of disk %s, vz driver " - "supports only one controller."), disk->dst); + _("Invalid drive address of disk %1$s, vz driver su= pports only one controller."), + disk->dst); return -1; } =20 if (drive->target > 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Invalid drive address of disk %s, vz driver " - "supports only target 0."), disk->dst); + _("Invalid drive address of disk %1$s, vz driver su= pports only target 0."), + disk->dst); return -1; } =20 @@ -218,8 +218,7 @@ vzCheckDiskAddressDriveUnsupportedParams(virDomainDiskD= ef *disk) case VIR_DOMAIN_DISK_BUS_IDE: if (drive->unit > 1) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Invalid drive address of disk %s, vz driver " - "supports only units 0-1 for IDE bus."), + _("Invalid drive address of disk %1$s, vz drive= r supports only units 0-1 for IDE bus."), disk->dst); return -1; } @@ -228,8 +227,7 @@ vzCheckDiskAddressDriveUnsupportedParams(virDomainDiskD= ef *disk) case VIR_DOMAIN_DISK_BUS_SATA: if (drive->bus > 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Invalid drive address of disk %s, vz driver " - "supports only bus 0 for SATA and SCSI bus."), + _("Invalid drive address of disk %1$s, vz drive= r supports only bus 0 for SATA and SCSI bus."), disk->dst); return -1; } @@ -250,15 +248,14 @@ vzCheckDiskAddressDriveUnsupportedParams(virDomainDis= kDef *disk) =20 if (virDiskNameToBusDeviceIndex(disk, &busIdx, &devIdx) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("cannot convert disk '%s' to bus/device index"), + _("cannot convert disk '%1$s' to bus/device index"), disk->dst); return -1; } =20 if (busIdx !=3D drive->bus || devIdx !=3D drive->unit) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Invalid drive address of disk %s, vz driver " - "does not support non default name mappings."), + _("Invalid drive address of disk %1$s, vz driver do= es not support non default name mappings."), disk->dst); return -1; } @@ -418,7 +415,7 @@ vzCheckUnsupportedDisk(const virDomainDef *def, if (virDomainDiskGetFormat(disk) !=3D VIR_STORAGE_FILE_NONE && virDomainDiskGetFormat(disk) !=3D diskFormat) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Unsupported format of disk %s"), + _("Unsupported format of disk %1$s"), disk->src->path); return -1; } @@ -430,7 +427,7 @@ vzCheckUnsupportedDisk(const virDomainDef *def, =20 if (vzCaps->diskBuses[i] =3D=3D VIR_DOMAIN_DISK_BUS_LAST) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Unsupported disk bus type %s"), + _("Unsupported disk bus type %1$s"), virDomainDiskBusTypeToString(disk->bus)); return -1; } @@ -454,7 +451,7 @@ vzCheckUnsupportedControllers(const virDomainDef *def, = struct _vzCapabilities *v =20 if (vzCaps->controllerTypes[j] =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_L= AST) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Unsupported controller type %s"), + _("Unsupported controller type %1$s"), virDomainControllerTypeToString(controller->typ= e)); return -1; } @@ -465,7 +462,7 @@ vzCheckUnsupportedControllers(const virDomainDef *def, = struct _vzCapabilities *v controller->model !=3D vzCaps->scsiControllerModel) { =20 virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Unsupported SCSI controller model %s"), + _("Unsupported SCSI controller model %1$s"), virDomainControllerModelSCSITypeToString(co= ntroller->model)); return -1; } @@ -485,7 +482,7 @@ int vzGetDefaultSCSIModel(struct _vzDriver *driver, break; default: virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unknown SCSI controller model %s"), + _("Unknown SCSI controller model %1$s"), virDomainControllerModelSCSITypeToString( driver->vzCaps.scsiControllerModel)); return -1; diff --git a/src/vz/vz_utils.h b/src/vz/vz_utils.h index 9cb3c806e4..7a797953a5 100644 --- a/src/vz/vz_utils.h +++ b/src/vz/vz_utils.h @@ -44,7 +44,7 @@ char uuidstr[VIR_UUID_STRING_BUFLEN]; \ virUUIDFormat(domain->uuid, uuidstr); \ virReportError(VIR_ERR_NO_DOMAIN, \ - _("no domain with matching uuid '%s'"), uuidstr); \ + _("no domain with matching uuid '%1$s'"), uuidstr);= \ } while (0) =20 #define PARALLELS_DOMAIN_ROUTED_NETWORK_NAME "host-routed" --=20 2.39.2