From nobody Fri Dec 19 06:33:48 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=1678464788; cv=none; d=zohomail.com; s=zohoarc; b=cv3BYeUcNkC+CA1tCBKMXCAeZO+rxt61/JALyxqyH1A1lGTaEG+WAgrsyc2O6LWKRwphjvDJaZSYZXBgPyYvwQE8rto96rP+v17emICj+QmDGpSg4WpmImy7Tp12lcUp3gszY+4Zhwz+/kxHzj3jm1+hawZgWT6IEHV0ZPsu72g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1678464788; 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=ACrwWP4q6YMSIYKU3dx6J4PDy6qwvPrVvXcIbPs0lBU=; b=TpcI9LZZvkQKMUh0BAWtn/BcU0xuYQnU4j6zCIc3JgqnWfVPCbtYHjgX7Kauzlih24ceo2s55ZGBXJxqtZMZYBgnWkwmYbYWfupLBanFlaoT1F5snwuo0gSWmlm4ip+4QsM+h5qCKPa+Xkolyc6E5gCJxDCRY5/B5dJhyqYtYt0= 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 1678464788683422.4635698425168; Fri, 10 Mar 2023 08:13:08 -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-583-4zxCC0cHMgmy4D1jcC0lmg-1; Fri, 10 Mar 2023 11:11:40 -0500 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 610F7382C98C; Fri, 10 Mar 2023 16:11:12 +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 49503492B04; Fri, 10 Mar 2023 16:11:12 +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 3B3951946A54; Fri, 10 Mar 2023 16:11:12 +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 39BB21946A73 for ; Fri, 10 Mar 2023 16:11:11 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 2D11C1121318; Fri, 10 Mar 2023 16:11:11 +0000 (UTC) Received: from rein.int.mamuti.net (unknown [10.45.226.138]) by smtp.corp.redhat.com (Postfix) with ESMTP id AB9F01121315 for ; Fri, 10 Mar 2023 16:11:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678464787; 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=ACrwWP4q6YMSIYKU3dx6J4PDy6qwvPrVvXcIbPs0lBU=; b=NnGzmT9Xdh8cgL5sbZTxheG+SriIsuCFFq9Lbzs+WrEVUQks3E1htjuTZXe2YXiyRRgZhl BYvyVoCufnSGXNsVMzrTykiAixgPSQ8IYyhUfmnWd5KiqZStvbGxqGUn2/Fi9oLoHbLKMu UynMI/Auj6qZyH30w8YRfdEJlUx1Ojk= X-MC-Unique: 4zxCC0cHMgmy4D1jcC0lmg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Jiri Denemark To: libvir-list@redhat.com Subject: [libvirt PATCH 45/51] vmx: Update format strings in translated messages Date: Fri, 10 Mar 2023 17:10:01 +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.9 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: 1678464789679100003 Content-Type: text/plain; charset="utf-8" Signed-off-by: Jiri Denemark --- src/vmx/vmx.c | 264 +++++++++++++++++++++++--------------------------- 1 file changed, 122 insertions(+), 142 deletions(-) diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index c2c9095062..5e0f1b6b3e 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -782,14 +782,14 @@ virVMXConvertToUTF8(const char *encoding, const char = *string) =20 if (handler =3D=3D NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("libxml2 doesn't handle %s encoding"), encoding); + _("libxml2 doesn't handle %1$s encoding"), encoding= ); return NULL; } =20 if (!(input =3D xmlBufferCreateStatic((char *)string, strlen(string)))= || xmlCharEncInFunc(handler, utf8, input) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not convert from %s to UTF-8 encoding"), e= ncoding); + _("Could not convert from %1$s to UTF-8 encoding"),= encoding); goto cleanup; } =20 @@ -817,7 +817,7 @@ virVMXGetConfigStringHelper(virConf *conf, const char *= name, char **string, return 0; =20 virReportError(VIR_ERR_INTERNAL_ERROR, - _("Missing essential config entry '%s'"), name); + _("Missing essential config entry '%1$s'"), name); return -1; } =20 @@ -852,7 +852,7 @@ virVMXGetConfigUUID(virConf *conf, const char *name, un= signed char *uuid, rc =3D virUUIDParse(string, uuid); if (rc < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not parse UUID from string '%s'"), string); + _("Could not parse UUID from string '%1$s'"), strin= g); goto cleanup; } =20 @@ -883,7 +883,7 @@ virVMXGetConfigLong(virConf *conf, const char *name, lo= ng long *number, *number =3D -1; } else if (virStrToLong_ll(string, NULL, 10, number) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Config entry '%s' must represent an integer value"), + _("Config entry '%1$s' must represent an integer value"), name); goto cleanup; } @@ -917,8 +917,8 @@ virVMXGetConfigBoolean(virConf *conf, const char *name,= bool *boolean_, *boolean_ =3D false; } else { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Config entry '%s' must represent a boolean value= " - "(true|false)"), name); + _("Config entry '%1$s' must represent a boolean val= ue (true|false)"), + name); goto cleanup; } =20 @@ -947,14 +947,14 @@ virVMXSCSIDiskNameToControllerAndUnit(const char *nam= e, int *controller, int *un =20 if (idx < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not parse valid disk index from '%s'"), na= me); + _("Could not parse valid disk index from '%1$s'"), = name); return -1; } =20 /* Each of the 4 SCSI controllers has 1 bus with 15 units each for dev= ices */ if (idx >=3D (4 * 15)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("SCSI disk index (parsed from '%s') is too large"= ), name); + _("SCSI disk index (parsed from '%1$s') is too larg= e"), name); return -1; } =20 @@ -986,14 +986,14 @@ virVMXIDEDiskNameToBusAndUnit(const char *name, int *= bus, int *unit) =20 if (idx < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not parse valid disk index from '%s'"), na= me); + _("Could not parse valid disk index from '%1$s'"), = name); return -1; } =20 /* The IDE controller has 2 buses with 2 units each for devices */ if (idx >=3D (2 * 2)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("IDE disk index (parsed from '%s') is too large")= , name); + _("IDE disk index (parsed from '%1$s') is too large= "), name); return -1; } =20 @@ -1021,14 +1021,14 @@ virVMXFloppyDiskNameToUnit(const char *name, int *u= nit) =20 if (idx < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not parse valid disk index from '%s'"), na= me); + _("Could not parse valid disk index from '%1$s'"), = name); return -1; } =20 /* The FDC controller has 1 bus with 2 units for devices */ if (idx >=3D 2) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Floppy disk index (parsed from '%s') is too larg= e"), name); + _("Floppy disk index (parsed from '%1$s') is too la= rge"), name); return -1; } =20 @@ -1051,7 +1051,7 @@ virVMXVerifyDiskAddress(virDomainXMLOption *xmlopt, =20 if (disk->info.type !=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DRIVE) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Unsupported disk address type '%s'"), + _("Unsupported disk address type '%1$s'"), virDomainDeviceAddressTypeToString(disk->info.type)= ); return -1; } @@ -1071,7 +1071,7 @@ virVMXVerifyDiskAddress(virDomainXMLOption *xmlopt, def.info.addr.drive.bus !=3D drive->bus || def.info.addr.drive.unit !=3D drive->unit) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Disk address %d:%d:%d doesn't match target devic= e '%s'"), + _("Disk address %1$d:%2$d:%3$d doesn't match target= device '%4$s'"), drive->controller, drive->bus, drive->unit, disk->d= st); return -1; } @@ -1080,69 +1080,69 @@ virVMXVerifyDiskAddress(virDomainXMLOption *xmlopt, if (disk->bus =3D=3D VIR_DOMAIN_DISK_BUS_SCSI) { if (drive->controller > 3) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("SCSI controller index %d out of [0..3] range= "), + _("SCSI controller index %1$d out of [0..3] ran= ge"), drive->controller); return -1; } =20 if (drive->bus !=3D 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("SCSI bus index %d out of [0] range"), + _("SCSI bus index %1$d out of [0] range"), drive->bus); return -1; } =20 if (drive->unit > 15 || drive->unit =3D=3D 7) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("SCSI unit index %d out of [0..6,8..15] range= "), + _("SCSI unit index %1$d out of [0..6,8..15] ran= ge"), drive->unit); return -1; } } else if (disk->bus =3D=3D VIR_DOMAIN_DISK_BUS_IDE) { if (drive->controller !=3D 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("IDE controller index %d out of [0] range"), + _("IDE controller index %1$d out of [0] range"), drive->controller); return -1; } =20 if (drive->bus > 1) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("IDE bus index %d out of [0..1] range"), + _("IDE bus index %1$d out of [0..1] range"), drive->bus); return -1; } =20 if (drive->unit > 1) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("IDE unit index %d out of [0..1] range"), + _("IDE unit index %1$d out of [0..1] range"), drive->unit); return -1; } } else if (disk->bus =3D=3D VIR_DOMAIN_DISK_BUS_FDC) { if (drive->controller !=3D 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("FDC controller index %d out of [0] range"), + _("FDC controller index %1$d out of [0] range"), drive->controller); return -1; } =20 if (drive->bus !=3D 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("FDC bus index %d out of [0] range"), + _("FDC bus index %1$d out of [0] range"), drive->bus); return -1; } =20 if (drive->unit > 1) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("FDC unit index %d out of [0..1] range"), + _("FDC unit index %1$d out of [0..1] range"), drive->unit); return -1; } } else { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Unsupported bus type '%s'"), + _("Unsupported bus type '%1$s'"), virDomainDiskBusTypeToString(disk->bus)); return -1; } @@ -1177,7 +1177,7 @@ virVMXHandleLegacySCSIDiskDriverName(virDomainDef *de= f, =20 if (model < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unknown driver name '%s'"), driver); + _("Unknown driver name '%1$s'"), driver); return -1; } =20 @@ -1190,7 +1190,7 @@ virVMXHandleLegacySCSIDiskDriverName(virDomainDef *de= f, =20 if (controller =3D=3D NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Missing SCSI controller for index %d"), + _("Missing SCSI controller for index %1$d"), disk->info.addr.drive.controller); return -1; } @@ -1199,8 +1199,7 @@ virVMXHandleLegacySCSIDiskDriverName(virDomainDef *de= f, controller->model =3D model; } else if (controller->model !=3D model) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Inconsistent SCSI controller model ('%s' is not = '%s') " - "for SCSI controller index %d"), driver, + _("Inconsistent SCSI controller model ('%1$s' is no= t '%2$s') for SCSI controller index %3$d"), driver, virDomainControllerModelSCSITypeToString(controller= ->model), controller->idx); return -1; @@ -1276,8 +1275,7 @@ virVMXGatherSCSIControllers(virVMXContext *ctx, virDo= mainDef *def, for (k =3D 0; k < count; ++k) { if (autodetectedModels[k] !=3D autodetectedModels[0]) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Disks on SCSI controller %d have inc= onsistent " - "controller models, cannot autodetect= model"), + _("Disks on SCSI controller %1$d have i= nconsistent controller models, cannot autodetect model"), controller->idx); goto cleanup; } @@ -1292,9 +1290,7 @@ virVMXGatherSCSIControllers(virVMXContext *ctx, virDo= mainDef *def, controller->model !=3D VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LSISAS= 1068 && controller->model !=3D VIR_DOMAIN_CONTROLLER_MODEL_SCSI_VMPVSC= SI) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Expecting domain XML attribute 'model' of en= try " - "'controller' to be 'buslogic' or 'lsilogic' = or " - "'lsisas1068' or 'vmpvscsi' but found '%s'"), + _("Expecting domain XML attribute 'model' of en= try 'controller' to be 'buslogic' or 'lsilogic' or 'lsisas1068' or 'vmpvscs= i' but found '%1$s'"), virDomainControllerModelSCSITypeToString(contro= ller->model)); goto cleanup; } @@ -1330,7 +1326,7 @@ virVMXConfigScanResultsCollector(const char* name, if (virStrToLong_i(suffix, &p, 10, &idx) < 0 || *p !=3D '.' || idx < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("failed to parse the index of the VMX key '%s= '"), + _("failed to parse the index of the VMX key '%1= $s'"), name); return -1; } @@ -1360,7 +1356,7 @@ virVMXParseGenID(virConf *conf, uuidstr =3D g_strdup_printf("%.16llx%.16llx", vmid[0], vmid[1]); if (virUUIDParse(uuidstr, def->genid) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not parse UUID from string '%s'"), uuidstr= ); + _("Could not parse UUID from string '%1$s'"), uuids= tr); return -1; } def->genidRequested =3D true; @@ -1460,8 +1456,8 @@ virVMXParseConfig(virVMXContext *ctx, =20 if (config_version !=3D 8) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Expecting VMX entry 'config.version' to be 8 but= found " - "%lld"), config_version); + _("Expecting VMX entry 'config.version' to be 8 but= found %1$lld"), + config_version); goto cleanup; } =20 @@ -1473,8 +1469,7 @@ virVMXParseConfig(virVMXContext *ctx, =20 if (virtualHW_version < 4) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Expecting VMX entry 'virtualHW.version' to be " - "4 or higher but found %lld"), + _("Expecting VMX entry 'virtualHW.version' to be 4 = or higher but found %1$lld"), virtualHW_version); goto cleanup; } else if (virtualHW_version >=3D 13) { @@ -1524,8 +1519,8 @@ virVMXParseConfig(virVMXContext *ctx, =20 if (memsize <=3D 0 || memsize % 4 !=3D 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Expecting VMX entry 'memsize' to be an unsigned " - "integer (multiple of 4) but found %lld"), memsiz= e); + _("Expecting VMX entry 'memsize' to be an unsigned = integer (multiple of 4) but found %1$lld"), + memsize); goto cleanup; } =20 @@ -1565,8 +1560,8 @@ virVMXParseConfig(virVMXContext *ctx, =20 if (numvcpus <=3D 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Expecting VMX entry 'numvcpus' to be an unsigned= " - "integer greater than 0 but found %lld"), numvcpu= s); + _("Expecting VMX entry 'numvcpus' to be an unsigned= integer greater than 0 but found %1$lld"), + numvcpus); goto cleanup; } =20 @@ -1619,9 +1614,8 @@ virVMXParseConfig(virVMXContext *ctx, =20 if (g_strv_length(afflist) < numvcpus) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Expecting VMX entry 'sched.cpu.affinity' to = contain " - "at least as many values as 'numvcpus' (%lld)= but " - "found only %u value(s)"), numvcpus, g_strv_l= ength(afflist)); + _("Expecting VMX entry 'sched.cpu.affinity' to = contain at least as many values as 'numvcpus' (%1$lld) but found only %2$u = value(s)"), + numvcpus, g_strv_length(afflist)); goto cleanup; } =20 @@ -1636,16 +1630,15 @@ virVMXParseConfig(virVMXContext *ctx, =20 if (rc < 0 || *current !=3D '\0') { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Expecting VMX entry 'sched.cpu.affinity'= to be " - "a comma separated list of unsigned integ= ers but " - "found '%s'"), sched_cpu_affinity); + _("Expecting VMX entry 'sched.cpu.affinity'= to be a comma separated list of unsigned integers but found '%1$s'"), + sched_cpu_affinity); goto cleanup; } =20 if (number >=3D VIR_DOMAIN_CPUMASK_LEN) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("VMX entry 'sched.cpu.affinity' contains = a %d, " - "this value is too large"), number); + _("VMX entry 'sched.cpu.affinity' contains = a %1$d, this value is too large"), + number); goto cleanup; } =20 @@ -1671,9 +1664,8 @@ virVMXParseConfig(virVMXContext *ctx, } else if (virStrToLong_ull(sched_cpu_shares, NULL, 10, &def->cputune.shares) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Expecting VMX entry 'sched.cpu.shares' to be= an " - "unsigned integer or 'low', 'normal' or 'high= ' but " - "found '%s'"), sched_cpu_shares); + _("Expecting VMX entry 'sched.cpu.shares' to be= an unsigned integer or 'low', 'normal' or 'high' but found '%1$s'"), + sched_cpu_shares); goto cleanup; } def->cputune.sharesSpecified =3D true; @@ -1970,7 +1962,7 @@ virVMXParseConfig(virVMXContext *ctx, def->os.firmware =3D VIR_DOMAIN_OS_DEF_FIRMWARE_EFI; } else { virReportError(VIR_ERR_INTERNAL_ERROR, - _("VMX entry 'firmware' has unknown value '%s'"= ), + _("VMX entry 'firmware' has unknown value '%1$s= '"), firmware); goto cleanup; } @@ -2078,7 +2070,7 @@ virVMXParseSCSIController(virConf *conf, int controll= er, bool *present, =20 if (controller < 0 || controller > 3) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("SCSI controller index %d out of [0..3] range"), + _("SCSI controller index %1$d out of [0..3] range"), controller); return -1; } @@ -2114,8 +2106,7 @@ virVMXParseSCSIController(virConf *conf, int controll= er, bool *present, *virtualDev !=3D VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LSISAS1068 = && *virtualDev !=3D VIR_DOMAIN_CONTROLLER_MODEL_SCSI_VMPVSCSI)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Expecting VMX entry '%s' to be 'buslogic' or= 'lsilogic' " - "or 'lsisas1068' or 'pvscsi' but found '%s'"), + _("Expecting VMX entry '%1$s' to be 'buslogic' = or 'lsilogic' or 'lsisas1068' or 'pvscsi' but found '%2$s'"), virtualDev_name, virtualDev_string); goto cleanup; } @@ -2138,7 +2129,7 @@ virVMXParseSATAController(virConf *conf, int controll= er, bool *present) =20 if (controller < 0 || controller > 3) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("SATA controller index %d out of [0..3] range"), + _("SATA controller index %1$d out of [0..3] range"), controller); return -1; } @@ -2226,14 +2217,14 @@ virVMXParseDisk(virVMXContext *ctx, virDomainXMLOpt= ion *xmlopt, virConf *conf, if (busType =3D=3D VIR_DOMAIN_DISK_BUS_SCSI) { if (controllerOrBus < 0 || controllerOrBus > 3) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("SCSI controller index %d out of [0..3] r= ange"), + _("SCSI controller index %1$d out of [0..3]= range"), controllerOrBus); goto cleanup; } =20 if (unit < 0 || unit > vmdef->scsiBusMaxUnit || unit =3D=3D 7)= { virReportError(VIR_ERR_INTERNAL_ERROR, - _("SCSI unit index %d out of [0..6,8..%u] r= ange"), + _("SCSI unit index %1$d out of [0..6,8..%2$= u] range"), unit, vmdef->scsiBusMaxUnit); goto cleanup; } @@ -2246,14 +2237,14 @@ virVMXParseDisk(virVMXContext *ctx, virDomainXMLOpt= ion *xmlopt, virConf *conf, } else if (busType =3D=3D VIR_DOMAIN_DISK_BUS_SATA) { if (controllerOrBus < 0 || controllerOrBus > 3) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("SATA controller index %d out of [0..3] r= ange"), + _("SATA controller index %1$d out of [0..3]= range"), controllerOrBus); goto cleanup; } =20 if (unit < 0 || unit >=3D 30) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("SATA unit index %d out of [0..29] range"= ), + _("SATA unit index %1$d out of [0..29] rang= e"), unit); goto cleanup; } @@ -2264,14 +2255,14 @@ virVMXParseDisk(virVMXContext *ctx, virDomainXMLOpt= ion *xmlopt, virConf *conf, } else if (busType =3D=3D VIR_DOMAIN_DISK_BUS_IDE) { if (controllerOrBus < 0 || controllerOrBus > 1) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("IDE bus index %d out of [0..1] range"), + _("IDE bus index %1$d out of [0..1] range"), controllerOrBus); goto cleanup; } =20 if (unit < 0 || unit > 1) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("IDE unit index %d out of [0..1] range"),= unit); + _("IDE unit index %1$d out of [0..1] range"= ), unit); goto cleanup; } =20 @@ -2280,7 +2271,7 @@ virVMXParseDisk(virVMXContext *ctx, virDomainXMLOptio= n *xmlopt, virConf *conf, (*def)->dst =3D virIndexToDiskName(controllerOrBus * 2 + unit,= "hd"); } else { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Unsupported bus type '%s' for device type '%= s'"), + _("Unsupported bus type '%1$s' for device type = '%2$s'"), virDomainDiskBusTypeToString(busType), virDomainDiskDeviceTypeToString(device)); goto cleanup; @@ -2289,14 +2280,14 @@ virVMXParseDisk(virVMXContext *ctx, virDomainXMLOpt= ion *xmlopt, virConf *conf, if (busType =3D=3D VIR_DOMAIN_DISK_BUS_FDC) { if (controllerOrBus !=3D 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("FDC controller index %d out of [0] range= "), + _("FDC controller index %1$d out of [0] ran= ge"), controllerOrBus); goto cleanup; } =20 if (unit < 0 || unit > 1) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("FDC unit index %d out of [0..1] range"), + _("FDC unit index %1$d out of [0..1] range"= ), unit); goto cleanup; } @@ -2306,14 +2297,14 @@ virVMXParseDisk(virVMXContext *ctx, virDomainXMLOpt= ion *xmlopt, virConf *conf, (*def)->dst =3D virIndexToDiskName(unit, "fd"); } else { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Unsupported bus type '%s' for device type '%= s'"), + _("Unsupported bus type '%1$s' for device type = '%2$s'"), virDomainDiskBusTypeToString(busType), virDomainDiskDeviceTypeToString(device)); goto cleanup; } } else { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Unsupported device type '%s'"), + _("Unsupported device type '%1$s'"), virDomainDiskDeviceTypeToString(device)); goto cleanup; } @@ -2404,16 +2395,16 @@ virVMXParseDisk(virVMXContext *ctx, virDomainXMLOpt= ion *xmlopt, virConf *conf, STRCASENEQ(deviceType, "scsi-hardDisk") && STRCASENEQ(deviceType, "disk")) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Expecting VMX entry '%s' to be 'scsi= -hardDisk' " - "or 'disk' but found '%s'"), deviceTy= pe_name, + _("Expecting VMX entry '%1$s' to be 'sc= si-hardDisk' or 'disk' but found '%2$s'"), + deviceType_name, deviceType); goto cleanup; } else if (busType =3D=3D VIR_DOMAIN_DISK_BUS_IDE && STRCASENEQ(deviceType, "ata-hardDisk") && STRCASENEQ(deviceType, "disk")) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Expecting VMX entry '%s' to be 'ata-= hardDisk' " - "or 'disk' but found '%s'"), deviceTy= pe_name, + _("Expecting VMX entry '%1$s' to be 'at= a-hardDisk' or 'disk' but found '%2$s'"), + deviceType_name, deviceType); goto cleanup; } @@ -2431,8 +2422,7 @@ virVMXParseDisk(virVMXContext *ctx, virDomainXMLOptio= n *xmlopt, virConf *conf, "independent-nonpersistent"); } else { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Invalid or not yet handled value '%s' " - "for VMX entry '%s' for device type '%s'"), + _("Invalid or not yet handled value '%1$s' for = VMX entry '%2$s' for device type '%3$s'"), fileName, fileName_name, deviceType ? deviceType : "unknown"); goto cleanup; @@ -2454,8 +2444,8 @@ virVMXParseDisk(virVMXContext *ctx, virDomainXMLOptio= n *xmlopt, virConf *conf, =20 if (deviceType && STRCASENEQ(deviceType, "cdrom-image")) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Expecting VMX entry '%s' to be 'cdrom-im= age' " - "but found '%s'"), deviceType_name, devic= eType); + _("Expecting VMX entry '%1$s' to be 'cdrom-= image' but found '%2$s'"), + deviceType_name, deviceType); goto cleanup; } =20 @@ -2503,8 +2493,8 @@ virVMXParseDisk(virVMXContext *ctx, virDomainXMLOptio= n *xmlopt, virConf *conf, } else if (fileName && STREQ(fileName, "emptyBackingString")) { if (deviceType && STRCASENEQ(deviceType, "cdrom-image")) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Expecting VMX entry '%s' to be 'cdrom-im= age' " - "but found '%s'"), deviceType_name, devic= eType); + _("Expecting VMX entry '%1$s' to be 'cdrom-= image' but found '%2$s'"), + deviceType_name, deviceType); goto cleanup; } =20 @@ -2512,8 +2502,7 @@ virVMXParseDisk(virVMXContext *ctx, virDomainXMLOptio= n *xmlopt, virConf *conf, virDomainDiskSetSource(*def, NULL); } else { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Invalid or not yet handled value '%s' " - "for VMX entry '%s' for device type '%s'"), + _("Invalid or not yet handled value '%1$s' for = VMX entry '%2$s' for device type '%3$s'"), NULLSTR(fileName), fileName_name, deviceType ? deviceType : "unknown"); goto cleanup; @@ -2533,21 +2522,20 @@ virVMXParseDisk(virVMXContext *ctx, virDomainXMLOpt= ion *xmlopt, virConf *conf, VIR_FREE(tmp); } else { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Invalid or not yet handled value '%s' " - "for VMX entry '%s' for device type '%s'"), + _("Invalid or not yet handled value '%1$s' for = VMX entry '%2$s' for device type '%3$s'"), NULLSTR(fileName), fileName_name, deviceType ? deviceType : "unknown"); goto cleanup; } } else { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unsupported device t= ype '%s'"), + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unsupported device t= ype '%1$s'"), virDomainDiskDeviceTypeToString(device)); goto cleanup; } =20 if (virDomainDiskDefAssignAddress(xmlopt, *def, vmdef) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not assign address to disk '%s'"), + _("Could not assign address to disk '%1$s'"), virDomainDiskGetSource(*def)); goto cleanup; } @@ -2774,8 +2762,8 @@ virVMXParseEthernet(virConf *conf, int controller, vi= rDomainNetDef **def) if (generatedAddress !=3D NULL) { if (virMacAddrParse(generatedAddress, &(*def)->mac) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Expecting VMX entry '%s' to be MAC addre= ss but " - "found '%s'"), generatedAddress_name, + _("Expecting VMX entry '%1$s' to be MAC add= ress but found '%2$s'"), + generatedAddress_name, generatedAddress); goto cleanup; } @@ -2786,16 +2774,16 @@ virVMXParseEthernet(virConf *conf, int controller, = virDomainNetDef **def) if (address !=3D NULL) { if (virMacAddrParse(address, &(*def)->mac) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Expecting VMX entry '%s' to be MAC addre= ss but " - "found '%s'"), address_name, address); + _("Expecting VMX entry '%1$s' to be MAC add= ress but found '%2$s'"), + address_name, address); goto cleanup; } } (*def)->mac_type =3D VIR_DOMAIN_NET_MAC_TYPE_STATIC; } else { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Expecting VMX entry '%s' to be 'generated' or 's= tatic' or " - "'vpx' but found '%s'"), addressType_name, addres= sType); + _("Expecting VMX entry '%1$s' to be 'generated' or = 'static' or 'vpx' but found '%2$s'"), + addressType_name, addressType); goto cleanup; } =20 @@ -2826,8 +2814,7 @@ virVMXParseEthernet(virConf *conf, int controller, vi= rDomainNetDef **def) netmodel =3D VIR_DOMAIN_NET_MODEL_E1000E; } else { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Expecting VMX entry '%s' to be 'vlance' or '= vmxnet' or " - "'vmxnet3' or 'e1000' or 'e1000e' but found '= %s'"), + _("Expecting VMX entry '%1$s' to be 'vlance' or= 'vmxnet' or 'vmxnet3' or 'e1000' or 'e1000e' but found '%2$s'"), virtualDev_name, virtualDev); goto cleanup; } @@ -2860,7 +2847,7 @@ virVMXParseEthernet(virConf *conf, int controller, vi= rDomainNetDef **def) =20 if (virUUIDParse(switchId, (*def)->data.vds.switch_id) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not parse UUID from string '%s'"), + _("Could not parse UUID from string '%1$s'"), switchId); goto cleanup; } @@ -2888,7 +2875,7 @@ virVMXParseEthernet(virConf *conf, int controller, vi= rDomainNetDef **def) } else if (STRCASEEQ(connectionType, "hostonly")) { /* FIXME */ virReportError(VIR_ERR_INTERNAL_ERROR, - _("No yet handled value '%s' for VMX entry '%s'"), + _("No yet handled value '%1$s' for VMX entry '%2$s'= "), connectionType, connectionType_name); goto cleanup; } else if (STRCASEEQ(connectionType, "nat")) { @@ -2900,7 +2887,7 @@ virVMXParseEthernet(virConf *conf, int controller, vi= rDomainNetDef **def) (*def)->ifname =3D g_steal_pointer(&vnet); } else { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Invalid value '%s' for VMX entry '%s'"), connect= ionType, + _("Invalid value '%1$s' for VMX entry '%2$s'"), con= nectionType, connectionType_name); goto cleanup; } @@ -2959,7 +2946,7 @@ virVMXParseSerial(virVMXContext *ctx, virConf *conf, = int port, =20 if (port < 0 || port > 3) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Serial port index %d out of [0..3] range"), port= ); + _("Serial port index %1$d out of [0..3] range"), po= rt); return -1; } =20 @@ -3038,7 +3025,7 @@ virVMXParseSerial(virVMXContext *ctx, virConf *conf, = int port, =20 if (parsedUri->port =3D=3D 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("VMX entry '%s' doesn't contain a port part"), + _("VMX entry '%1$s' doesn't contain a port part= "), fileName_name); goto cleanup; } @@ -3066,7 +3053,7 @@ virVMXParseSerial(virVMXContext *ctx, virConf *conf, = int port, (*def)->source->data.tcp.protocol =3D VIR_DOMAIN_CHR_TCP_PROTO= COL_TLS; } else { virReportError(VIR_ERR_INTERNAL_ERROR, - _("VMX entry '%s' contains unsupported scheme '= %s'"), + _("VMX entry '%1$s' contains unsupported scheme= '%2$s'"), fileName_name, parsedUri->scheme); goto cleanup; } @@ -3077,14 +3064,14 @@ virVMXParseSerial(virVMXContext *ctx, virConf *conf= , int port, (*def)->source->data.tcp.listen =3D false; } else { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Expecting VMX entry '%s' to be 'server' or '= client' " - "but found '%s'"), network_endPoint_name, net= work_endPoint); + _("Expecting VMX entry '%1$s' to be 'server' or= 'client' but found '%2$s'"), + network_endPoint_name, network_endPoint); goto cleanup; } } else { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Expecting VMX entry '%s' to be 'device', 'file' = or 'pipe' " - "or 'network' but found '%s'"), fileType_name, fi= leType); + _("Expecting VMX entry '%1$s' to be 'device', 'file= ' or 'pipe' or 'network' but found '%2$s'"), + fileType_name, fileType); goto cleanup; } =20 @@ -3126,7 +3113,7 @@ virVMXParseParallel(virVMXContext *ctx, virConf *conf= , int port, =20 if (port < 0 || port > 2) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Parallel port index %d out of [0..2] range"), po= rt); + _("Parallel port index %1$d out of [0..2] range"), = port); return -1; } =20 @@ -3179,8 +3166,8 @@ virVMXParseParallel(virVMXContext *ctx, virConf *conf= , int port, goto cleanup; } else { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Expecting VMX entry '%s' to be 'device' or 'file= ' but " - "found '%s'"), fileType_name, fileType); + _("Expecting VMX entry '%1$s' to be 'device' or 'fi= le' but found '%2$s'"), + fileType_name, fileType); goto cleanup; } =20 @@ -3266,7 +3253,7 @@ virVMXFormatConfig(virVMXContext *ctx, virDomainXMLOp= tion *xmlopt, virDomainDef =20 if (def->virtType !=3D VIR_DOMAIN_VIRT_VMWARE) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Expecting virt type to be '%s' but found '%s'"), + _("Expecting virt type to be '%1$s' but found '%2$s= '"), virDomainVirtTypeToString(VIR_DOMAIN_VIRT_VMWARE), virDomainVirtTypeToString(def->virtType)); return NULL; @@ -3289,8 +3276,7 @@ virVMXFormatConfig(virVMXContext *ctx, virDomainXMLOp= tion *xmlopt, virDomainDef virBufferAddLit(&buffer, "guestOS =3D \"other-64\"\n"); } else { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Expecting domain XML attribute 'arch' of entry '= os/type' " - "to be 'i686' or 'x86_64' but found '%s'"), + _("Expecting domain XML attribute 'arch' of entry '= os/type' to be 'i686' or 'x86_64' but found '%1$s'"), virArchToString(def->os.arch)); goto cleanup; } @@ -3303,7 +3289,7 @@ virVMXFormatConfig(virVMXContext *ctx, virDomainXMLOp= tion *xmlopt, virDomainDef virBufferAddLit(&buffer, "smbios.reflecthost =3D \"true\"\n"); } else { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Unsupported SMBIOS mode '%s'"), + _("Unsupported SMBIOS mode '%1$s'"), virDomainSmbiosModeTypeToString(def->os.smbios_mode= )); goto cleanup; } @@ -3385,8 +3371,7 @@ virVMXFormatConfig(virVMXContext *ctx, virDomainXMLOp= tion *xmlopt, virDomainDef =20 if (def->cpu->mode !=3D VIR_CPU_MODE_CUSTOM) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Expecting domain XML CPU mode 'custom' but " - "found '%s'"), + _("Expecting domain XML CPU mode 'custom' but f= ound '%1$s'"), virCPUModeTypeToString(def->cpu->mode)); goto cleanup; } @@ -3406,8 +3391,7 @@ virVMXFormatConfig(virVMXContext *ctx, virDomainXMLOp= tion *xmlopt, virDomainDef calculated_vcpus =3D def->cpu->sockets * def->cpu->cores; if (calculated_vcpus !=3D maxvcpus) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Expecting domain XML CPU sockets per core as= %d " - "but found %d"), + _("Expecting domain XML CPU sockets per core as= %1$d but found %2$d"), maxvcpus, calculated_vcpus); goto cleanup; } @@ -3428,8 +3412,7 @@ virVMXFormatConfig(virVMXContext *ctx, virDomainXMLOp= tion *xmlopt, virDomainDef =20 if (sched_cpu_affinity_length < maxvcpus) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Expecting domain XML attribute 'cpuset' of e= ntry " - "'vcpu' to contain at least %d CPU(s)"), + _("Expecting domain XML attribute 'cpuset' of e= ntry 'vcpu' to contain at least %1$d CPU(s)"), maxvcpus); goto cleanup; } @@ -3479,7 +3462,7 @@ virVMXFormatConfig(virVMXContext *ctx, virDomainXMLOp= tion *xmlopt, virDomainDef case VIR_DOMAIN_GRAPHICS_TYPE_EGL_HEADLESS: case VIR_DOMAIN_GRAPHICS_TYPE_DBUS: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Unsupported graphics type '%s'"), + _("Unsupported graphics type '%1$s'"), virDomainGraphicsTypeToString(def->graphics[i]-= >type)); goto cleanup; =20 @@ -3538,7 +3521,7 @@ virVMXFormatConfig(virVMXContext *ctx, virDomainXMLOp= tion *xmlopt, virDomainDef case VIR_DOMAIN_DISK_DEVICE_LAST: default: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Unsupported disk device type '%s'"), + _("Unsupported disk device type '%1$s'"), virDomainDiskDeviceTypeToString(def->disks[i]->= device)); goto cleanup; } @@ -3710,7 +3693,7 @@ virVMXFormatDisk(virVMXContext *ctx, virDomainDiskDef= *def, def->device !=3D VIR_DOMAIN_DISK_DEVICE_CDROM && def->device !=3D VIR_DOMAIN_DISK_DEVICE_LUN) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Invalid device type supplied: %s"), deviceType); + _("Invalid device type supplied: %1$s"), deviceType= ); return -1; } =20 @@ -3718,8 +3701,8 @@ virVMXFormatDisk(virVMXContext *ctx, virDomainDiskDef= *def, if (type !=3D VIR_STORAGE_TYPE_FILE && type !=3D VIR_STORAGE_TYPE_BLOCK) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("%s %s '%s' has unsupported type '%s', expecting " - "'%s' or '%s'"), busType, deviceType, def->dst, + _("%1$s %2$s '%3$s' has unsupported type '%4$s', ex= pecting '%5$s' or '%6$s'"), + busType, deviceType, def->dst, diskType, virStorageTypeToString(VIR_STORAGE_TYPE_FILE), virStorageTypeToString(VIR_STORAGE_TYPE_BLOCK)); @@ -3738,7 +3721,7 @@ virVMXFormatDisk(virVMXContext *ctx, virDomainDiskDef= *def, } } else { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Unsupported bus type '%s' for %s"), + _("Unsupported bus type '%1$s' for %2$s"), busType, deviceType); return -1; } @@ -3762,7 +3745,7 @@ virVMXFormatDisk(virVMXContext *ctx, virDomainDiskDef= *def, vmxDeviceType =3D "cdrom-raw"; } else { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("%s %s '%s' has an unsupported type '%s'"), + _("%1$s %2$s '%3$s' has an unsupported type '%4$s'"= ), busType, deviceType, def->dst, diskType); return -1; } @@ -3778,8 +3761,7 @@ virVMXFormatDisk(virVMXContext *ctx, virDomainDiskDef= *def, if (src) { if (!virStringHasCaseSuffix(src, fileExt)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Image file for %s %s '%s' has " - "unsupported suffix, expecting '%s'"), + _("Image file for %1$s %2$s '%3$s' has unsu= pported suffix, expecting '%4$s'"), busType, deviceType, def->dst, fileExt); return -1; } @@ -3817,7 +3799,7 @@ virVMXFormatDisk(virVMXContext *ctx, virDomainDiskDef= *def, busType, controllerOrBus, unit); } else if (def->cachemode !=3D VIR_DOMAIN_DISK_CACHE_DEFAULT) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("%s harddisk '%s' has unsupported cache mode = '%s'"), + _("%1$s harddisk '%2$s' has unsupported cache m= ode '%3$s'"), busType, def->dst, virDomainDiskCacheTypeToString(def->cachemode)); return -1; @@ -3876,8 +3858,8 @@ virVMXFormatFloppy(virVMXContext *ctx, virDomainDiskD= ef *def, } } else { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Floppy '%s' has unsupported type '%s', expecting= '%s' " - "or '%s'"), def->dst, + _("Floppy '%1$s' has unsupported type '%2$s', expec= ting '%3$s' or '%4$s'"), + def->dst, virStorageTypeToString(type), virStorageTypeToString(VIR_STORAGE_TYPE_FILE), virStorageTypeToString(VIR_STORAGE_TYPE_BLOCK)); @@ -3894,7 +3876,7 @@ virVMXFormatFileSystem(virDomainFSDef *def, int numbe= r, virBuffer *buffer) { if (def->type !=3D VIR_DOMAIN_FS_TYPE_MOUNT) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Only '%s' filesystem type is supported"), + _("Only '%1$s' filesystem type is supported"), virDomainFSTypeToString(VIR_DOMAIN_FS_TYPE_MOUNT)); return -1; } @@ -3934,7 +3916,7 @@ virVMXFormatEthernet(virDomainNetDef *def, int contro= ller, =20 if (controller < 0 || controller > controller_limit) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Ethernet controller index %d out of [0..%d] rang= e"), + _("Ethernet controller index %1$d out of [0..%2$d] = range"), controller, controller_limit); return -1; } @@ -3950,9 +3932,7 @@ virVMXFormatEthernet(virDomainNetDef *def, int contro= ller, def->model !=3D VIR_DOMAIN_NET_MODEL_E1000 && def->model !=3D VIR_DOMAIN_NET_MODEL_E1000E) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Expecting domain XML entry 'devices/interfac= e/model' " - "to be 'vlance' or 'vmxnet' or 'vmxnet2' or '= vmxnet3' " - "or 'e1000' or 'e1000e' but found '%s'"), + _("Expecting domain XML entry 'devices/interfac= e/model' to be 'vlance' or 'vmxnet' or 'vmxnet2' or 'vmxnet3' or 'e1000' or= 'e1000e' but found '%1$s'"), virDomainNetModelTypeToString(def->model)); return -1; } @@ -4026,7 +4006,7 @@ virVMXFormatEthernet(virDomainNetDef *def, int contro= ller, case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_VDPA: - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unsupported net type= '%s'"), + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unsupported net type= '%1$s'"), virDomainNetTypeToString(def->type)); return -1; =20 @@ -4102,7 +4082,7 @@ virVMXFormatSerial(virVMXContext *ctx, virDomainChrDe= f *def, =20 if (def->target.port < 0 || def->target.port > 3) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Serial port index %d out of [0..3] range"), + _("Serial port index %1$d out of [0..3] range"), def->target.port); return -1; } @@ -4166,7 +4146,7 @@ virVMXFormatSerial(virVMXContext *ctx, virDomainChrDe= f *def, =20 default: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Unsupported character device TCP protocol '%= s'"), + _("Unsupported character device TCP protocol '%= 1$s'"), virDomainChrTcpProtocolTypeToString( def->source->data.tcp.protocol)); return -1; @@ -4184,7 +4164,7 @@ virVMXFormatSerial(virVMXContext *ctx, virDomainChrDe= f *def, =20 default: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Unsupported character device type '%s'"), + _("Unsupported character device type '%1$s'"), virDomainChrTypeToString(def->source->type)); return -1; } @@ -4207,7 +4187,7 @@ virVMXFormatParallel(virVMXContext *ctx, virDomainChr= Def *def, =20 if (def->target.port < 0 || def->target.port > 2) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Parallel port index %d out of [0..2] range"), + _("Parallel port index %1$d out of [0..2] range"), def->target.port); return -1; } @@ -4241,7 +4221,7 @@ virVMXFormatParallel(virVMXContext *ctx, virDomainChr= Def *def, =20 default: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Unsupported character device type '%s'"), + _("Unsupported character device type '%1$s'"), virDomainChrTypeToString(def->source->type)); return -1; } @@ -4258,7 +4238,7 @@ virVMXFormatSVGA(virDomainVideoDef *def, virBuffer *b= uffer) =20 if (def->type !=3D VIR_DOMAIN_VIDEO_TYPE_VMVGA) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Unsupported video device type '%s'"), + _("Unsupported video device type '%1$s'"), virDomainVideoTypeToString(def->type)); return -1; } --=20 2.39.2