From nobody Fri Dec 19 06:33:45 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=1678464699; cv=none; d=zohomail.com; s=zohoarc; b=hENZIyRBoiD9+KHgXTu/8aGw6EFIeno+DYEzUsdSw4VhAEL4xraaZWH0lJbGJugdp/LWEoHDemIjQEKt06t8ycRaoX7s1VUQVGafOsxKxXiOvx8d+a5/ycso6I4Awg+xz9UJ1D0znW2N2b7NEfcBNVGe2PInHzYNSQLI32ThF14= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1678464699; 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=pJj9q4yTP3l9y4eREudHsRQrzvWMBOCigIRwpLJbK8M=; b=Yc5RCmtlb10EoeUEKggXZCtadZ0yvg971piLMJgK18QdOizQNMFgNXowiqSVHF+J7LiIXH+Peeie72zFrADQgGQsIcIQcsUc/RzfXTuQrjtqxl40dfXOrE9Rknac4UZczM6tN1ymz7deNVNSgIC0rn5UOPr+OLDG5RizYx7xJTk= 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 1678464699178947.6366703874409; Fri, 10 Mar 2023 08:11:39 -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-651-_dQftbgqMkOIro9WVQ53xQ-1; Fri, 10 Mar 2023 11:11:27 -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 4F7293C16E96; Fri, 10 Mar 2023 16:10:49 +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 34688492B04; Fri, 10 Mar 2023 16:10:49 +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 197FB19472C0; Fri, 10 Mar 2023 16:10:49 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 9105919472DB for ; Fri, 10 Mar 2023 16:10:47 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 8BF7D140EBF6; Fri, 10 Mar 2023 16:10:47 +0000 (UTC) Received: from rein.int.mamuti.net (unknown [10.45.226.138]) by smtp.corp.redhat.com (Postfix) with ESMTP id B35FE1415117 for ; Fri, 10 Mar 2023 16:10:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678464698; 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=pJj9q4yTP3l9y4eREudHsRQrzvWMBOCigIRwpLJbK8M=; b=d31B3ufnf26HHei3CqwXeZRSDmYtnkgU51GMVDVDVhvFA7JZOu7tslOn/1ZovXmmPN141e bunCm4voTAxarRKv/0Wtt6WqemI5MzIbI2RbIvxVpw1v/VZEJODxzs6YJ3D3aRCux8PoGM 16FuWkhoUCMxEKvuzwDpIRAbjyJzh4c= X-MC-Unique: _dQftbgqMkOIro9WVQ53xQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Jiri Denemark To: libvir-list@redhat.com Subject: [libvirt PATCH 26/51] qemu/qemu_driver: Update format strings in translated messages Date: Fri, 10 Mar 2023 17:09:42 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 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: 1678464701201100008 Content-Type: text/plain; charset="utf-8" Signed-off-by: Jiri Denemark --- src/qemu/qemu_driver.c | 428 +++++++++++++++++++---------------------- 1 file changed, 203 insertions(+), 225 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index fd8136be37..13f8458d4d 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -188,7 +188,7 @@ qemuAutostartDomain(virDomainObj *vm, if (qemuProcessBeginJob(vm, VIR_DOMAIN_JOB_OPERATION_START, flags) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to start job on VM '%s': %s"), + _("Failed to start job on VM '%1$s': %2$s"), vm->def->name, virGetLastErrorMessage()); goto cleanup; } @@ -196,7 +196,7 @@ qemuAutostartDomain(virDomainObj *vm, if (qemuDomainObjStart(NULL, driver, vm, flags, VIR_ASYNC_JOB_START) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to autostart VM '%s': %s"), + _("Failed to autostart VM '%1$s': %2$s"), vm->def->name, virGetLastErrorMessage()); } =20 @@ -370,7 +370,7 @@ qemuDomainSnapshotLoad(virDomainObj *vm, if (virFileReadAll(fullpath, 1024*1024*1, &xmlStr) < 0) { /* Nothing we can do here, skip this one */ virReportSystemError(errno, - _("Failed to read snapshot file %s"), + _("Failed to read snapshot file %1$s"), fullpath); continue; } @@ -382,7 +382,7 @@ qemuDomainSnapshotLoad(virDomainObj *vm, if (snapdef =3D=3D NULL) { /* Nothing we can do here, skip this one */ virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to parse snapshot XML from file '%s'"= ), + _("Failed to parse snapshot XML from file '%1$s= '"), fullpath); continue; } @@ -391,20 +391,20 @@ qemuDomainSnapshotLoad(virDomainObj *vm, if (cur && snap) { if (current) virReportError(VIR_ERR_INTERNAL_ERROR, - _("Too many snapshots claiming to be curren= t for domain %s"), + _("Too many snapshots claiming to be curren= t for domain %1$s"), vm->def->name); current =3D snap; } } if (direrr < 0) virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to fully read directory %s"), + _("Failed to fully read directory %1$s"), snapDir); =20 virDomainSnapshotSetCurrent(vm->snapshots, current); if (virDomainSnapshotUpdateRelations(vm->snapshots) < 0) virReportError(VIR_ERR_INTERNAL_ERROR, - _("Snapshots have inconsistent relations for domain= %s"), + _("Snapshots have inconsistent relations for domain= %1$s"), vm->def->name); =20 /* FIXME: qemu keeps internal track of snapshots. We can get access @@ -465,7 +465,7 @@ qemuDomainCheckpointLoad(virDomainObj *vm, if (virFileReadAll(fullpath, 1024*1024*1, &xmlStr) < 0) { /* Nothing we can do here, skip this one */ virReportSystemError(errno, - _("Failed to read checkpoint file %s"), + _("Failed to read checkpoint file %1$s"), fullpath); continue; } @@ -482,12 +482,12 @@ qemuDomainCheckpointLoad(virDomainObj *vm, } if (direrr < 0) virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to fully read directory %s"), + _("Failed to fully read directory %1$s"), chkDir); =20 if (virDomainCheckpointUpdateRelations(vm->checkpoints, ¤t) < 0) virReportError(VIR_ERR_INTERNAL_ERROR, - _("Checkpoints have inconsistent relations for doma= in %s"), + _("Checkpoints have inconsistent relations for doma= in %1$s"), vm->def->name); virDomainCheckpointSetCurrent(vm->checkpoints, current); =20 @@ -610,69 +610,69 @@ qemuStateInitialize(bool privileged, goto error; =20 if (g_mkdir_with_parents(cfg->stateDir, 0777) < 0) { - virReportSystemError(errno, _("Failed to create state dir %s"), + virReportSystemError(errno, _("Failed to create state dir %1$s"), cfg->stateDir); goto error; } if (g_mkdir_with_parents(cfg->libDir, 0777) < 0) { - virReportSystemError(errno, _("Failed to create lib dir %s"), + virReportSystemError(errno, _("Failed to create lib dir %1$s"), cfg->libDir); goto error; } if (g_mkdir_with_parents(cfg->cacheDir, 0777) < 0) { - virReportSystemError(errno, _("Failed to create cache dir %s"), + virReportSystemError(errno, _("Failed to create cache dir %1$s"), cfg->cacheDir); goto error; } if (g_mkdir_with_parents(cfg->saveDir, 0777) < 0) { - virReportSystemError(errno, _("Failed to create save dir %s"), + virReportSystemError(errno, _("Failed to create save dir %1$s"), cfg->saveDir); goto error; } if (g_mkdir_with_parents(cfg->snapshotDir, 0777) < 0) { - virReportSystemError(errno, _("Failed to create snapshot dir %s"), + virReportSystemError(errno, _("Failed to create snapshot dir %1$s"= ), cfg->snapshotDir); goto error; } if (g_mkdir_with_parents(cfg->checkpointDir, 0777) < 0) { - virReportSystemError(errno, _("Failed to create checkpoint dir %s"= ), + virReportSystemError(errno, _("Failed to create checkpoint dir %1$= s"), cfg->checkpointDir); goto error; } if (g_mkdir_with_parents(cfg->autoDumpPath, 0777) < 0) { - virReportSystemError(errno, _("Failed to create dump dir %s"), + virReportSystemError(errno, _("Failed to create dump dir %1$s"), cfg->autoDumpPath); goto error; } if (g_mkdir_with_parents(cfg->channelTargetDir, 0777) < 0) { - virReportSystemError(errno, _("Failed to create channel target dir= %s"), + virReportSystemError(errno, _("Failed to create channel target dir= %1$s"), cfg->channelTargetDir); goto error; } if (g_mkdir_with_parents(cfg->nvramDir, 0777) < 0) { - virReportSystemError(errno, _("Failed to create nvram dir %s"), + virReportSystemError(errno, _("Failed to create nvram dir %1$s"), cfg->nvramDir); goto error; } if (g_mkdir_with_parents(cfg->memoryBackingDir, 0777) < 0) { - virReportSystemError(errno, _("Failed to create memory backing dir= %s"), + virReportSystemError(errno, _("Failed to create memory backing dir= %1$s"), cfg->memoryBackingDir); goto error; } if (g_mkdir_with_parents(cfg->slirpStateDir, 0777) < 0) { - virReportSystemError(errno, _("Failed to create slirp state dir %s= "), + virReportSystemError(errno, _("Failed to create slirp state dir %1= $s"), cfg->slirpStateDir); goto error; } if (g_mkdir_with_parents(cfg->passtStateDir, 0777) < 0) { - virReportSystemError(errno, _("Failed to create passt state dir %s= "), + virReportSystemError(errno, _("Failed to create passt state dir %1= $s"), cfg->passtStateDir); goto error; } =20 if (virDirCreate(cfg->dbusStateDir, 0770, cfg->user, cfg->group, VIR_DIR_CREATE_ALLOW_EXIST) < 0) { - virReportSystemError(errno, _("Failed to create dbus state dir %s"= ), + virReportSystemError(errno, _("Failed to create dbus state dir %1$= s"), cfg->dbusStateDir); goto error; } @@ -694,7 +694,7 @@ qemuStateInitialize(bool privileged, if (cfg->macFilter) { if (!(qemu_driver->ebtables =3D ebtablesContextNew("qemu"))) { virReportSystemError(errno, - _("failed to enable mac filter in '%s'"), + _("failed to enable mac filter in '%1$s'"= ), __FILE__); goto error; } @@ -747,35 +747,35 @@ qemuStateInitialize(bool privileged, =20 if (chown(cfg->libDir, cfg->user, cfg->group) < 0) { virReportSystemError(errno, - _("unable to set ownership of '%s' to use= r %d:%d"), + _("unable to set ownership of '%1$s' to u= ser %2$d:%3$d"), cfg->libDir, (int)cfg->user, (int)cfg->group); goto error; } if (chown(cfg->saveDir, cfg->user, cfg->group) < 0) { virReportSystemError(errno, - _("unable to set ownership of '%s' to %d:= %d"), + _("unable to set ownership of '%1$s' to %= 2$d:%3$d"), cfg->saveDir, (int)cfg->user, (int)cfg->group); goto error; } if (chown(cfg->snapshotDir, cfg->user, cfg->group) < 0) { virReportSystemError(errno, - _("unable to set ownership of '%s' to %d:= %d"), + _("unable to set ownership of '%1$s' to %= 2$d:%3$d"), cfg->snapshotDir, (int)cfg->user, (int)cfg->group); goto error; } if (chown(cfg->checkpointDir, cfg->user, cfg->group) < 0) { virReportSystemError(errno, - _("unable to set ownership of '%s' to %d:= %d"), + _("unable to set ownership of '%1$s' to %= 2$d:%3$d"), cfg->checkpointDir, (int)cfg->user, (int)cfg->group); goto error; } if (chown(cfg->autoDumpPath, cfg->user, cfg->group) < 0) { virReportSystemError(errno, - _("unable to set ownership of '%s' to %d:= %d"), + _("unable to set ownership of '%1$s' to %= 2$d:%3$d"), cfg->autoDumpPath, (int)cfg->user, (int)cfg->group); goto error; @@ -784,42 +784,42 @@ qemuStateInitialize(bool privileged, =20 if (chown(channeldir, cfg->user, cfg->group) < 0) { virReportSystemError(errno, - _("unable to set ownership of '%s' to %d:= %d"), + _("unable to set ownership of '%1$s' to %= 2$d:%3$d"), channeldir, (int)cfg->user, (int)cfg->group); goto error; } if (chown(cfg->channelTargetDir, cfg->user, cfg->group) < 0) { virReportSystemError(errno, - _("unable to set ownership of '%s' to %d:= %d"), + _("unable to set ownership of '%1$s' to %= 2$d:%3$d"), cfg->channelTargetDir, (int)cfg->user, (int)cfg->group); goto error; } if (chown(cfg->nvramDir, cfg->user, cfg->group) < 0) { virReportSystemError(errno, - _("unable to set ownership of '%s' to %d:= %d"), + _("unable to set ownership of '%1$s' to %= 2$d:%3$d"), cfg->nvramDir, (int)cfg->user, (int)cfg->group); goto error; } if (chown(cfg->memoryBackingDir, cfg->user, cfg->group) < 0) { virReportSystemError(errno, - _("unable to set ownership of '%s' to %d:= %d"), + _("unable to set ownership of '%1$s' to %= 2$d:%3$d"), cfg->memoryBackingDir, (int)cfg->user, (int)cfg->group); goto error; } if (chown(cfg->slirpStateDir, cfg->user, cfg->group) < 0) { virReportSystemError(errno, - _("unable to set ownership of '%s' to %d:= %d"), + _("unable to set ownership of '%1$s' to %= 2$d:%3$d"), cfg->slirpStateDir, (int)cfg->user, (int)cfg->group); goto error; } if (chown(cfg->passtStateDir, cfg->user, cfg->group) < 0) { virReportSystemError(errno, - _("unable to set ownership of '%s' to %d:= %d"), + _("unable to set ownership of '%1$s' to %= 2$d:%3$d"), cfg->passtStateDir, (int)cfg->user, (int)cfg->group); goto error; @@ -1131,8 +1131,7 @@ static virDrvOpenStatus qemuConnectOpen(virConnectPtr= conn, =20 if (STRNEQ(root, qemu_driver->embeddedRoot)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Cannot open embedded driver at path '%s', " - "already open with path '%s'"), + _("Cannot open embedded driver at path '%1$s', = already open with path '%2$s'"), root, qemu_driver->embeddedRoot); return VIR_DRV_OPEN_ERROR; } @@ -1182,7 +1181,7 @@ qemuConnectSupportsFeature(virConnectPtr conn, int fe= ature) 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_V2: @@ -1264,7 +1263,7 @@ qemuConnectGetMaxVcpus(virConnectPtr conn G_GNUC_UNUS= ED, const char *type) return virHostCPUGetKVMMaxVCPUs(); =20 virReportError(VIR_ERR_INVALID_ARG, - _("unknown type '%s'"), type); + _("unknown type '%1$s'"), type); return -1; } =20 @@ -1305,7 +1304,7 @@ qemuGetSchedstatDelay(unsigned long long *cpudelay, =20 if (sscanf(buf, "%*u %llu", cpudelay) !=3D 1) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to parse schedstat info at '%s'"), + _("Unable to parse schedstat info at '%1$s'"), path); return -1; } @@ -1400,7 +1399,7 @@ static virDomainPtr qemuDomainLookupByID(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 @@ -1427,7 +1426,7 @@ static virDomainPtr qemuDomainLookupByUUID(virConnect= Ptr 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 @@ -1452,7 +1451,7 @@ static virDomainPtr qemuDomainLookupByName(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 @@ -2439,7 +2438,7 @@ static int qemuDomainSendKey(virDomainPtr domain, keycodes[i]); if (keycode < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("cannot translate keycode %u of %s codese= t to qnum keycode"), + _("cannot translate keycode %1$u of %2$s co= deset to qnum keycode"), keycodes[i], virKeycodeSetTypeToString(codeset)); return -1; @@ -2981,7 +2980,7 @@ qemuDomainManagedSaveRemove(virDomainPtr dom, unsigne= d int flags) =20 if (unlink(name) < 0) { virReportSystemError(errno, - _("Failed to remove managed save file '%s'"), + _("Failed to remove managed save file '%1$s'"= ), name); goto cleanup; } @@ -3021,7 +3020,7 @@ qemuDumpWaitForCompletion(virDomainObj *vm) if (privJobCurrent->stats.dump.status =3D=3D QEMU_MONITOR_DUMP_STATUS_= FAILED) { if (vm->job->error) virReportError(VIR_ERR_OPERATION_FAILED, - _("memory-only dump failed: %s"), + _("memory-only dump failed: %1$s"), vm->job->error); else virReportError(VIR_ERR_OPERATION_FAILED, "%s", @@ -3059,8 +3058,7 @@ qemuDumpToFd(virQEMUDriver *driver, =20 if (rc <=3D 0) { virReportError(VIR_ERR_INVALID_ARG, - _("unsupported dumpformat '%s' " - "for this QEMU binary"), + _("unsupported dumpformat '%1$s' for this QEMU = binary"), dumpformat); qemuDomainObjExitMonitor(vm); return -1; @@ -3123,7 +3121,7 @@ doCoreDump(virQEMUDriver *driver, if (dump_flags & VIR_DUMP_MEMORY_ONLY) { if (!(memory_dump_format =3D qemuDumpFormatTypeToString(dumpformat= ))) { virReportError(VIR_ERR_INVALID_ARG, - _("unknown dumpformat '%d'"), dumpformat); + _("unknown dumpformat '%1$d'"), dumpformat); goto cleanup; } =20 @@ -3152,7 +3150,7 @@ doCoreDump(virQEMUDriver *driver, =20 if (VIR_CLOSE(fd) < 0) { virReportSystemError(errno, - _("unable to close file %s"), + _("unable to close file %1$s"), path); goto cleanup; } @@ -3354,7 +3352,7 @@ qemuDomainScreenshot(virDomainPtr dom, tmp =3D g_strdup_printf("%s/qemu.screendump.XXXXXX", priv->libDir); =20 if ((tmp_fd =3D g_mkstemp_full(tmp, O_RDWR | O_CLOEXEC, S_IRUSR | S_IW= USR)) =3D=3D -1) { - virReportSystemError(errno, _("g_mkstemp(\"%s\") failed"), tmp); + virReportSystemError(errno, _("g_mkstemp(\"%1$s\") failed"), tmp); goto endjob; } unlink_tmp =3D true; @@ -3369,7 +3367,7 @@ qemuDomainScreenshot(virDomainPtr dom, qemuDomainObjExitMonitor(vm); =20 if (VIR_CLOSE(tmp_fd) < 0) { - virReportSystemError(errno, _("unable to close %s"), tmp); + virReportSystemError(errno, _("unable to close %1$s"), tmp); goto endjob; } =20 @@ -4103,8 +4101,7 @@ qemuDomainSetVcpusAgent(virDomainObj *vm, =20 if (nvcpus > virDomainDefGetVcpus(vm->def)) { virReportError(VIR_ERR_INVALID_ARG, - _("requested vcpu count is greater than the count " - "of enabled vcpus in the domain: %d > %d"), + _("requested vcpu count is greater than the count o= f enabled vcpus in the domain: %1$d > %2$d"), nvcpus, virDomainDefGetVcpus(vm->def)); goto cleanup; } @@ -4274,7 +4271,7 @@ qemuDomainPinVcpuLive(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)); goto cleanup; } @@ -4359,7 +4356,7 @@ qemuDomainPinVcpuFlags(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; } @@ -4875,7 +4872,7 @@ qemuDomainPinIOThread(virDomainPtr dom, =20 if (!(iothrid =3D virDomainIOThreadIDFind(def, iothread_id))) { virReportError(VIR_ERR_INVALID_ARG, - _("iothread %d not found"), iothread_id); + _("iothread %1$d not found"), iothread_id); goto endjob; } =20 @@ -4887,8 +4884,8 @@ qemuDomainPinIOThread(virDomainPtr dom, goto endjob; if (virDomainCgroupSetupCpusetCpus(cgroup_iothread, pcpumap) <= 0) { virReportError(VIR_ERR_OPERATION_INVALID, - _("failed to set cpuset.cpus in cgroup" - " for iothread %d"), iothread_id); + _("failed to set cpuset.cpus in cgroup for = iothread %1$d"), + iothread_id); goto endjob; } } @@ -4920,7 +4917,7 @@ qemuDomainPinIOThread(virDomainPtr dom, =20 if (!(iothrid =3D virDomainIOThreadIDFind(persistentDef, iothread_= id))) { virReportError(VIR_ERR_INVALID_ARG, - _("iothreadid %d not found"), iothread_id); + _("iothreadid %1$d not found"), iothread_id); goto endjob; } =20 @@ -4986,8 +4983,7 @@ qemuDomainHotplugAddIOThread(virDomainObj *vm, =20 if (new_niothreads !=3D exp_niothreads) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("got wrong number of IOThread ids from QEMU monit= or. " - "got %d, wanted %d"), + _("got wrong number of IOThread ids from QEMU monit= or. got %1$d, wanted %2$d"), new_niothreads, exp_niothreads); goto cleanup; } @@ -5003,7 +4999,7 @@ qemuDomainHotplugAddIOThread(virDomainObj *vm, =20 if (idx =3D=3D new_niothreads) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("cannot find new IOThread '%u' in QEMU monitor."), + _("cannot find new IOThread '%1$u' in QEMU monitor.= "), iothread_id); goto cleanup; } @@ -5118,8 +5114,7 @@ qemuDomainHotplugDelIOThread(virDomainObj *vm, =20 if (new_niothreads !=3D exp_niothreads) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("got wrong number of IOThread ids from QEMU monit= or. " - "got %d, wanted %d"), + _("got wrong number of IOThread ids from QEMU monit= or. got %1$d, wanted %2$d"), new_niothreads, exp_niothreads); goto cleanup; } @@ -5238,28 +5233,28 @@ qemuDomainIOThreadParseParams(virTypedParameterPtr = params, =20 if (iothread->set_poll_max_ns && iothread->poll_max_ns > INT_MAX) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("poll-max-ns (%llu) must be less than or equal to= %d"), + _("poll-max-ns (%1$llu) must be less than or equal = to %2$d"), iothread->poll_max_ns, INT_MAX); return -1; } =20 if (iothread->set_poll_grow && iothread->poll_grow > INT_MAX) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("poll-grow (%u) must be less than or equal to %d"= ), + _("poll-grow (%1$u) must be less than or equal to %= 2$d"), iothread->poll_grow, INT_MAX); return -1; } =20 if (iothread->set_poll_shrink && iothread->poll_shrink > INT_MAX) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("poll-shrink (%u) must be less than or equal to %= d"), + _("poll-shrink (%1$u) must be less than or equal to= %2$d"), iothread->poll_shrink, INT_MAX); return -1; } =20 if (iothread->set_thread_pool_min && iothread->thread_pool_min < -1) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("thread_pool_min (%d) must be equal to or greater= than -1"), + _("thread_pool_min (%1$d) must be equal to or great= er than -1"), iothread->thread_pool_min); return -1; } @@ -5267,7 +5262,7 @@ qemuDomainIOThreadParseParams(virTypedParameterPtr pa= rams, if (iothread->set_thread_pool_max && (iothread->thread_pool_max < -1 || iothread->thread_pool_max =3D= =3D 0)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("thread_pool_max (%d) must be a positive number o= r -1"), + _("thread_pool_max (%1$d) must be a positive number= or -1"), iothread->thread_pool_max); return -1; } @@ -5303,7 +5298,7 @@ qemuDomainIOThreadValidate(virDomainIOThreadIDDef *io= threaddef, if (iothread.set_thread_pool_min) { if (live && iothread.thread_pool_min < 0) { virReportError(VIR_ERR_OPERATION_INVALID, - _("thread_pool_min (%d) must be equal to or gre= ater than 0 for live change"), + _("thread_pool_min (%1$d) must be equal to or g= reater than 0 for live change"), iothread.thread_pool_min); return -1; } @@ -5314,7 +5309,7 @@ qemuDomainIOThreadValidate(virDomainIOThreadIDDef *io= threaddef, if (iothread.set_thread_pool_max) { if (live && iothread.thread_pool_max < 0) { virReportError(VIR_ERR_OPERATION_INVALID, - _("thread_pool_max (%d) must be equal to or gre= ater than 0 for live change"), + _("thread_pool_max (%1$d) must be equal to or g= reater than 0 for live change"), iothread.thread_pool_max); return -1; } @@ -5324,7 +5319,7 @@ qemuDomainIOThreadValidate(virDomainIOThreadIDDef *io= threaddef, =20 if (thread_pool_min > thread_pool_max) { virReportError(VIR_ERR_OPERATION_INVALID, - _("thread_pool_min (%d) can't be greater than threa= d_pool_max (%d)"), + _("thread_pool_min (%1$d) can't be greater than thr= ead_pool_max (%2$d)"), thread_pool_min, thread_pool_max); return -1; } @@ -5395,7 +5390,7 @@ qemuDomainChgIOThread(virQEMUDriver *driver, =20 if (!iothreaddef) { virReportError(VIR_ERR_INVALID_ARG, - _("cannot find IOThread '%u' in iothreadids= "), + _("cannot find IOThread '%1$u' in iothreadi= ds"), iothread.iothread_id); goto endjob; } @@ -5438,7 +5433,7 @@ qemuDomainChgIOThread(virQEMUDriver *driver, =20 if (!iothreaddef) { virReportError(VIR_ERR_INVALID_ARG, - _("cannot find IOThread '%u' in iothreadids= "), + _("cannot find IOThread '%1$u' in iothreadi= ds"), iothread.iothread_id); goto endjob; } @@ -5709,7 +5704,7 @@ static int qemuNodeGetSecurityModel(virConnectPtr con= n, if (virStrcpy(secmodel->model, caps->host.secModels[0].model, VIR_SECURITY_MODEL_BUFLEN) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("security model string exceeds max %d bytes"), + _("security model string exceeds max %1$d bytes"), VIR_SECURITY_MODEL_BUFLEN - 1); return -1; } @@ -5717,7 +5712,7 @@ static int qemuNodeGetSecurityModel(virConnectPtr con= n, if (virStrcpy(secmodel->doi, caps->host.secModels[0].doi, VIR_SECURITY_DOI_BUFLEN) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("security DOI string exceeds max %d bytes"), + _("security DOI string exceeds max %1$d bytes"), VIR_SECURITY_DOI_BUFLEN - 1); return -1; } @@ -5957,7 +5952,7 @@ qemuDomainSaveImageDefineXML(virConnectPtr conn, cons= t char *path, goto cleanup; =20 if (lseek(fd, 0, SEEK_SET) !=3D 0) { - virReportSystemError(errno, _("cannot seek in '%s'"), path); + virReportSystemError(errno, _("cannot seek in '%1$s'"), path); goto cleanup; } =20 @@ -5965,7 +5960,7 @@ qemuDomainSaveImageDefineXML(virConnectPtr conn, cons= t char *path, goto cleanup; =20 if (VIR_CLOSE(fd) < 0) { - virReportSystemError(errno, _("failed to write header data to '%s'= "), path); + virReportSystemError(errno, _("failed to write header data to '%1$= s'"), path); goto cleanup; } =20 @@ -6109,8 +6104,7 @@ qemuDomainObjRestore(virConnectPtr conn, virUUIDFormat(vm->def->uuid, vm_uuidstr); virUUIDFormat(def->uuid, def_uuidstr); virReportError(VIR_ERR_OPERATION_FAILED, - _("cannot restore domain '%s' uuid %s from a file" - " which belongs to domain '%s' uuid %s"), + _("cannot restore domain '%1$s' uuid %2$s from a fi= le which belongs to domain '%3$s' uuid %4$s"), vm->def->name, vm_uuidstr, def->name, def_uuidstr); goto cleanup; @@ -6238,7 +6232,7 @@ static char *qemuConnectDomainXMLToNative(virConnectP= tr conn, =20 if (STRNEQ(format, QEMU_CONFIG_FORMAT_ARGV)) { virReportError(VIR_ERR_INVALID_ARG, - _("unsupported config type %s"), format); + _("unsupported config type %1$s"), format); return NULL; } =20 @@ -6342,7 +6336,7 @@ qemuDomainObjStart(virConnectPtr conn, if (force_boot) { if (unlink(managed_save) < 0) { virReportSystemError(errno, - _("cannot remove managed save file %s= "), + _("cannot remove managed save file %1= $s"), managed_save); return ret; } @@ -6583,8 +6577,7 @@ qemuDomainUndefineFlags(virDomainPtr dom, (nsnapshots =3D virDomainSnapshotObjListNum(vm->snapshots, NULL, 0= ))) { if (!(flags & VIR_DOMAIN_UNDEFINE_SNAPSHOTS_METADATA)) { virReportError(VIR_ERR_OPERATION_INVALID, - _("cannot delete inactive domain with %d " - "snapshots"), + _("cannot delete inactive domain with %1$d snap= shots"), nsnapshots); goto endjob; } @@ -6596,8 +6589,7 @@ qemuDomainUndefineFlags(virDomainPtr dom, NULL, flags)) > 0) { if (!(flags & VIR_DOMAIN_UNDEFINE_CHECKPOINTS_METADATA)) { virReportError(VIR_ERR_OPERATION_INVALID, - _("cannot delete inactive domain with %d " - "checkpoints"), + _("cannot delete inactive domain with %1$d chec= kpoints"), ncheckpoints); goto endjob; } @@ -6632,7 +6624,7 @@ qemuDomainUndefineFlags(virDomainPtr dom, if ((flags & VIR_DOMAIN_UNDEFINE_NVRAM)) { if (unlink(nvram_path) < 0) { virReportSystemError(errno, - _("failed to remove nvram: %s"), + _("failed to remove nvram: %1$s"), nvram_path); goto endjob; } @@ -6825,7 +6817,7 @@ qemuDomainAttachDeviceLive(virDomainObj *vm, case VIR_DOMAIN_DEVICE_CRYPTO: case VIR_DOMAIN_DEVICE_LAST: virReportError(VIR_ERR_OPERATION_UNSUPPORTED, - _("live attach of device '%s' is not supported"), + _("live attach of device '%1$s' is not supported"), virDomainDeviceTypeToString(dev->type)); break; } @@ -6859,7 +6851,7 @@ qemuDomainChangeDiskLive(virDomainObj *vm, =20 if (!(orig_disk =3D virDomainDiskByTarget(vm->def, disk->dst))) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("disk '%s' not found"), disk->dst); + _("disk '%1$s' not found"), disk->dst); return -1; } =20 @@ -6923,7 +6915,7 @@ qemuDomainChangeMemoryLiveValidateChange(const virDom= ainMemoryDef *oldDef, case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC: case VIR_DOMAIN_MEMORY_MODEL_LAST: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("cannot modify memory of model '%s'"), + _("cannot modify memory of model '%1$s'"), virDomainMemoryModelTypeToString(oldDef->model)); return false; break; @@ -6931,7 +6923,7 @@ qemuDomainChangeMemoryLiveValidateChange(const virDom= ainMemoryDef *oldDef, =20 if (oldDef->model !=3D newDef->model) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("cannot modify memory model from '%s' to '%s'"), + _("cannot modify memory model from '%1$s' to '%2$s'= "), virDomainMemoryModelTypeToString(oldDef->model), virDomainMemoryModelTypeToString(newDef->model)); return false; @@ -6939,7 +6931,7 @@ qemuDomainChangeMemoryLiveValidateChange(const virDom= ainMemoryDef *oldDef, =20 if (oldDef->access !=3D newDef->access) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("cannot modify memory access from '%s' to '%s'"), + _("cannot modify memory access from '%1$s' to '%2$s= '"), virDomainMemoryAccessTypeToString(oldDef->access), virDomainMemoryAccessTypeToString(newDef->access)); return false; @@ -6947,7 +6939,7 @@ qemuDomainChangeMemoryLiveValidateChange(const virDom= ainMemoryDef *oldDef, =20 if (oldDef->discard !=3D newDef->discard) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("cannot modify memory discard from '%s' to '%s'"), + _("cannot modify memory discard from '%1$s' to '%2$= s'"), virTristateBoolTypeToString(oldDef->discard), virTristateBoolTypeToString(newDef->discard)); return false; @@ -6962,7 +6954,7 @@ qemuDomainChangeMemoryLiveValidateChange(const virDom= ainMemoryDef *oldDef, =20 if (oldDef->pagesize !=3D newDef->pagesize) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("cannot modify memory pagesize from '%llu' to '%l= lu'"), + _("cannot modify memory pagesize from '%1$llu' to '= %2$llu'"), oldDef->pagesize, newDef->pagesize); return false; @@ -6970,7 +6962,7 @@ qemuDomainChangeMemoryLiveValidateChange(const virDom= ainMemoryDef *oldDef, =20 if (STRNEQ_NULLABLE(oldDef->nvdimmPath, newDef->nvdimmPath)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("cannot modify memory path from '%s' to '%s'"), + _("cannot modify memory path from '%1$s' to '%2$s'"= ), NULLSTR(oldDef->nvdimmPath), NULLSTR(newDef->nvdimmPath)); return false; @@ -6978,41 +6970,41 @@ qemuDomainChangeMemoryLiveValidateChange(const virD= omainMemoryDef *oldDef, =20 if (oldDef->alignsize !=3D newDef->alignsize) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("cannot modify memory align size from '%llu' to '= %llu'"), + _("cannot modify memory align size from '%1$llu' to= '%2$llu'"), oldDef->alignsize, newDef->alignsize); return false; } =20 if (oldDef->nvdimmPmem !=3D newDef->nvdimmPmem) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("cannot modify memory pmem from '%d' to '%d'"), + _("cannot modify memory pmem from '%1$d' to '%2$d'"= ), oldDef->nvdimmPmem, newDef->nvdimmPmem); return false; } =20 if (oldDef->targetNode !=3D newDef->targetNode) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("cannot modify memory targetNode from '%d' to '%d= '"), + _("cannot modify memory targetNode from '%1$d' to '= %2$d'"), oldDef->targetNode, newDef->targetNode); return false; } =20 if (oldDef->size !=3D newDef->size) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("cannot modify memory size from '%llu' to '%llu'"= ), + _("cannot modify memory size from '%1$llu' to '%2$l= lu'"), oldDef->size, newDef->size); return false; } =20 if (oldDef->labelsize !=3D newDef->labelsize) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("cannot modify memory label size from '%llu' to '= %llu'"), + _("cannot modify memory label size from '%1$llu' to= '%2$llu'"), oldDef->labelsize, newDef->labelsize); return false; } if (oldDef->blocksize !=3D newDef->blocksize) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("cannot modify memory block size from '%llu' to '= %llu'"), + _("cannot modify memory block size from '%1$llu' to= '%2$llu'"), oldDef->blocksize, newDef->blocksize); return false; } @@ -7049,7 +7041,7 @@ qemuDomainChangeMemoryLive(virQEMUDriver *driver G_GN= UC_UNUSED, oldDef =3D virDomainMemoryFindByDeviceInfo(vm->def, &dev->data.memory-= >info, NULL); if (!oldDef) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("memory '%s' not found"), dev->data.memory->info.= alias); + _("memory '%1$s' not found"), dev->data.memory->inf= o.alias); return -1; } =20 @@ -7137,7 +7129,7 @@ qemuDomainUpdateDeviceLive(virDomainObj *vm, case VIR_DOMAIN_DEVICE_CRYPTO: case VIR_DOMAIN_DEVICE_LAST: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("live update of device '%s' is not supported"), + _("live update of device '%1$s' is not supported"), virDomainDeviceTypeToString(dev->type)); return -1; } @@ -7183,7 +7175,7 @@ qemuDomainAttachDeviceConfig(virDomainDef *vmdef, disk =3D dev->data.disk; if (virDomainDiskIndexByName(vmdef, disk->dst, true) >=3D 0) { virReportError(VIR_ERR_OPERATION_INVALID, - _("target %s already exists"), disk->dst); + _("target %1$s already exists"), disk->dst); return -1; } if (virDomainDiskTranslateSourcePool(disk) < 0) @@ -7224,7 +7216,7 @@ qemuDomainAttachDeviceConfig(virDomainDef *vmdef, lease =3D dev->data.lease; if (virDomainLeaseIndex(vmdef, lease) >=3D 0) { virReportError(VIR_ERR_OPERATION_INVALID, - _("Lease %s in lockspace %s already exists"), + _("Lease %1$s in lockspace %2$s already exists"= ), lease->key, NULLSTR(lease->lockspace)); return -1; } @@ -7240,7 +7232,7 @@ qemuDomainAttachDeviceConfig(virDomainDef *vmdef, virDomainControllerFind(vmdef, controller->type, controller->idx) >=3D 0) { virReportError(VIR_ERR_OPERATION_INVALID, - _("controller index=3D'%d' already exists"), + _("controller index=3D'%1$d' already exists"), controller->idx); return -1; } @@ -7350,7 +7342,7 @@ qemuDomainAttachDeviceConfig(virDomainDef *vmdef, case VIR_DOMAIN_DEVICE_CRYPTO: case VIR_DOMAIN_DEVICE_LAST: virReportError(VIR_ERR_OPERATION_UNSUPPORTED, - _("persistent attach of device '%s' is not support= ed"), + _("persistent attach of device '%1$s' is not suppo= rted"), virDomainDeviceTypeToString(dev->type)); return -1; } @@ -7389,7 +7381,7 @@ qemuDomainDetachDeviceConfig(virDomainDef *vmdef, disk =3D dev->data.disk; if (!(det_disk =3D virDomainDiskRemoveByName(vmdef, disk->dst))) { virReportError(VIR_ERR_DEVICE_MISSING, - _("no target device %s"), disk->dst); + _("no target device %1$s"), disk->dst); return -1; } virDomainDiskDefFree(det_disk); @@ -7430,7 +7422,7 @@ qemuDomainDetachDeviceConfig(virDomainDef *vmdef, lease =3D dev->data.lease; if (!(det_lease =3D virDomainLeaseRemove(vmdef, lease))) { virReportError(VIR_ERR_DEVICE_MISSING, - _("Lease %s in lockspace %s does not exist"), + _("Lease %1$s in lockspace %2$s does not exist"= ), lease->key, NULLSTR(lease->lockspace)); return -1; } @@ -7557,7 +7549,7 @@ qemuDomainDetachDeviceConfig(virDomainDef *vmdef, case VIR_DOMAIN_DEVICE_CRYPTO: case VIR_DOMAIN_DEVICE_LAST: virReportError(VIR_ERR_OPERATION_UNSUPPORTED, - _("persistent detach of device '%s' is not supporte= d"), + _("persistent detach of device '%1$s' is not suppor= ted"), virDomainDeviceTypeToString(dev->type)); return -1; } @@ -7587,7 +7579,7 @@ qemuDomainUpdateDeviceConfig(virDomainDef *vmdef, newDisk =3D dev->data.disk; if ((pos =3D virDomainDiskIndexByName(vmdef, newDisk->dst, false))= < 0) { virReportError(VIR_ERR_INVALID_ARG, - _("target %s doesn't exist."), newDisk->dst); + _("target %1$s doesn't exist."), newDisk->dst); return -1; } =20 @@ -7607,7 +7599,7 @@ qemuDomainUpdateDeviceConfig(virDomainDef *vmdef, pos =3D qemuDomainFindGraphicsIndex(vmdef, newGraphics); if (pos < 0) { virReportError(VIR_ERR_INVALID_ARG, - _("cannot find existing graphics type '%s' devi= ce to modify"), + _("cannot find existing graphics type '%1$s' de= vice to modify"), virDomainGraphicsTypeToString(newGraphics->type= )); return -1; } @@ -7683,7 +7675,7 @@ qemuDomainUpdateDeviceConfig(virDomainDef *vmdef, case VIR_DOMAIN_DEVICE_CRYPTO: case VIR_DOMAIN_DEVICE_LAST: virReportError(VIR_ERR_OPERATION_UNSUPPORTED, - _("persistent update of device '%s' is not supporte= d"), + _("persistent update of device '%1$s' is not suppor= ted"), virDomainDeviceTypeToString(dev->type)); return -1; } @@ -8222,14 +8214,14 @@ static int qemuDomainSetAutostart(virDomainPtr dom, if (autostart) { if (g_mkdir_with_parents(cfg->autostartDir, 0777) < 0) { virReportSystemError(errno, - _("cannot create autostart directory = %s"), + _("cannot create autostart directory = %1$s"), cfg->autostartDir); goto endjob; } =20 if (symlink(configFile, autostartLink) < 0) { virReportSystemError(errno, - _("Failed to create symlink '%s to '%= s'"), + _("Failed to create symlink '%1$s to = '%2$s'"), autostartLink, configFile); goto endjob; } @@ -8238,7 +8230,7 @@ static int qemuDomainSetAutostart(virDomainPtr dom, errno !=3D ENOENT && errno !=3D ENOTDIR) { virReportSystemError(errno, - _("Failed to delete symlink '%s'"), + _("Failed to delete symlink '%1$s'"), autostartLink); goto endjob; } @@ -8754,7 +8746,7 @@ qemuDomainSetNumaParameters(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 @@ -8765,7 +8757,7 @@ qemuDomainSetNumaParameters(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; } @@ -9172,7 +9164,7 @@ qemuSetIOThreadsBWLive(virDomainObj *vm, virCgroup *c= group, #define SCHED_RANGE_CHECK(VAR, NAME, MIN, MAX) \ if (((VAR) > 0 && (VAR) < (MIN)) || (VAR) > (MAX)) { \ virReportError(VIR_ERR_INVALID_ARG, \ - _("value of '%s' is out of range [%lld, %lld]"), \ + _("value of '%1$s' is out of range [%2$lld, %3$lld]= "), \ NAME, MIN, MAX); \ rc =3D -1; \ goto endjob; \ @@ -9725,7 +9717,7 @@ qemuDomainBlockResize(virDomainPtr dom, if ((flags & VIR_DOMAIN_BLOCK_RESIZE_BYTES) =3D=3D 0) { if (size > ULLONG_MAX / 1024) { virReportError(VIR_ERR_OVERFLOW, - _("size must be less than %llu"), + _("size must be less than %1$llu"), ULLONG_MAX / 1024); return -1; } @@ -9748,7 +9740,7 @@ qemuDomainBlockResize(virDomainPtr dom, =20 if (!(disk =3D virDomainDiskByName(vm->def, path, false))) { virReportError(VIR_ERR_INVALID_ARG, - _("disk '%s' was not found in the domain config"), = path); + _("disk '%1$s' was not found in the domain config")= , path); goto endjob; } =20 @@ -9767,7 +9759,7 @@ qemuDomainBlockResize(virDomainPtr dom, =20 if (virStorageSourceIsEmpty(disk->src) || disk->src->readonly) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, - _("can't resize empty or readonly disk '%s'"), + _("can't resize empty or readonly disk '%1$s'"), disk->dst); goto endjob; } @@ -9841,7 +9833,7 @@ qemuDomainBlocksStatsGather(virDomainObj *vm, =20 if (*path) { if (!(disk =3D virDomainDiskByName(vm->def, path, false))) { - virReportError(VIR_ERR_INVALID_ARG, _("invalid path: %s"), pat= h); + virReportError(VIR_ERR_INVALID_ARG, _("invalid path: %1$s"), p= ath); return -1; } =20 @@ -9858,7 +9850,7 @@ qemuDomainBlocksStatsGather(virDomainObj *vm, =20 if (!entryname) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("missing disk device alias name for %s"), dis= k->dst); + _("missing disk device alias name for %1$s"), d= isk->dst); return -1; } } @@ -9881,7 +9873,7 @@ qemuDomainBlocksStatsGather(virDomainObj *vm, =20 if (!(stats =3D virHashLookup(blockstats, entryname))) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("cannot find statistics for device '%s'"), en= tryname); + _("cannot find statistics for device '%1$s'"), = entryname); return -1; } =20 @@ -9913,7 +9905,7 @@ qemuDomainBlocksStatsGather(virDomainObj *vm, =20 if (!(stats =3D virHashLookup(blockstats, entryname))) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("cannot find statistics for device '%s'")= , entryname); + _("cannot find statistics for device '%1$s'= "), entryname); return -1; } =20 @@ -10021,7 +10013,7 @@ qemuDomainBlockStatsFlags(virDomainPtr dom, long long tmp; \ if (VIR_ASSIGN_IS_OVERFLOW(tmp, (blockstats->VAR))) { \ virReportError(VIR_ERR_OVERFLOW, \ - _("value of '%s' is too large"), NAME); \ + _("value of '%1$s' is too large"), NAME); \ goto endjob; \ } \ if (virTypedParameterAssign(params + nstats, NAME, \ @@ -10186,8 +10178,7 @@ qemuDomainSetInterfaceParameters(virDomainPtr dom, =20 if (!qosSupported) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("setting bandwidth on interfaces of " - "type '%s' is not implemented yet"), + _("setting bandwidth on interfaces of type '%1$s' i= s not implemented yet"), virDomainNetTypeToString(actualType)); goto endjob; } @@ -10259,8 +10250,7 @@ qemuDomainSetInterfaceParameters(virDomainPtr dom, =20 virMacAddrFormat(&net->mac, ifmac); virReportError(VIR_ERR_OPERATION_UNSUPPORTED, - _("Invalid use of 'floor' on interface with= MAC address %s " - "- 'floor' is only supported for interface = type 'network' with forward type 'nat', 'route', 'open' or none"), + _("Invalid use of 'floor' on interface with= MAC address %1$s - 'floor' is only supported for interface type 'network' = with forward type 'nat', 'route', 'open' or none"), ifmac); goto endjob; } @@ -10567,7 +10557,7 @@ qemuDomainBlockPeek(virDomainPtr dom, =20 if (disk->src->format !=3D VIR_STORAGE_FILE_RAW) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, - _("peeking is only supported for disk with 'raw' fo= rmat not '%s'"), + _("peeking is only supported for disk with 'raw' fo= rmat not '%1$s'"), virStorageFileFormatTypeToString(disk->src->format)= ); goto cleanup; } @@ -10585,8 +10575,7 @@ qemuDomainBlockPeek(virDomainPtr dom, if ((nread =3D virStorageSourceRead(disk->src, offset, size, &tmpbuf))= < 0) { if (nread =3D=3D -2) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("storage file reading is not supported for " - "storage type %s (protocol: %s)"), + _("storage file reading is not supported for st= orage type %1$s (protocol: %2$s)"), virStorageTypeToString(disk->src->type), virStorageNetProtocolTypeToString(disk->src->pr= otocol)); } @@ -10595,7 +10584,7 @@ qemuDomainBlockPeek(virDomainPtr dom, =20 if (nread < size) { virReportError(VIR_ERR_INVALID_ARG, - _("'%s' starting from %llu has only %zd bytes avail= able"), + _("'%1$s' starting from %2$llu has only %3$zd bytes= available"), path, offset, nread); goto cleanup; } @@ -10650,7 +10639,7 @@ qemuDomainMemoryPeek(virDomainPtr dom, /* Create a temporary filename. */ if ((fd =3D g_mkstemp_full(tmp, O_RDWR | O_CLOEXEC, S_IRUSR | S_IWUSR)= ) =3D=3D -1) { virReportSystemError(errno, - _("g_mkstemp(\"%s\") failed"), tmp); + _("g_mkstemp(\"%1$s\") failed"), tmp); goto endjob; } =20 @@ -10673,8 +10662,8 @@ qemuDomainMemoryPeek(virDomainPtr dom, /* Read the memory file into buffer. */ if (saferead(fd, buffer, size) =3D=3D (ssize_t)-1) { virReportSystemError(errno, - _("failed to read temporary file " - "created with template %s"), tmp); + _("failed to read temporary file created with= template %1$s"), + tmp); goto endjob; } =20 @@ -10729,7 +10718,7 @@ qemuDomainStorageOpenStat(virQEMUDriver *driver G_G= NUC_UNUSED, return -1; =20 if (fstat(*ret_fd, ret_sb) < 0) { - virReportSystemError(errno, _("cannot stat file '%s'"), src->p= ath); + virReportSystemError(errno, _("cannot stat file '%1$s'"), src-= >path); VIR_FORCE_CLOSE(*ret_fd); return -1; } @@ -10742,7 +10731,7 @@ qemuDomainStorageOpenStat(virQEMUDriver *driver G_G= NUC_UNUSED, =20 if (virStorageSourceStat(src, ret_sb) < 0) { virStorageSourceDeinit(src); - virReportSystemError(errno, _("failed to stat remote file '%s'= "), + virReportSystemError(errno, _("failed to stat remote file '%1$= s'"), NULLSTR(src->path)); return -1; } @@ -10861,7 +10850,7 @@ qemuStorageLimitsRefresh(virQEMUDriver *driver, =20 if (virStorageSourceIsLocalStorage(src)) { if ((len =3D virFileReadHeaderFD(fd, VIR_STORAGE_MAX_HEADER, &buf)= ) < 0) { - virReportSystemError(errno, _("cannot read header '%s'"), + virReportSystemError(errno, _("cannot read header '%1$s'"), src->path); goto cleanup; } @@ -10921,7 +10910,7 @@ qemuDomainGetBlockInfo(virDomainPtr dom, =20 if (!(disk =3D virDomainDiskByName(vm->def, path, false))) { virReportError(VIR_ERR_INVALID_ARG, - _("invalid path %s not assigned to domain"), path); + _("invalid path %1$s not assigned to domain"), path= ); goto endjob; } =20 @@ -10933,7 +10922,7 @@ qemuDomainGetBlockInfo(virDomainPtr dom, =20 if (virStorageSourceIsEmpty(disk->src)) { virReportError(VIR_ERR_INVALID_ARG, - _("disk '%s' does not currently have a source assig= ned"), + _("disk '%1$s' does not currently have a source ass= igned"), path); goto endjob; } @@ -11124,7 +11113,7 @@ qemuDomainMigratePrepareTunnel(virConnectPtr dconn, =20 if (virLockManagerPluginUsesState(driver->lockManager)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Cannot use migrate v2 protocol with lock manager= %s"), + _("Cannot use migrate v2 protocol with lock manager= %1$s"), virLockManagerPluginGetName(driver->lockManager)); return -1; } @@ -11178,7 +11167,7 @@ qemuDomainMigratePrepare2(virConnectPtr dconn, =20 if (virLockManagerPluginUsesState(driver->lockManager)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Cannot use migrate v2 protocol with lock manager= %s"), + _("Cannot use migrate v2 protocol with lock manager= %1$s"), virLockManagerPluginGetName(driver->lockManager)); return -1; } @@ -11221,7 +11210,7 @@ qemuDomainMigratePerform(virDomainPtr dom, =20 if (virLockManagerPluginUsesState(driver->lockManager)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Cannot use migrate v2 protocol with lock manager= %s"), + _("Cannot use migrate v2 protocol with lock manager= %1$s"), virLockManagerPluginGetName(driver->lockManager)); goto cleanup; } @@ -11276,7 +11265,7 @@ qemuDomainMigrateFinish2(virConnectPtr dconn, vm =3D virDomainObjListFindByName(driver->domains, dname); if (!vm) { virReportError(VIR_ERR_NO_DOMAIN, - _("no domain with matching name '%s'"), dname); + _("no domain with matching name '%1$s'"), dname); qemuMigrationDstErrorReport(driver, dname); return NULL; } @@ -11811,7 +11800,7 @@ qemuDomainMigrateFinish3(virConnectPtr dconn, vm =3D virDomainObjListFindByName(driver->domains, dname); if (!vm) { virReportError(VIR_ERR_NO_DOMAIN, - _("no domain with matching name '%s'"), dname); + _("no domain with matching name '%1$s'"), dname); qemuMigrationDstErrorReport(driver, dname); return NULL; } @@ -11859,7 +11848,7 @@ qemuDomainMigrateFinish3Params(virConnectPtr dconn, vm =3D virDomainObjListFindByName(driver->domains, dname); if (!vm) { virReportError(VIR_ERR_NO_DOMAIN, - _("no domain with matching name '%s'"), dname); + _("no domain with matching name '%1$s'"), dname); qemuMigrationDstErrorReport(driver, dname); return NULL; } @@ -11945,7 +11934,7 @@ qemuNodeDeviceDetachFlags(virNodeDevicePtr dev, * the previously supported 'kvm' driver is provided below. */ if (STRNEQ(driverName, "vfio") && STRNEQ(driverName, "kvm")) { virReportError(VIR_ERR_INVALID_ARG, - _("unknown driver name '%s'"), driverName); + _("unknown driver name '%1$s'"), driverName); return -1; } =20 @@ -12105,8 +12094,7 @@ qemuConnectCompareHypervisorCPU(virConnectPtr conn, =20 if (!hvCPU || hvCPU->fallback !=3D VIR_CPU_FALLBACK_FORBID) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, - _("QEMU '%s' does not support reporting CPU model f= or " - "virttype '%s'"), + _("QEMU '%1$s' does not support reporting CPU model= for virttype '%2$s'"), virQEMUCapsGetBinary(qemuCaps), virDomainVirtTypeToString(virttype)); goto cleanup; @@ -12137,8 +12125,8 @@ qemuConnectCompareHypervisorCPU(virConnectPtr conn, hvCPU, cpu, failIncompatible); } else { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, - _("comparing with the hypervisor CPU is not support= ed " - "for arch %s"), virArchToString(arch)); + _("comparing with the hypervisor CPU is not support= ed for arch %1$s"), + virArchToString(arch)); } =20 cleanup: @@ -12244,18 +12232,18 @@ qemuConnectCPUModelBaseline(virQEMUCaps *qemuCaps, for (i =3D 0; i < ncpus; i++) { if (!cpus[i]) { virReportError(VIR_ERR_INVALID_ARG, - _("invalid CPU definition at index %zu"), i); + _("invalid CPU definition at index %1$zu"), i); return NULL; } if (!cpus[i]->model) { virReportError(VIR_ERR_INVALID_ARG, - _("no CPU model specified at index %zu"), i); + _("no CPU model specified at index %1$zu"), i); return NULL; } =20 if (!virDomainCapsCPUModelsGet(cpuModels, cpus[i]->model)) { virReportError(VIR_ERR_INVALID_ARG, - _("CPU model '%s' not supported by hypervisor"), + _("CPU model '%1$s' not supported by hypervisor= "), cpus[i]->model); return NULL; } @@ -12343,8 +12331,7 @@ qemuConnectBaselineHypervisorCPU(virConnectPtr conn, if (!(cpuModels =3D virQEMUCapsGetCPUModels(qemuCaps, virttype, NULL, = NULL)) || cpuModels->nmodels =3D=3D 0) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, - _("QEMU '%s' does not support any CPU models for " - "virttype '%s'"), + _("QEMU '%1$s' does not support any CPU models for = virttype '%2$s'"), virQEMUCapsGetBinary(qemuCaps), virDomainVirtTypeToString(virttype)); goto cleanup; @@ -12376,8 +12363,8 @@ qemuConnectBaselineHypervisorCPU(virConnectPtr conn, goto cleanup; } else { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, - _("computing baseline hypervisor CPU is not support= ed " - "for arch %s"), virArchToString(arch)); + _("computing baseline hypervisor CPU is not support= ed for arch %1$s"), + virArchToString(arch)); goto cleanup; } =20 @@ -12461,7 +12448,7 @@ qemuDomainGetJobInfoDumpStats(virDomainObj *vm, case QEMU_MONITOR_DUMP_STATUS_FAILED: case QEMU_MONITOR_DUMP_STATUS_LAST: virReportError(VIR_ERR_OPERATION_FAILED, - _("dump query failed, status=3D%d"), + _("dump query failed, status=3D%1$d"), privJob->stats.dump.status); return -1; break; @@ -12998,7 +12985,7 @@ qemuDomainMigrateSetMaxSpeed(virDomainPtr dom, =20 if (bandwidth > max) { virReportError(VIR_ERR_OVERFLOW, - _("bandwidth must be less than %llu"), max + 1); + _("bandwidth must be less than %1$llu"), max + 1); goto cleanup; } =20 @@ -13082,8 +13069,7 @@ qemuDomainMigrationGetPostcopyBandwidth(virDomainOb= j *vm, =20 if (bw > ULONG_MAX) { virReportError(VIR_ERR_OVERFLOW, - _("bandwidth %llu is greater than %lu which is the " - "maximum value supported by this API"), + _("bandwidth %1$llu is greater than %2$lu which is = the maximum value supported by this API"), bw, ULONG_MAX); goto cleanup; } @@ -13449,7 +13435,7 @@ qemuDomainSnapshotGetParent(virDomainSnapshotPtr sn= apshot, =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; } @@ -13754,7 +13740,7 @@ qemuDomainCheckpointGetParent(virDomainCheckpointPt= r checkpoint, =20 if (!chk->def->parent_name) { virReportError(VIR_ERR_NO_DOMAIN_CHECKPOINT, - _("checkpoint '%s' does not have a parent"), + _("checkpoint '%1$s' does not have a parent"), chk->def->name); goto cleanup; } @@ -13977,14 +13963,14 @@ qemuDomainOpenConsole(virDomainPtr dom, =20 if (!chr) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("cannot find character device %s"), + _("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; } @@ -14048,14 +14034,14 @@ qemuDomainOpenChannel(virDomainPtr dom, =20 if (!chr) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("cannot find channel %s"), + _("cannot find channel %1$s"), NULLSTR(name)); goto cleanup; } =20 if (chr->source->type !=3D VIR_DOMAIN_CHR_TYPE_UNIX) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("channel %s is not using a UNIX socket"), + _("channel %1$s is not using a UNIX socket"), name ? name : NULLSTR(chr->info.alias)); goto cleanup; } @@ -14148,7 +14134,7 @@ qemuDomainBlockPullCommon(virDomainObj *vm, if (!(flags & VIR_DOMAIN_BLOCK_PULL_BANDWIDTH_BYTES)) { if (speed > LLONG_MAX >> 20) { virReportError(VIR_ERR_OVERFLOW, - _("bandwidth must be less than %llu"), + _("bandwidth must be less than %1$llu"), LLONG_MAX >> 20); goto endjob; } @@ -14222,7 +14208,7 @@ qemuDomainBlockJobAbort(virDomainPtr dom, =20 if (!(job =3D qemuBlockJobDiskGetJob(disk))) { virReportError(VIR_ERR_INVALID_ARG, - _("disk %s does not have an active block job"), dis= k->dst); + _("disk %1$s does not have an active block job"), d= isk->dst); goto endjob; } =20 @@ -14231,7 +14217,7 @@ qemuDomainBlockJobAbort(virDomainPtr dom, if (job->state =3D=3D QEMU_BLOCKJOB_STATE_ABORTING || job->state =3D=3D QEMU_BLOCKJOB_STATE_PIVOTING) { virReportError(VIR_ERR_OPERATION_INVALID, - _("block job on disk '%s' is still being ended"), + _("block job on disk '%1$s' is still being ended"), disk->dst); goto endjob; } @@ -14271,11 +14257,11 @@ qemuDomainBlockJobAbort(virDomainPtr dom, job->state =3D=3D QEMU_BLOCKJOB_STATE_FAILED) { if (job->errmsg) { virReportError(VIR_ERR_OPERATION_FAILED, - _("block job '%s' failed while pivoting: %s= "), + _("block job '%1$s' failed while pivoting: = %2$s"), job->name, job->errmsg); } else { virReportError(VIR_ERR_OPERATION_FAILED, - _("block job '%s' failed while pivoting"), + _("block job '%1$s' failed while pivoting"), job->name); } =20 @@ -14341,7 +14327,7 @@ qemuBlockJobInfoTranslate(qemuMonitorBlockJobInfo *= rawInfo, info->bandwidth =3D rawInfo->bandwidth; if (info->bandwidth !=3D rawInfo->bandwidth) { virReportError(VIR_ERR_OVERFLOW, - _("bandwidth %llu cannot be represented in result"), + _("bandwidth %1$llu cannot be represented in result= "), rawInfo->bandwidth); return -1; } @@ -14428,7 +14414,7 @@ qemuDomainBlockJobSetSpeed(virDomainPtr dom, if (!(flags & VIR_DOMAIN_BLOCK_JOB_SPEED_BANDWIDTH_BYTES)) { if (speed > LLONG_MAX >> 20) { virReportError(VIR_ERR_OVERFLOW, - _("bandwidth must be less than %llu"), + _("bandwidth must be less than %1$llu"), LLONG_MAX >> 20); return -1; } @@ -14452,7 +14438,7 @@ qemuDomainBlockJobSetSpeed(virDomainPtr dom, =20 if (!(job =3D qemuBlockJobDiskGetJob(disk))) { virReportError(VIR_ERR_INVALID_ARG, - _("disk %s does not have an active block job"), dis= k->dst); + _("disk %1$s does not have an active block job"), d= isk->dst); goto endjob; } =20 @@ -14493,14 +14479,14 @@ qemuDomainBlockCopyValidateMirror(virStorageSourc= e *mirror, =20 if (*reuse || desttype =3D=3D VIR_STORAGE_TYPE_BLOCK) { virReportSystemError(errno, - _("missing destination file for disk %s: = %s"), + _("missing destination file for disk %1$s= : %2$s"), dst, mirror->path); return -1; } } else { if (virStorageSourceStat(mirror, &st) < 0) { virReportSystemError(errno, - _("unable to stat block copy target '%s'"= ), + _("unable to stat block copy target '%1$s= '"), mirror->path); return -1; } @@ -14512,16 +14498,14 @@ qemuDomainBlockCopyValidateMirror(virStorageSourc= e *mirror, } else { if (st.st_size && !(*reuse)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("external destination file for disk %s al= ready " - "exists and is not a block device: %s"), + _("external destination file for disk %1$s = already exists and is not a block device: %2$s"), dst, mirror->path); return -1; } =20 if (desttype =3D=3D VIR_STORAGE_TYPE_BLOCK) { virReportError(VIR_ERR_INVALID_ARG, - _("blockdev flag requested for disk %s, but= file " - "'%s' is not a block device"), + _("blockdev flag requested for disk %1$s, b= ut file '%2$s' is not a block device"), dst, mirror->path); return -1; } @@ -14627,8 +14611,7 @@ qemuDomainBlockCopyCommon(virDomainObj *vm, =20 if (bandwidth > LLONG_MAX) { virReportError(VIR_ERR_INVALID_ARG, - _("bandwidth must be less than " - "'%llu' bytes/s (%llu MiB/s)"), + _("bandwidth must be less than '%1$llu' bytes/s (%2= $llu MiB/s)"), LLONG_MAX, LLONG_MAX >> 20); return -1; } @@ -14686,8 +14669,7 @@ qemuDomainBlockCopyCommon(virDomainObj *vm, * file is not possible */ if (mirror_shallow && !existing && mirror->format =3D=3D VIR_STORAGE_F= ILE_RAW) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("shallow copy of disk '%s' into a raw file " - "is not possible"), + _("shallow copy of disk '%1$s' into a raw file is n= ot possible"), disk->dst); goto endjob; } @@ -14939,7 +14921,7 @@ qemuDomainBlockRebase(virDomainPtr dom, const char = *path, const char *base, if (!(flags & VIR_DOMAIN_BLOCK_REBASE_BANDWIDTH_BYTES)) { if (speed > LLONG_MAX >> 20) { virReportError(VIR_ERR_OVERFLOW, - _("bandwidth must be less than %llu"), + _("bandwidth must be less than %1$llu"), LLONG_MAX >> 20); goto cleanup; } @@ -15018,7 +15000,7 @@ qemuDomainBlockCopy(virDomainPtr dom, const char *d= isk, const char *destxml, if (sizeof(unsigned long)< sizeof(bandwidth) && param->value.ul > ULONG_MAX * (1ULL << 20)) { virReportError(VIR_ERR_OVERFLOW, - _("bandwidth must be less than %llu bytes"), + _("bandwidth must be less than %1$llu bytes= "), ULONG_MAX * (1ULL << 20)); goto cleanup; } @@ -15104,7 +15086,7 @@ qemuDomainBlockCommit(virDomainPtr dom, if (!(flags & VIR_DOMAIN_BLOCK_COMMIT_BANDWIDTH_BYTES)) { if (speed > LLONG_MAX >> 20) { virReportError(VIR_ERR_OVERFLOW, - _("bandwidth must be less than %llu"), + _("bandwidth must be less than %1$llu"), LLONG_MAX >> 20); goto endjob; } @@ -15170,7 +15152,7 @@ qemuDomainOpenGraphics(virDomainPtr dom, =20 if (idx >=3D vm->def->ngraphics) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("No graphics backend with index %d"), idx); + _("No graphics backend with index %1$d"), idx); goto endjob; } switch (vm->def->graphics[idx]->type) { @@ -15188,7 +15170,7 @@ qemuDomainOpenGraphics(virDomainPtr dom, case VIR_DOMAIN_GRAPHICS_TYPE_DESKTOP: case VIR_DOMAIN_GRAPHICS_TYPE_EGL_HEADLESS: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Can only open VNC, SPICE or D-Bus p2p graphics b= ackends, not %s"), + _("Can only open VNC, SPICE or D-Bus p2p graphics b= ackends, not %1$s"), virDomainGraphicsTypeToString(vm->def->graphics[idx= ]->type)); goto endjob; case VIR_DOMAIN_GRAPHICS_TYPE_LAST: @@ -15241,7 +15223,7 @@ qemuDomainOpenGraphicsFD(virDomainPtr dom, =20 if (idx >=3D vm->def->ngraphics) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("No graphics backend with index %d"), idx); + _("No graphics backend with index %1$d"), idx); goto cleanup; } switch (vm->def->graphics[idx]->type) { @@ -15259,7 +15241,7 @@ qemuDomainOpenGraphicsFD(virDomainPtr dom, case VIR_DOMAIN_GRAPHICS_TYPE_DESKTOP: case VIR_DOMAIN_GRAPHICS_TYPE_EGL_HEADLESS: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Can only open VNC, SPICE or D-Bus p2p graphics b= ackends, not %s"), + _("Can only open VNC, SPICE or D-Bus p2p graphics b= ackends, not %1$s"), virDomainGraphicsTypeToString(vm->def->graphics[idx= ]->type)); goto cleanup; case VIR_DOMAIN_GRAPHICS_TYPE_LAST: @@ -15562,8 +15544,8 @@ qemuDomainSetBlockIoTune(virDomainPtr dom, =20 if (param->value.ul > QEMU_BLOCK_IOTUNE_MAX) { virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, - _("block I/O throttle limit value must" - " be no more than %llu"), QEMU_BLOCK_IOTUNE_M= AX); + _("block I/O throttle limit value must be no mo= re than %1$llu"), + QEMU_BLOCK_IOTUNE_MAX); goto endjob; } =20 @@ -15679,21 +15661,18 @@ qemuDomainSetBlockIoTune(virDomainPtr dom, if (!info.val) { \ if (QEMU_BLOCK_IOTUNE_SET_##_bool) { \ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, \ - _("cannot reset '%s' when " \ - "'%s' is set"), \ + _("cannot reset '%1$s' when '%2$s' = is set"), \ #val, #val "_max"); \ } else { \ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, \ - _("value '%s' cannot be set if " \ - "'%s' is not set"), \ + _("value '%1$s' cannot be set if '%= 2$s' is not set"), \ #val "_max", #val); \ } \ goto endjob; \ } \ if (info.val##_max < info.val) { \ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, \ - _("value '%s' cannot be " \ - "smaller than '%s'"), \ + _("value '%1$s' cannot be smaller than = '%2$s'"), \ #val "_max", #val); \ goto endjob; \ } \ @@ -15738,7 +15717,7 @@ qemuDomainSetBlockIoTune(virDomainPtr dom, if (persistentDef) { if (!(conf_disk =3D virDomainDiskByName(persistentDef, path, true)= )) { virReportError(VIR_ERR_INVALID_ARG, - _("missing persistent configuration for disk '%= s'"), + _("missing persistent configuration for disk '%= 1$s'"), path); goto endjob; } @@ -15854,7 +15833,7 @@ qemuDomainGetBlockIoTune(virDomainPtr dom, if (persistentDef) { if (!(disk =3D virDomainDiskByName(persistentDef, path, true))) { virReportError(VIR_ERR_INVALID_ARG, - _("disk '%s' was not found in the domain config= "), + _("disk '%1$s' was not found in the domain conf= ig"), path); goto endjob; } @@ -16250,7 +16229,7 @@ qemuDomainPMSuspendForDuration(virDomainPtr dom, target =3D=3D VIR_NODE_SUSPEND_TARGET_DISK || target =3D=3D VIR_NODE_SUSPEND_TARGET_HYBRID)) { virReportError(VIR_ERR_INVALID_ARG, - _("Unknown suspend target: %u"), + _("Unknown suspend target: %1$u"), target); return -1; } @@ -16617,7 +16596,7 @@ qemuConnectGetCPUModelNames(virConnectPtr conn, =20 if (!(arch =3D virArchFromString(archName))) { virReportError(VIR_ERR_INVALID_ARG, - _("cannot find architecture %s"), + _("cannot find architecture %1$s"), archName); return -1; } @@ -16744,7 +16723,7 @@ qemuDomainGetHostname(virDomainPtr dom, =20 if (!hostname) { virReportError(VIR_ERR_NO_HOSTNAME, - _("no hostname found for domain %s"), + _("no hostname found for domain %1$s"), vm->def->name); goto cleanup; } @@ -18430,7 +18409,7 @@ qemuDomainGetStatsCheckSupport(unsigned int *stats, if (enforce && *stats & ~supportedstats) { virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, - _("Stats types bits 0x%x are not supported by this = daemon or QEMU"), + _("Stats types bits 0x%1$x are not supported by thi= s daemon or QEMU"), *stats & ~supportedstats); return -1; } @@ -18808,7 +18787,7 @@ qemuDomainInterfaceAddresses(virDomainPtr dom, =20 default: virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, - _("Unknown IP address data source %d"), + _("Unknown IP address data source %1$d"), source); break; } @@ -18935,7 +18914,7 @@ qemuDomainRenameCallback(virDomainObj *vm, =20 if (strchr(new_name, '/')) { virReportError(VIR_ERR_XML_ERROR, - _("name %s cannot contain '/'"), new_name); + _("name %1$s cannot contain '/'"), new_name); return -1; } =20 @@ -18961,7 +18940,7 @@ qemuDomainRenameCallback(virDomainObj *vm, =20 if (symlink(new_dom_cfg_file, new_dom_autostart_link) < 0) { virReportSystemError(errno, - _("Failed to create symlink '%s to '%s'"), + _("Failed to create symlink '%1$s to '%2$= s'"), new_dom_autostart_link, new_dom_cfg_file); return -1; } @@ -19087,8 +19066,8 @@ qemuDomainGetGuestVcpusParams(virTypedParameterPtr = *params, for (i =3D 0; i < ninfo; i++) { if (virBitmapSetBit(vcpus, info[i].id) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("vcpu id '%u' reported by guest agent is out = of " - "range"), info[i].id); + _("vcpu id '%1$u' reported by guest agent is ou= t of range"), + info[i].id); goto cleanup; } =20 @@ -19219,7 +19198,7 @@ qemuDomainSetGuestVcpus(virDomainPtr dom, =20 if (!state && !info[i].offlinable) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, - _("vCPU '%u' is not offlinable"), info[i].id); + _("vCPU '%1$u' is not offlinable"), info[i].id); goto endjob; } =20 @@ -19232,7 +19211,7 @@ qemuDomainSetGuestVcpus(virDomainPtr dom, if (!virBitmapIsAllClear(map)) { char *tmp =3D virBitmapFormat(map); virReportError(VIR_ERR_INVALID_ARG, - _("guest is missing vCPUs '%s'"), NULLSTR(tmp)); + _("guest is missing vCPUs '%1$s'"), NULLSTR(tmp)); VIR_FREE(tmp); goto endjob; } @@ -19300,7 +19279,7 @@ qemuDomainSetVcpu(virDomainPtr dom, if (persistentDef) { if (lastvcpu >=3D virDomainDefGetVcpusMax(persistentDef)) { virReportError(VIR_ERR_INVALID_ARG, - _("vcpu %zd is not present in persistent config= "), + _("vcpu %1$zd is not present in persistent conf= ig"), lastvcpu); goto endjob; } @@ -19309,7 +19288,7 @@ qemuDomainSetVcpu(virDomainPtr dom, if (def) { if (lastvcpu >=3D virDomainDefGetVcpusMax(def)) { virReportError(VIR_ERR_INVALID_ARG, - _("vcpu %zd is not present in live config"), + _("vcpu %1$zd is not present in live config"), lastvcpu); goto endjob; } @@ -19875,7 +19854,7 @@ qemuDomainGetGuestInfoCheckSupport(unsigned int typ= es, =20 if (types !=3D *supportedTypes) { virReportError(VIR_ERR_INVALID_ARG, - _("unsupported guest information types '0x%x'"), + _("unsupported guest information types '0x%1$x'"), types & ~qemuDomainGetGuestInfoSupportedTypes); return -1; } @@ -20282,8 +20261,7 @@ qemuDomainAgentSetResponseTimeout(virDomainPtr dom, =20 if (timeout < VIR_DOMAIN_QEMU_AGENT_COMMAND_MIN) { virReportError(VIR_ERR_INVALID_ARG, - _("guest agent timeout '%d' is " - "less than the minimum '%d'"), + _("guest agent timeout '%1$d' is less than the mini= mum '%2$d'"), timeout, VIR_DOMAIN_QEMU_AGENT_COMMAND_MIN); return -1; } @@ -20442,7 +20420,7 @@ qemuDomainStartDirtyRateCalc(virDomainPtr dom, if (seconds < MIN_DIRTYRATE_CALC_PERIOD || seconds > MAX_DIRTYRATE_CALC_PERIOD) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("seconds=3D%d is invalid, please choose value wit= hin [%d, %d]."), + _("seconds=3D%1$d is invalid, please choose value w= ithin [%2$d, %3$d]."), seconds, MIN_DIRTYRATE_CALC_PERIOD, MAX_DIRTYRATE_CALC_PERIOD); @@ -20560,7 +20538,7 @@ qemuDomainFDAssociate(virDomainPtr domain, for (i =3D 0; i < new->nfds; i++) { if ((new->fds[i] =3D dup(fds[i])) < 0) { virReportSystemError(errno, - _("failed to duplicate passed fd with ind= ex '%zu'"), + _("failed to duplicate passed fd with ind= ex '%1$zu'"), i); goto cleanup; } --=20 2.39.2