Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com&gt; --- src/access/viraccessdriverpolkit.c | 2 +- src/access/viraccessmanager.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/access/viraccessdriverpolkit.c b/src/access/viraccessdriverpolkit.c index 2473bd6258..c7ff81ee86 100644 --- a/src/access/viraccessdriverpolkit.c +++ b/src/access/viraccessdriverpolkit.c @@ -75,7 +75,7 @@ virAccessDriverPolkitGetCaller(const char *actionid, if (!identity) { virAccessError(VIR_ERR_ACCESS_DENIED, - _("Policy kit denied action %s from <anonymous>"), + _("Policy kit denied action %1$s from <anonymous>"), actionid); return -1; } diff --git a/src/access/viraccessmanager.c b/src/access/viraccessmanager.c index 6ce8a31f2f..481528c3b9 100644 --- a/src/access/viraccessmanager.c +++ b/src/access/viraccessmanager.c @@ -141,7 +141,7 @@ virAccessManager *virAccessManagerNew(const char *name) if (!(drv = virAccessManagerFindDriver(name))) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Cannot find security driver '%s'"), + _("Cannot find security driver '%1$s'"), name); return NULL; } @@ -207,7 +207,7 @@ virAccessManagerSanitizeError(int ret, if (ret < 0) { virResetLastError(); virAccessError(VIR_ERR_ACCESS_DENIED, - _("'%s' denied access"), driverName); + _("'%1$s' denied access"), driverName); } return ret; -- 2.39.2

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com&gt; --- src/bhyve/bhyve_command.c | 18 ++++++++-------- src/bhyve/bhyve_domain.c | 2 +- src/bhyve/bhyve_driver.c | 38 ++++++++++++++++----------------- src/bhyve/bhyve_firmware.c | 4 ++-- src/bhyve/bhyve_monitor.c | 6 +++--- src/bhyve/bhyve_parse_command.c | 17 +++++++-------- src/bhyve/bhyve_process.c | 20 ++++++++--------- 7 files changed, 52 insertions(+), 53 deletions(-) diff --git a/src/bhyve/bhyve_command.c b/src/bhyve/bhyve_command.c index 1c0f2e2bfb..563651336e 100644 --- a/src/bhyve/bhyve_command.c +++ b/src/bhyve/bhyve_command.c @@ -74,7 +74,7 @@ bhyveBuildNetArgStr(const virDomainDef *def, brname = g_strdup(virDomainNetGetActualBridgeName(net)); } else { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Network type %d is not supported"), + _("Network type %1$d is not supported"), virDomainNetGetActualType(net)); goto cleanup; } @@ -553,7 +553,7 @@ bhyveBuildSoundArgStr(const virDomainDef *def G_GNUC_UNUSED, case VIR_DOMAIN_AUDIO_TYPE_FILE: case VIR_DOMAIN_AUDIO_TYPE_DBUS: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unsupported audio backend '%s'"), + _("unsupported audio backend '%1$s'"), virDomainAudioTypeTypeToString(audio->type)); return -1; case VIR_DOMAIN_AUDIO_TYPE_LAST: @@ -589,7 +589,7 @@ bhyveBuildFSArgStr(const virDomainDef *def G_GNUC_UNUSED, case VIR_DOMAIN_FS_TYPE_VOLUME: case VIR_DOMAIN_FS_TYPE_LAST: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unsupported filesystem type '%s'"), + _("unsupported filesystem type '%1$s'"), virDomainFSTypeToString(fs->type)); return -1; } @@ -606,7 +606,7 @@ bhyveBuildFSArgStr(const virDomainDef *def G_GNUC_UNUSED, case VIR_DOMAIN_FS_DRIVER_TYPE_PLOOP: case VIR_DOMAIN_FS_DRIVER_TYPE_LAST: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unsupported filesystem driver '%s'"), + _("unsupported filesystem driver '%1$s'"), virDomainFSDriverTypeToString(fs->fsdriver)); return -1; } @@ -620,7 +620,7 @@ bhyveBuildFSArgStr(const virDomainDef *def G_GNUC_UNUSED, case VIR_DOMAIN_FS_ACCESSMODE_DEFAULT: case VIR_DOMAIN_FS_ACCESSMODE_LAST: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unsupported filesystem accessmode '%s'"), + _("unsupported filesystem accessmode '%1$s'"), virDomainFSAccessModeTypeToString(fs->accessmode)); return -1; } @@ -723,7 +723,7 @@ virBhyveProcessBuildBhyveCmd(struct _bhyveConn *driver, virDomainDef *def, break; default: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unsupported clock offset '%s'"), + _("unsupported clock offset '%1$s'"), virDomainClockOffsetTypeToString(def->clock.offset)); return NULL; } @@ -874,7 +874,7 @@ virBhyveProcessBuildCustomLoaderCmd(virDomainDef *def) if (def->os.bootloaderArgs == NULL) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Custom loader requires explicit %s configuration"), + _("Custom loader requires explicit %1$s configuration"), "bootloader_args"); return NULL; } @@ -1059,7 +1059,7 @@ virBhyveGetBootDisk(virDomainDef *def) case VIR_DOMAIN_BOOT_LAST: default: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Cannot boot from device %s"), + _("Cannot boot from device %1$s"), virDomainBootTypeToString(def->os.bootDevs[0])); return NULL; } @@ -1080,7 +1080,7 @@ virBhyveGetBootDisk(virDomainDef *def) if (match == NULL) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Cannot find boot device of requested type %s"), + _("Cannot find boot device of requested type %1$s"), virDomainBootTypeToString(def->os.bootDevs[0])); return NULL; } diff --git a/src/bhyve/bhyve_domain.c b/src/bhyve/bhyve_domain.c index a1d1ebc706..a8b1f97790 100644 --- a/src/bhyve/bhyve_domain.c +++ b/src/bhyve/bhyve_domain.c @@ -114,7 +114,7 @@ bhyveDomainDiskDefAssignAddress(struct _bhyveConn *driver, if (idx < 0) { virReportError(VIR_ERR_XML_ERROR, - _("Unknown disk name '%s' and no address specified"), + _("Unknown disk name '%1$s' and no address specified"), def->dst); return -1; } diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c index e7d9c2adf3..9ece06447d 100644 --- a/src/bhyve/bhyve_driver.c +++ b/src/bhyve/bhyve_driver.c @@ -83,7 +83,7 @@ bhyveAutostartDomain(virDomainObj *vm, void *opaque) VIR_DOMAIN_RUNNING_BOOTED, 0); if (ret < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to autostart VM '%s': %s"), + _("Failed to autostart VM '%1$s': %2$s"), vm->def->name, virGetLastErrorMessage()); } } @@ -153,7 +153,7 @@ bhyveDomObjFromDomain(virDomainPtr domain) if (!vm) { virUUIDFormat(domain->uuid, uuidstr); virReportError(VIR_ERR_NO_DOMAIN, - _("no domain with matching uuid '%s' (%s)"), + _("no domain with matching uuid '%1$s' (%2$s)"), uuidstr, domain->name); return NULL; } @@ -183,7 +183,7 @@ bhyveConnectOpen(virConnectPtr conn, if (STRNEQ(conn->uri->path, "/system")) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unexpected bhyve URI path '%s', try bhyve:///system"), + _("Unexpected bhyve URI path '%1$s', try bhyve:///system"), conn->uri->path); return VIR_DRV_OPEN_ERROR; } @@ -257,7 +257,7 @@ bhyveConnectGetVersion(virConnectPtr conn, unsigned long *version) if (virStringParseVersion(version, ver.release, true) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unknown release: %s"), ver.release); + _("Unknown release: %1$s"), ver.release); return -1; } @@ -369,21 +369,21 @@ bhyveDomainSetAutostart(virDomainPtr domain, int autostart) if (autostart) { if (g_mkdir_with_parents(BHYVE_AUTOSTART_DIR, 0777) < 0) { virReportSystemError(errno, - _("cannot create autostart directory %s"), + _("cannot create autostart directory %1$s"), BHYVE_AUTOSTART_DIR); goto cleanup; } 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 cleanup; } } else { if (unlink(autostartLink) < 0 && errno != ENOENT && errno != ENOTDIR) { virReportSystemError(errno, - _("Failed to delete symlink '%s'"), + _("Failed to delete symlink '%1$s'"), autostartLink); goto cleanup; } @@ -669,7 +669,7 @@ bhyveConnectDomainXMLToNative(virConnectPtr conn, if (STRNEQ(format, BHYVE_CONFIG_FORMAT_ARGV)) { virReportError(VIR_ERR_INVALID_ARG, - _("Unsupported config type %s"), format); + _("Unsupported config type %1$s"), format); return NULL; } @@ -742,7 +742,7 @@ bhyveDomainLookupByUUID(virConnectPtr conn, char uuidstr[VIR_UUID_STRING_BUFLEN]; virUUIDFormat(uuid, uuidstr); virReportError(VIR_ERR_NO_DOMAIN, - _("No domain with matching uuid '%s'"), uuidstr); + _("No domain with matching uuid '%1$s'"), uuidstr); goto cleanup; } @@ -767,7 +767,7 @@ static virDomainPtr bhyveDomainLookupByName(virConnectPtr conn, if (!vm) { virReportError(VIR_ERR_NO_DOMAIN, - _("no domain with matching name '%s'"), name); + _("no domain with matching name '%1$s'"), name); goto cleanup; } @@ -793,7 +793,7 @@ bhyveDomainLookupByID(virConnectPtr conn, if (!vm) { virReportError(VIR_ERR_NO_DOMAIN, - _("No domain with matching ID '%d'"), id); + _("No domain with matching ID '%1$d'"), id); goto cleanup; } @@ -1234,14 +1234,14 @@ bhyveStateInitialize(bool privileged, if (g_mkdir_with_parents(BHYVE_LOG_DIR, 0777) < 0) { virReportSystemError(errno, - _("Failed to mkdir %s"), + _("Failed to mkdir %1$s"), BHYVE_LOG_DIR); goto cleanup; } if (g_mkdir_with_parents(BHYVE_STATE_DIR, 0777) < 0) { virReportSystemError(errno, - _("Failed to mkdir %s"), + _("Failed to mkdir %1$s"), BHYVE_STATE_DIR); goto cleanup; } @@ -1309,7 +1309,7 @@ bhyveConnectGetMaxVcpus(virConnectPtr conn, if (!type || STRCASEEQ(type, "bhyve")) return 16; - virReportError(VIR_ERR_INVALID_ARG, _("unknown type '%s'"), type); + virReportError(VIR_ERR_INVALID_ARG, _("unknown type '%1$s'"), type); return -1; } @@ -1543,7 +1543,7 @@ bhyveConnectDomainXMLFromNative(virConnectPtr conn, if (STRNEQ(nativeFormat, BHYVE_CONFIG_FORMAT_ARGV)) { virReportError(VIR_ERR_INVALID_ARG, - _("unsupported config type %s"), nativeFormat); + _("unsupported config type %1$s"), nativeFormat); return NULL; } @@ -1576,28 +1576,28 @@ bhyveConnectGetDomainCapabilities(virConnectPtr conn, if (virttype_str && (virttype = virDomainVirtTypeFromString(virttype_str)) < 0) { virReportError(VIR_ERR_INVALID_ARG, - _("unknown virttype: %s"), + _("unknown virttype: %1$s"), virttype_str); goto cleanup; } if (virttype != VIR_DOMAIN_VIRT_BHYVE) { virReportError(VIR_ERR_INVALID_ARG, - _("unknown virttype: %s"), + _("unknown virttype: %1$s"), virttype_str); goto cleanup; } if (arch_str && (arch = virArchFromString(arch_str)) == VIR_ARCH_NONE) { virReportError(VIR_ERR_INVALID_ARG, - _("unknown architecture: %s"), + _("unknown architecture: %1$s"), arch_str); goto cleanup; } if (!ARCH_IS_X86(arch)) { virReportError(VIR_ERR_NO_SUPPORT, - _("unsupported architecture: %s"), + _("unsupported architecture: %1$s"), virArchToString(arch)); goto cleanup; } diff --git a/src/bhyve/bhyve_firmware.c b/src/bhyve/bhyve_firmware.c index ff131efa41..57ab9c7a82 100644 --- a/src/bhyve/bhyve_firmware.c +++ b/src/bhyve/bhyve_firmware.c @@ -69,7 +69,7 @@ bhyveFirmwareFillDomain(bhyveConn *driver, if (!matching_firmware) { if (!first_found) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("no firmwares found in %s"), + _("no firmwares found in %1$s"), firmware_dir); return -1; } else { @@ -82,7 +82,7 @@ bhyveFirmwareFillDomain(bhyveConn *driver, if (def->os.loader->format != VIR_STORAGE_FILE_RAW) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Unsupported loader format '%s'"), + _("Unsupported loader format '%1$s'"), virStorageFileFormatTypeToString(def->os.loader->format)); return -1; } diff --git a/src/bhyve/bhyve_monitor.c b/src/bhyve/bhyve_monitor.c index ae602b5c39..8cf4b41ca3 100644 --- a/src/bhyve/bhyve_monitor.c +++ b/src/bhyve/bhyve_monitor.c @@ -120,7 +120,7 @@ bhyveMonitorIO(int watch, int kq, int events G_GNUC_UNUSED, void *opaque) if (watch != mon->watch || kq != mon->kq) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("event from unexpected fd %d!=%d / watch %d!=%d"), + _("event from unexpected fd %1$d!=%2$d / watch %3$d!=%4$d"), mon->kq, kq, mon->watch, watch); return; } @@ -142,7 +142,7 @@ bhyveMonitorIO(int watch, int kq, int events G_GNUC_UNUSED, void *opaque) if (kev.filter == EVFILT_PROC && (kev.fflags & NOTE_EXIT) != 0) { if ((pid_t)kev.ident != vm->pid) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("event from unexpected proc %ju!=%ju"), + _("event from unexpected proc %1$ju!=%2$ju"), (uintmax_t)vm->pid, (uintmax_t)kev.ident); return; } @@ -151,7 +151,7 @@ bhyveMonitorIO(int watch, int kq, int events G_GNUC_UNUSED, void *opaque) status = kev.data; if (WIFSIGNALED(status) && WCOREDUMP(status)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Guest %s got signal %d and crashed"), + _("Guest %1$s got signal %2$d and crashed"), name, WTERMSIG(status)); virBhyveProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_CRASHED); } else if (WIFEXITED(status)) { diff --git a/src/bhyve/bhyve_parse_command.c b/src/bhyve/bhyve_parse_command.c index 2a5959ba1d..394e043c45 100644 --- a/src/bhyve/bhyve_parse_command.c +++ b/src/bhyve/bhyve_parse_command.c @@ -281,8 +281,8 @@ bhyveParseBhyveLPCArg(virDomainDef *def, if (!STRPREFIX(param, "/dev/nmdm")) { virReportError(VIR_ERR_OPERATION_FAILED, - _("Failed to set com port %s: does not start with " - "'/dev/nmdm'."), type); + _("Failed to set com port %1$s: does not start with '/dev/nmdm'."), + type); goto error; } @@ -301,8 +301,7 @@ bhyveParseBhyveLPCArg(virDomainDef *def, break; default: virReportError(VIR_ERR_OPERATION_FAILED, - _("Failed to set slave for %s: last letter not " - "'A' or 'B'"), + _("Failed to set slave for %1$s: last letter not 'A' or 'B'"), NULLSTR(chr->source->data.nmdm.master)); goto error; } @@ -314,8 +313,8 @@ bhyveParseBhyveLPCArg(virDomainDef *def, break; default: virReportError(VIR_ERR_OPERATION_FAILED, - _("Failed to parse %s: only com1 and com2" - " supported."), type); + _("Failed to parse %1$s: only com1 and com2 supported."), + type); goto error; break; } @@ -515,7 +514,7 @@ bhyveParsePCINet(virDomainDef *def, if (virMacAddrParse(mac, &net->mac) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unable to parse mac address '%s'"), + _("unable to parse mac address '%1$s'"), mac); goto cleanup; } @@ -716,7 +715,7 @@ bhyveParseBhyvePCIArg(virDomainDef *def, #define CONSUME_ARG(var) \ if ((opti + 1) == argc) { \ - virReportError(VIR_ERR_INVALID_ARG, _("Missing argument for '%s'"), \ + virReportError(VIR_ERR_INVALID_ARG, _("Missing argument for '%1$s'"), \ argv[opti]); \ return -1; \ } \ @@ -800,7 +799,7 @@ bhyveParseBhyveCommandLine(virDomainDef *def, CONSUME_ARG(arg); if (virUUIDParse(arg, def->uuid) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Cannot parse UUID '%s'"), arg); + _("Cannot parse UUID '%1$s'"), arg); return -1; } break; diff --git a/src/bhyve/bhyve_process.c b/src/bhyve/bhyve_process.c index eee0c4bf1d..5b0fd7658a 100644 --- a/src/bhyve/bhyve_process.c +++ b/src/bhyve/bhyve_process.c @@ -129,7 +129,7 @@ virBhyveProcessStartImpl(struct _bhyveConn *driver, if ((logfd = open(logfile, O_WRONLY | O_APPEND | O_CREAT, S_IRUSR | S_IWUSR)) < 0) { virReportSystemError(errno, - _("Failed to open '%s'"), + _("Failed to open '%1$s'"), logfile); goto cleanup; } @@ -145,7 +145,7 @@ virBhyveProcessStartImpl(struct _bhyveConn *driver, if (unlink(driver->pidfile) < 0 && errno != ENOENT) { virReportSystemError(errno, - _("Cannot remove state PID file %s"), + _("Cannot remove state PID file %1$s"), driver->pidfile); goto cleanup; } @@ -180,7 +180,7 @@ virBhyveProcessStartImpl(struct _bhyveConn *driver, rc = virFileWriteStr(devmap_file, devicemap, 0644); if (rc) { virReportSystemError(errno, - _("Cannot write device.map '%s'"), + _("Cannot write device.map '%1$s'"), devmap_file); goto cleanup; } @@ -204,7 +204,7 @@ virBhyveProcessStartImpl(struct _bhyveConn *driver, if (virPidFileReadPath(driver->pidfile, &vm->pid) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Domain %s didn't show up"), vm->def->name); + _("Domain %1$s didn't show up"), vm->def->name); goto cleanup; } @@ -225,7 +225,7 @@ virBhyveProcessStartImpl(struct _bhyveConn *driver, if (devicemap != NULL) { rc = unlink(devmap_file); if (rc < 0 && errno != ENOENT) - virReportSystemError(errno, _("cannot unlink file '%s'"), + virReportSystemError(errno, _("cannot unlink file '%1$s'"), devmap_file); } @@ -293,7 +293,7 @@ virBhyveProcessStop(struct _bhyveConn *driver, if (vm->pid == 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Invalid PID %d for VM"), + _("Invalid PID %1$d for VM"), (int)vm->pid); return -1; } @@ -343,7 +343,7 @@ virBhyveProcessShutdown(virDomainObj *vm) { if (vm->pid == 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Invalid PID %d for VM"), + _("Invalid PID %1$d for VM"), (int)vm->pid); return -1; } @@ -386,7 +386,7 @@ virBhyveGetDomainTotalCpuStats(virDomainObj *vm, if ((kd = kvm_openfiles(NULL, NULL, NULL, O_RDONLY, errbuf)) == NULL) { virReportError(VIR_ERR_SYSTEM_ERROR, - _("Unable to get kvm descriptor: %s"), + _("Unable to get kvm descriptor: %1$s"), errbuf); return -1; @@ -395,7 +395,7 @@ virBhyveGetDomainTotalCpuStats(virDomainObj *vm, kp = kvm_getprocs(kd, KERN_PROC_PID, vm->pid, &nprocs); if (kp == NULL || nprocs != 1) { virReportError(VIR_ERR_SYSTEM_ERROR, - _("Unable to obtain information about pid: %d"), + _("Unable to obtain information about pid: %1$d"), (int)vm->pid); goto cleanup; } @@ -485,7 +485,7 @@ virBhyveProcessReconnectAll(struct _bhyveConn *driver) if ((kd = kvm_openfiles(NULL, NULL, NULL, O_RDONLY, errbuf)) == NULL) { virReportError(VIR_ERR_SYSTEM_ERROR, - _("Unable to get kvm descriptor: %s"), + _("Unable to get kvm descriptor: %1$s"), errbuf); return; -- 2.39.2

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com&gt; --- src/conf/domain_conf.c | 874 ++++++++++++++++++----------------------- 1 file changed, 391 insertions(+), 483 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 783d3a5fff..00c3b11dc2 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -1637,8 +1637,7 @@ virDomainKeyWrapCipherDefParseXML(virDomainKeyWrapDef *keywrap, case VIR_DOMAIN_KEY_WRAP_CIPHER_NAME_AES: if (keywrap->aes != VIR_TRISTATE_SWITCH_ABSENT) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("A domain definition can have no more than " - "one cipher node with name %s"), + _("A domain definition can have no more than one cipher node with name %1$s"), virDomainKeyWrapCipherNameTypeToString(name)); return -1; @@ -1649,8 +1648,7 @@ virDomainKeyWrapCipherDefParseXML(virDomainKeyWrapDef *keywrap, case VIR_DOMAIN_KEY_WRAP_CIPHER_NAME_DEA: if (keywrap->dea != VIR_TRISTATE_SWITCH_ABSENT) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("A domain definition can have no more than " - "one cipher node with name %s"), + _("A domain definition can have no more than one cipher node with name %1$s"), virDomainKeyWrapCipherNameTypeToString(name)); return -1; @@ -1874,14 +1872,14 @@ virDomainBlkioDeviceParseXML(xmlNodePtr root, if ((weight = virXPathString("string(./weight)", ctxt)) && (virStrToLong_ui(weight, NULL, 10, &dev->weight) < 0)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("could not parse weight %s"), weight); + _("could not parse weight %1$s"), weight); return -1; } if ((read_bytes_sec = virXPathString("string(./read_bytes_sec)", ctxt)) && (virStrToLong_ull(read_bytes_sec, NULL, 10, &dev->rbps) < 0)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("could not parse read bytes sec %s"), + _("could not parse read bytes sec %1$s"), read_bytes_sec); return -1; } @@ -1889,7 +1887,7 @@ virDomainBlkioDeviceParseXML(xmlNodePtr root, if ((write_bytes_sec = virXPathString("string(./write_bytes_sec)", ctxt)) && (virStrToLong_ull(write_bytes_sec, NULL, 10, &dev->wbps) < 0)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("could not parse write bytes sec %s"), + _("could not parse write bytes sec %1$s"), write_bytes_sec); return -1; } @@ -1897,7 +1895,7 @@ virDomainBlkioDeviceParseXML(xmlNodePtr root, if ((read_iops_sec = virXPathString("string(./read_iops_sec)", ctxt)) && (virStrToLong_ui(read_iops_sec, NULL, 10, &dev->riops) < 0)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("could not parse read iops sec %s"), + _("could not parse read iops sec %1$s"), read_iops_sec); return -1; } @@ -1905,7 +1903,7 @@ virDomainBlkioDeviceParseXML(xmlNodePtr root, if ((write_iops_sec = virXPathString("string(./write_iops_sec)", ctxt)) && (virStrToLong_ui(write_iops_sec, NULL, 10, &dev->wiops) < 0)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("could not parse write iops sec %s"), + _("could not parse write iops sec %1$s"), write_iops_sec); return -1; } @@ -2220,7 +2218,7 @@ virDomainDefGetVcpuSched(virDomainDef *def, if (!(vcpuinfo = virDomainDefGetVcpu(def, vcpu))) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("vCPU '%u' is not present in domain definition"), + _("vCPU '%1$u' is not present in domain definition"), vcpu); return NULL; } @@ -2322,7 +2320,7 @@ virDomainDefGetVcpusTopology(const virDomainDef *def, (tmp *= def->cpu->cores) > UINT_MAX || (tmp *= def->cpu->threads) > UINT_MAX) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("cpu topology results in more than %u cpus"), UINT_MAX); + _("cpu topology results in more than %1$u cpus"), UINT_MAX); return -1; } @@ -5216,7 +5214,7 @@ virDomainDefLifecycleActionAllowed(virDomainLifecycle type, } virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Lifecycle event '%s' doesn't support '%s' action"), + _("Lifecycle event '%1$s' doesn't support '%2$s' action"), virDomainLifecycleTypeToString(type), virDomainLifecycleActionTypeToString(action)); return false; @@ -5249,14 +5247,14 @@ virDomainDeviceLoadparmIsValid(const char *loadparm) { if (virStringIsEmpty(loadparm) || !STRLIM(loadparm, 8)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("loadparm value '%s' must be between 1 and 8 characters"), + _("loadparm value '%1$s' must be between 1 and 8 characters"), loadparm); return false; } if (strspn(loadparm, "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789. ") != strlen(loadparm)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("invalid loadparm value '%s', expecting chars in set of [a-zA-Z0-9.] and blank spaces"), + _("invalid loadparm value '%1$s', expecting chars in set of [a-zA-Z0-9.] and blank spaces"), loadparm); return false; } @@ -5472,7 +5470,7 @@ virDomainDeviceBootParseXML(xmlNodePtr node, if (loadparm) { if (virStringToUpper(&info->loadparm, loadparm) != 1) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to convert loadparm '%s' to upper case"), + _("Failed to convert loadparm '%1$s' to upper case"), loadparm); return -1; } @@ -5533,7 +5531,7 @@ virDomainDeviceAddressParseXML(xmlNodePtr address, if ((info->type = virDomainDeviceAddressTypeFromString(type)) <= 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown address type '%s'"), type); + _("unknown address type '%1$s'"), type); return -1; } @@ -5802,7 +5800,7 @@ virDomainHostdevSubsysPCIDefParseXML(xmlNodePtr node, if ((state = virDomainHostdevPCIOrigstateTypeFromString((const char *) nodes[i]->name)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unsupported element '%s' of 'origstates'"), + _("unsupported element '%1$s' of 'origstates'"), (const char *) nodes[i]->name); return -1; } @@ -5832,7 +5830,7 @@ virDomainStorageNetworkParseHost(xmlNodePtr hostnode, host->transport = virStorageNetHostTransportTypeFromString(transport); if (host->transport < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown protocol transport type '%s'"), + _("unknown protocol transport type '%1$s'"), transport); goto cleanup; } @@ -5850,8 +5848,7 @@ virDomainStorageNetworkParseHost(xmlNodePtr hostnode, if (host->transport != VIR_STORAGE_NET_HOST_TRANS_UNIX && host->socket != NULL) { virReportError(VIR_ERR_XML_ERROR, - _("transport '%s' does not support " - "socket attribute"), + _("transport '%1$s' does not support socket attribute"), transport); goto cleanup; } @@ -6021,13 +6018,13 @@ virDomainHostdevSubsysSCSIiSCSIDefParseXML(xmlNodePtr sourcenode, return -1; if ((auth_secret_usage = virSecretUsageTypeFromString(authdef->secrettype)) < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("invalid secret type %s"), + _("invalid secret type %1$s"), authdef->secrettype); return -1; } if (auth_secret_usage != VIR_SECRET_USAGE_TYPE_ISCSI) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("hostdev invalid secret type '%s'"), + _("hostdev invalid secret type '%1$s'"), authdef->secrettype); return -1; } @@ -6060,7 +6057,7 @@ virDomainHostdevSubsysSCSIDefParseXML(xmlNodePtr sourcenode, virDomainHostdevSubsysSCSIProtocolTypeFromString(protocol); if (scsisrc->protocol < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Unknown SCSI subsystem protocol '%s'"), + _("Unknown SCSI subsystem protocol '%1$s'"), protocol); return -1; } @@ -6101,7 +6098,7 @@ virDomainHostdevSubsysSCSIVHostDefParseXML(xmlNodePtr sourcenode, if ((hostsrc->protocol = virDomainHostdevSubsysSCSIHostProtocolTypeFromString(protocol)) <= 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Unknown scsi_host subsystem protocol '%s'"), + _("Unknown scsi_host subsystem protocol '%1$s'"), protocol); return -1; } @@ -6124,7 +6121,7 @@ virDomainHostdevSubsysSCSIVHostDefParseXML(xmlNodePtr sourcenode, case VIR_DOMAIN_HOSTDEV_SUBSYS_SCSI_HOST_PROTOCOL_TYPE_NONE: case VIR_DOMAIN_HOSTDEV_SUBSYS_SCSI_HOST_PROTOCOL_TYPE_LAST: virReportError(VIR_ERR_XML_ERROR, - _("Invalid hostdev protocol '%s'"), + _("Invalid hostdev protocol '%1$s'"), virDomainHostdevSubsysSCSIHostProtocolTypeToString(hostsrc->protocol)); return -1; } @@ -6209,7 +6206,7 @@ virDomainHostdevDefParseXMLSubsys(xmlNodePtr node, if ((def->source.subsys.type = virDomainHostdevSubsysTypeFromString(type)) < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown host device source address type '%s'"), + _("unknown host device source address type '%1$s'"), type); return -1; } @@ -6259,8 +6256,7 @@ virDomainHostdevDefParseXMLSubsys(xmlNodePtr node, def->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI_HOST) { if (model) { virReportError(VIR_ERR_XML_ERROR, - _("'model' attribute in <hostdev> is only supported " - "when type='%s'"), + _("'model' attribute in <hostdev> is only supported when type='%1$s'"), virDomainHostdevSubsysTypeToString(def->source.subsys.type)); return -1; } @@ -6325,7 +6321,7 @@ virDomainHostdevDefParseXMLSubsys(xmlNodePtr node, default: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("address type='%s' not supported in hostdev interfaces"), + _("address type='%1$s' not supported in hostdev interfaces"), virDomainHostdevSubsysTypeToString(def->source.subsys.type)); return -1; } @@ -6363,7 +6359,7 @@ virDomainNetIPParseXML(xmlNodePtr node) if (virSocketAddrParse(&ip->address, address, family) < 0) { virReportError(VIR_ERR_XML_ERROR, - _("Invalid address '%s' in <ip>"), + _("Invalid address '%1$s' in <ip>"), address); return NULL; } @@ -6374,7 +6370,7 @@ virDomainNetIPParseXML(xmlNodePtr node) (family == AF_INET6 && prefixValue > 128) || (family == AF_INET && prefixValue > 32))) { virReportError(VIR_ERR_XML_ERROR, - _("Invalid prefix value '%s' in <ip>"), + _("Invalid prefix value '%1$s' in <ip>"), prefixStr); return NULL; } @@ -6383,7 +6379,7 @@ virDomainNetIPParseXML(xmlNodePtr node) if ((peer = virXMLPropString(node, "peer")) != NULL && virSocketAddrParse(&ip->peer, peer, family) < 0) { virReportError(VIR_ERR_INVALID_ARG, - _("Invalid peer '%s' in <ip>"), peer); + _("Invalid peer '%1$s' in <ip>"), peer); return NULL; } @@ -6458,15 +6454,14 @@ virDomainNetDefCoalesceParseXML(xmlNodePtr node, if (virStrToLong_ullp(str, NULL, 10, &tmp) < 0) { virReportError(VIR_ERR_XML_DETAIL, - _("cannot parse value '%s' for coalesce parameter"), + _("cannot parse value '%1$s' for coalesce parameter"), str); return -1; } if (tmp > UINT32_MAX) { virReportError(VIR_ERR_OVERFLOW, - _("value '%llu' is too big for coalesce " - "parameter, maximum is '%lu'"), + _("value '%1$llu' is too big for coalesce parameter, maximum is '%2$lu'"), tmp, (unsigned long) UINT32_MAX); return -1; } @@ -6523,7 +6518,7 @@ virDomainHostdevDefParseXMLCaps(xmlNodePtr node G_GNUC_UNUSED, if ((def->source.caps.type = virDomainHostdevCapsTypeFromString(type)) < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown host device source address type '%s'"), + _("unknown host device source address type '%1$s'"), type); return -1; } @@ -6564,7 +6559,7 @@ virDomainHostdevDefParseXMLCaps(xmlNodePtr node G_GNUC_UNUSED, break; default: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("address type='%s' not supported in hostdev interfaces"), + _("address type='%1$s' not supported in hostdev interfaces"), virDomainHostdevCapsTypeToString(def->source.caps.type)); return -1; } @@ -6596,7 +6591,7 @@ virDomainDiskDefAssignAddress(virDomainXMLOption *xmlopt G_GNUC_UNUSED, int idx = virDiskNameToIndex(def->dst); if (idx < 0) { virReportError(VIR_ERR_XML_ERROR, - _("Unknown disk name '%s' and no address specified"), + _("Unknown disk name '%1$s' and no address specified"), def->dst); return -1; } @@ -6635,9 +6630,7 @@ virDomainDiskDefAssignAddress(virDomainXMLOption *xmlopt G_GNUC_UNUSED, VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI, &addr)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("using disk target name '%s' conflicts with " - "SCSI host device address controller='%u' " - "bus='%u' target='%u' unit='%u"), + _("using disk target name '%1$s' conflicts with SCSI host device address controller='%2$u' bus='%3$u' target='%4$u' unit='%5$u"), def->dst, controller, 0, 0, unit); return -1; } @@ -6745,7 +6738,7 @@ virSecurityLabelDefParseXML(xmlXPathContextPtr ctxt, } else { if (seclabel->type != VIR_DOMAIN_SECLABEL_NONE) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unsupported type='%s' to model 'none'"), + _("unsupported type='%1$s' to model 'none'"), virDomainSeclabelTypeToString(seclabel->type)); return NULL; } @@ -6824,7 +6817,7 @@ virSecurityLabelDefsParseXML(virDomainDef *def, for (j = 0; j < i; j++) { if (STREQ_NULLABLE(seclabel->model, def->seclabels[j]->model)) { virReportError(VIR_ERR_XML_DETAIL, - _("seclabel for model %s is already provided"), + _("seclabel for model %1$s is already provided"), seclabel->model); virSecurityLabelDefFree(seclabel); goto error; @@ -6926,7 +6919,7 @@ virSecurityDeviceLabelDefParseXML(virSecurityDeviceLabelDef ***seclabels_rtn, for (j = 0; j < i; j++) { if (STREQ_NULLABLE(model, seclabels[j]->model)) { virReportError(VIR_ERR_XML_DETAIL, - _("seclabel for model %s is already provided"), model); + _("seclabel for model %1$s is already provided"), model); goto error; } } @@ -6956,9 +6949,8 @@ virSecurityDeviceLabelDefParseXML(virSecurityDeviceLabelDef ***seclabels_rtn, if (seclabels[i]->label && !seclabels[i]->relabel) { virReportError(VIR_ERR_XML_ERROR, - _("Cannot specify a label if relabelling is " - "turned off. model=%s"), - NULLSTR(seclabels[i]->model)); + _("Cannot specify a label if relabelling is turned off. model=%1$s"), + NULLSTR(seclabels[i]->model)); goto error; } } @@ -7060,7 +7052,7 @@ virDomainDiskSourcePoolDefParse(xmlNodePtr node, if (mode && (source->mode = virStorageSourcePoolModeTypeFromString(mode)) <= 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown source mode '%s' for volume type disk"), + _("unknown source mode '%1$s' for volume type disk"), mode); goto cleanup; } @@ -7091,7 +7083,7 @@ virDomainStorageNetCookieParse(xmlNodePtr node, } if (!(cookie->value = virXPathString("string(.)", ctxt))) { - virReportError(VIR_ERR_XML_ERROR, _("missing value for cookie '%s'"), + virReportError(VIR_ERR_XML_ERROR, _("missing value for cookie '%1$s'"), cookie->name); return NULL; } @@ -7184,8 +7176,8 @@ virDomainDiskSourceNetworkParse(xmlNodePtr node, if (!(tmp = strchr(src->path, '/')) || tmp == src->path) { virReportError(VIR_ERR_XML_ERROR, - _("can't split path '%s' into pool name and image " - "name"), src->path); + _("can't split path '%1$s' into pool name and image name"), + src->path); return -1; } @@ -7268,7 +7260,7 @@ virDomainDiskSourceNVMeParse(xmlNodePtr node, if (STRNEQ(type, "pci")) { virReportError(VIR_ERR_XML_ERROR, - _("unsupported source type '%s'"), + _("unsupported source type '%1$s'"), type); return -1; } @@ -7281,7 +7273,7 @@ virDomainDiskSourceNVMeParse(xmlNodePtr node, if (virStrToLong_ull(namespc, NULL, 10, &nvme->namespc) < 0) { virReportError(VIR_ERR_XML_ERROR, - _("malformed namespace '%s'"), + _("malformed namespace '%1$s'"), namespc); return -1; } @@ -7380,7 +7372,7 @@ virDomainStorageSourceParseBase(const char *type, int tmp; if ((tmp = virStorageTypeFromString(type)) <= 0) { virReportError(VIR_ERR_XML_ERROR, - _("unknown storage source type '%s'"), type); + _("unknown storage source type '%1$s'"), type); return NULL; } @@ -7390,14 +7382,14 @@ virDomainStorageSourceParseBase(const char *type, if (format && (src->format = virStorageFileFormatTypeFromString(format)) <= 0) { virReportError(VIR_ERR_XML_ERROR, - _("unknown storage source format '%s'"), format); + _("unknown storage source format '%1$s'"), format); return NULL; } if (index && virStrToLong_uip(index, NULL, 10, &src->id) < 0) { virReportError(VIR_ERR_XML_ERROR, - _("invalid storage source index '%s'"), index); + _("invalid storage source index '%1$s'"), index); return NULL; } @@ -7425,14 +7417,14 @@ virDomainStorageSourceParseSlice(xmlNodePtr node, if (virStrToLong_ullp(offset, NULL, 10, &ret->offset) < 0) { virReportError(VIR_ERR_XML_ERROR, - _("malformed value '%s' of 'offset' attribute of slice"), + _("malformed value '%1$s' of 'offset' attribute of slice"), offset); return NULL; } if (virStrToLong_ullp(size, NULL, 10, &ret->size) < 0) { virReportError(VIR_ERR_XML_ERROR, - _("malformed value '%s' of 'size' attribute of slice"), + _("malformed value '%1$s' of 'size' attribute of slice"), size); return NULL; } @@ -7510,7 +7502,7 @@ virDomainStorageSourceParse(xmlNodePtr node, case VIR_STORAGE_TYPE_NONE: case VIR_STORAGE_TYPE_LAST: virReportError(VIR_ERR_INTERNAL_ERROR, - _("unexpected disk type %s"), + _("unexpected disk type %1$s"), virStorageTypeToString(src->type)); return -1; } @@ -7614,7 +7606,7 @@ virDomainDiskBackingStoreParse(xmlXPathContextPtr ctxt, if (virXPathULongLong("string(./iotune/" #val ")", \ ctxt, &def->blkdeviotune.val) == -2) { \ virReportError(VIR_ERR_XML_ERROR, \ - _("disk iotune field '%s' must be an integer"), #val); \ + _("disk iotune field '%1$s' must be an integer"), #val); \ return -1; \ } @@ -7673,7 +7665,7 @@ virDomainDiskDefMirrorParse(virDomainDiskDef *def, if ((blockJob = virXMLPropString(cur, "job"))) { if ((def->mirrorJob = virDomainBlockJobTypeFromString(blockJob)) <= 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown mirror job type '%s'"), blockJob); + _("unknown mirror job type '%1$s'"), blockJob); return -1; } } else { @@ -7723,7 +7715,7 @@ virDomainDiskDefMirrorParse(virDomainDiskDef *def, if ((ready = virXMLPropString(cur, "ready")) && (def->mirrorState = virDomainDiskMirrorStateTypeFromString(ready)) < 0) { virReportError(VIR_ERR_XML_ERROR, - _("unknown mirror ready state %s"), ready); + _("unknown mirror ready state %1$s"), ready); return -1; } @@ -7783,7 +7775,7 @@ virDomainDiskDefDriverParseXML(virDomainDiskDef *def, if (def->rerror_policy == VIR_DOMAIN_DISK_ERROR_POLICY_ENOSPACE) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Invalid disk read error policy: '%s'"), + _("Invalid disk read error policy: '%1$s'"), virDomainDiskErrorPolicyTypeToString(def->rerror_policy)); return -1; } @@ -7843,7 +7835,7 @@ virDomainDiskDefDriverSourceParseXML(virStorageSource *src, } else { if ((src->format = virStorageFileFormatTypeFromString(tmp)) <= 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown driver format value '%s'"), tmp); + _("unknown driver format value '%1$s'"), tmp); return -1; } } @@ -7910,7 +7902,7 @@ virDomainDiskDefParseSourceXML(virDomainXMLOption *xmlopt, if ((sourceindex = virXMLPropString(tmp, "index")) && virStrToLong_uip(sourceindex, NULL, 10, &src->id) < 0) { virReportError(VIR_ERR_XML_ERROR, - _("invalid disk index '%s'"), sourceindex); + _("invalid disk index '%1$s'"), sourceindex); return NULL; } } @@ -8352,7 +8344,7 @@ virDomainControllerDefParseXML(virDomainXMLOption *xmlopt, if ((model = virXMLPropString(node, "model"))) { if ((def->model = virDomainControllerModelTypeFromString(def, model)) < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Unknown model type '%s'"), model); + _("Unknown model type '%1$s'"), model); return NULL; } } @@ -8601,7 +8593,7 @@ virDomainFSDefParseXML(virDomainXMLOption *xmlopt, } else if (rv > 0) { if (def->fmode > 0777) { virReportError(VIR_ERR_XML_ERROR, - _("invalid fmode: '0%o'"), def->fmode); + _("invalid fmode: '0%1$o'"), def->fmode); goto error; } } @@ -8613,7 +8605,7 @@ virDomainFSDefParseXML(virDomainXMLOption *xmlopt, } else if (rv > 0) { if (def->dmode > 0777) { virReportError(VIR_ERR_XML_ERROR, - _("invalid dmode: '0%o'"), def->dmode); + _("invalid dmode: '0%1$o'"), def->dmode); goto error; } } @@ -8680,7 +8672,7 @@ virDomainFSDefParseXML(virDomainXMLOption *xmlopt, if ((format = virXMLPropString(driver_node, "format")) && ((def->format = virStorageFileFormatTypeFromString(format)) <= 0)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown driver format value '%s'"), format); + _("unknown driver format value '%1$s'"), format); goto error; } @@ -8699,7 +8691,7 @@ virDomainFSDefParseXML(virDomainXMLOption *xmlopt, if (queue_size && virStrToLong_ull(queue_size, NULL, 10, &def->queue_size) < 0) { virReportError(VIR_ERR_XML_ERROR, - _("cannot parse queue size '%s' for virtiofs"), + _("cannot parse queue size '%1$s' for virtiofs"), queue_size); goto error; } @@ -8707,7 +8699,7 @@ virDomainFSDefParseXML(virDomainXMLOption *xmlopt, if (thread_pool_size && virStrToLong_i(thread_pool_size, NULL, 10, &def->thread_pool_size) < 0) { virReportError(VIR_ERR_XML_ERROR, - _("cannot parse thread pool size '%s' for virtiofs"), + _("cannot parse thread pool size '%1$s' for virtiofs"), thread_pool_size); goto error; } @@ -8758,7 +8750,7 @@ virDomainFSDefParseXML(virDomainXMLOption *xmlopt, } if (virStrToLong_ull(usage, NULL, 10, &def->usage) < 0) { virReportError(VIR_ERR_XML_ERROR, - _("cannot parse usage '%s' for RAM filesystem"), + _("cannot parse usage '%1$s' for RAM filesystem"), usage); goto error; } @@ -8812,7 +8804,7 @@ virDomainActualNetDefParseXML(xmlNodePtr node, actual->type != VIR_DOMAIN_NET_TYPE_HOSTDEV && actual->type != VIR_DOMAIN_NET_TYPE_NETWORK) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unsupported type '%s' in interface's <actual> element"), + _("unsupported type '%1$s' in interface's <actual> element"), virDomainNetTypeToString(actual->type)); goto error; } @@ -8837,8 +8829,7 @@ virDomainActualNetDefParseXML(xmlNodePtr node, } } else { virReportError(VIR_ERR_INTERNAL_ERROR, - _("<virtualport> element unsupported for type='%s'" - " in interface's <actual> element"), + _("<virtualport> element unsupported for type='%1$s' in interface's <actual> element"), virDomainNetTypeToString(actual->type)); goto error; } @@ -8888,7 +8879,7 @@ virDomainActualNetDefParseXML(xmlNodePtr node, if (class_id && virStrToLong_ui(class_id, NULL, 10, &actual->class_id) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to parse class id '%s'"), + _("Unable to parse class id '%1$s'"), class_id); goto error; } @@ -8909,8 +8900,7 @@ virDomainActualNetDefParseXML(xmlNodePtr node, (actual->data.bridge.macTableManager = virNetworkBridgeMACTableManagerTypeFromString(macTableManager)) <= 0) { virReportError(VIR_ERR_XML_ERROR, - _("Invalid macTableManager setting '%s' " - "in domain interface's <actual> element"), + _("Invalid macTableManager setting '%1$s' in domain interface's <actual> element"), macTableManager); goto error; } @@ -8983,7 +8973,7 @@ virDomainNetTeamingInfoParseXML(xmlXPathContextPtr ctxt, if ((tmpType = virDomainNetTeamingTypeFromString(typeStr)) <= 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown teaming type '%s'"), + _("unknown teaming type '%1$s'"), typeStr); return -1; } @@ -9222,7 +9212,7 @@ virDomainNetPortForwardDefParseXML(xmlNodePtr node, address = virXMLPropString(node, "address"); if (address && virSocketAddrParse(&def->address, address, AF_UNSPEC) < 0) { virReportError(VIR_ERR_XML_ERROR, - _("Invalid address '%s' in <portForward>"), address); + _("Invalid address '%1$s' in <portForward>"), address); return NULL; } @@ -9268,7 +9258,7 @@ virDomainNetDefParseXMLRequireSource(virDomainNetDef *def, { if (!source_node) { virReportError(VIR_ERR_XML_ERROR, - _("interface type='%s' requires a 'source' element"), + _("interface type='%1$s' requires a 'source' element"), virDomainNetTypeToString(def->type)); return -1; } @@ -9453,7 +9443,7 @@ virDomainNetDefParseXML(virDomainXMLOption *xmlopt, if (STRNEQ_NULLABLE(vhostuser_type, "unix")) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Type='%s' unsupported for <interface type='vhostuser'>"), + _("Type='%1$s' unsupported for <interface type='vhostuser'>"), vhostuser_type); return NULL; } @@ -9576,7 +9566,7 @@ virDomainNetDefParseXML(virDomainXMLOption *xmlopt, if ((virtualport_node = virXPathNode("./virtualport", ctxt))) { if (virtualport_flags == 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("<virtualport> element unsupported for <interface type='%s'>"), + _("<virtualport> element unsupported for <interface type='%1$s'>"), virDomainNetTypeToString(def->type)); return NULL; } @@ -9624,13 +9614,13 @@ virDomainNetDefParseXML(virDomainXMLOption *xmlopt, if ((macaddr = virXMLPropString(mac_node, "address"))) { if (virMacAddrParse((const char *)macaddr, &def->mac) < 0) { virReportError(VIR_ERR_XML_ERROR, - _("unable to parse mac address '%s'"), + _("unable to parse mac address '%1$s'"), (const char *)macaddr); return NULL; } if (virMacAddrIsMulticast(&def->mac)) { virReportError(VIR_ERR_XML_ERROR, - _("expected unicast mac address, found multicast '%s'"), + _("expected unicast mac address, found multicast '%1$s'"), (const char *)macaddr); return NULL; } @@ -9686,7 +9676,7 @@ virDomainNetDefParseXML(virDomainXMLOption *xmlopt, if (linkstate != NULL) { if ((def->linkstate = virDomainNetInterfaceLinkStateTypeFromString(linkstate)) <= 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown interface link state '%s'"), + _("unknown interface link state '%1$s'"), linkstate); return NULL; } @@ -9731,7 +9721,7 @@ virDomainChrDefaultTargetType(int devtype) switch ((virDomainChrDeviceType) devtype) { case VIR_DOMAIN_CHR_DEVICE_TYPE_CHANNEL: virReportError(VIR_ERR_XML_ERROR, - _("target type must be specified for %s device"), + _("target type must be specified for %1$s device"), virDomainChrDeviceTypeToString(devtype)); return -1; @@ -9827,7 +9817,7 @@ virDomainChrDefParseTargetXML(virDomainChrDef *def, virDomainChrTargetTypeFromString(def->deviceType, targetType)) < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown target type '%s' specified for character device"), + _("unknown target type '%1$s' specified for character device"), targetType); return -1; } @@ -9838,7 +9828,7 @@ virDomainChrDefParseTargetXML(virDomainChrDef *def, virDomainChrTargetModelFromString(def->deviceType, targetModel)) < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown target model '%s' specified for character device"), + _("unknown target model '%1$s' specified for character device"), targetModel); return -1; } @@ -9900,7 +9890,7 @@ virDomainChrDefParseTargetXML(virDomainChrDef *def, if (virStrToLong_ui(portStr, NULL, 10, &port) < 0) { virReportError(VIR_ERR_XML_ERROR, - _("Invalid port number: %s"), + _("Invalid port number: %1$s"), portStr); return -1; } @@ -10029,7 +10019,7 @@ virDomainChrSourceDefParseProtocol(virDomainChrSourceDef *def, (def->data.tcp.protocol = virDomainChrTcpProtocolTypeFromString(prot)) < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Unknown protocol '%s'"), prot); + _("Unknown protocol '%1$s'"), prot); return -1; } @@ -10341,7 +10331,7 @@ virDomainChrDefParseXML(virDomainXMLOption *xmlopt, def->source->type = VIR_DOMAIN_CHR_TYPE_PTY; } else if ((def->source->type = virDomainChrTypeFromString(type)) < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown type presented to host for character device: %s"), + _("unknown type presented to host for character device: %1$s"), type); goto error; } @@ -10349,7 +10339,7 @@ virDomainChrDefParseXML(virDomainXMLOption *xmlopt, nodeName = (const char *) node->name; if ((def->deviceType = virDomainChrDeviceTypeFromString(nodeName)) < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown character device type: %s"), + _("unknown character device type: %1$s"), nodeName); goto error; } @@ -10440,7 +10430,7 @@ virDomainSmartcardDefParseXML(virDomainXMLOption *xmlopt, if (*def->data.cert.database != '/') { virReportError(VIR_ERR_XML_ERROR, - _("expecting absolute path: %s"), + _("expecting absolute path: %1$s"), def->data.cert.database); return NULL; } @@ -10461,8 +10451,8 @@ virDomainSmartcardDefParseXML(virDomainXMLOption *xmlopt, if ((def->data.passthru->type = virDomainChrTypeFromString(type)) < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown type presented to host for " - "character device: %s"), type); + _("unknown type presented to host for character device: %1$s"), + type); return NULL; } @@ -10597,7 +10587,7 @@ virDomainTPMDefParseXML(virDomainXMLOption *xmlopt, if (secretuuid) { if (virUUIDParse(secretuuid, def->data.emulator.secretuuid) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to parse secret uuid '%s'"), secretuuid); + _("Unable to parse secret uuid '%1$s'"), secretuuid); goto error; } def->data.emulator.hassecretuuid = true; @@ -10620,7 +10610,7 @@ virDomainTPMDefParseXML(virDomainXMLOption *xmlopt, for (i = 0; i < nnodes; i++) { if ((bank = virDomainTPMPcrBankTypeFromString((const char *)nodes[i]->name)) < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Unsupported PCR banks '%s'"), + _("Unsupported PCR banks '%1$s'"), nodes[i]->name); goto error; } @@ -10640,7 +10630,7 @@ virDomainTPMDefParseXML(virDomainXMLOption *xmlopt, def->data.external.source->type = virDomainChrTypeFromString(type); if (def->data.external.source->type < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown backend source type '%s' for external TPM"), + _("unknown backend source type '%1$s' for external TPM"), type); goto error; } @@ -10690,7 +10680,7 @@ virDomainPanicDefParseXML(virDomainXMLOption *xmlopt, if (model != NULL && (panic->model = virDomainPanicModelTypeFromString(model)) < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown panic model '%s'"), model); + _("unknown panic model '%1$s'"), model); goto error; } @@ -10732,7 +10722,7 @@ virDomainInputDefParseXML(virDomainXMLOption *xmlopt, if ((def->type = virDomainInputTypeFromString(type)) < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown input device type '%s'"), type); + _("unknown input device type '%1$s'"), type); goto error; } @@ -10740,14 +10730,14 @@ virDomainInputDefParseXML(virDomainXMLOption *xmlopt, ((def->model = virDomainInputModelTypeFromString(model)) < 0 || def->model == VIR_DOMAIN_INPUT_MODEL_DEFAULT)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown input model '%s'"), model); + _("unknown input model '%1$s'"), model); goto error; } if (bus) { if ((def->bus = virDomainInputBusTypeFromString(bus)) < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown input bus type '%s'"), bus); + _("unknown input bus type '%1$s'"), bus); goto error; } @@ -10857,7 +10847,7 @@ virDomainHubDefParseXML(virDomainXMLOption *xmlopt, if ((def->type = virDomainHubTypeFromString(type)) < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown hub device type '%s'"), type); + _("unknown hub device type '%1$s'"), type); goto error; } @@ -10960,7 +10950,7 @@ virDomainGraphicsAuthDefParseXML(xmlNodePtr node, /* second */ virStrToLong_i(tmp+1, &tmp, 10, &sec) < 0 || *tmp != '\0') { virReportError(VIR_ERR_INTERNAL_ERROR, - _("cannot parse password validity time '%s', expect YYYY-MM-DDTHH:MM:SS"), + _("cannot parse password validity time '%1$s', expect YYYY-MM-DDTHH:MM:SS"), validTo); VIR_FREE(def->passwd); return -1; @@ -10975,7 +10965,7 @@ virDomainGraphicsAuthDefParseXML(xmlNodePtr node, int action = virDomainGraphicsAuthConnectedTypeFromString(connected); if (action <= 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown connected value %s"), + _("unknown connected value %1$s"), connected); return -1; } @@ -11038,8 +11028,8 @@ virDomainGraphicsListenDefParseXML(virDomainGraphicsListenDef *def, if (graphics->type != VIR_DOMAIN_GRAPHICS_TYPE_VNC && graphics->type != VIR_DOMAIN_GRAPHICS_TYPE_SPICE) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("listen type 'socket' is not available for " - "graphics type '%s'"), graphicsType); + _("listen type 'socket' is not available for graphics type '%1$s'"), + graphicsType); goto error; } break; @@ -11047,8 +11037,8 @@ virDomainGraphicsListenDefParseXML(virDomainGraphicsListenDef *def, if (graphics->type != VIR_DOMAIN_GRAPHICS_TYPE_SPICE && graphics->type != VIR_DOMAIN_GRAPHICS_TYPE_VNC) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("listen type 'none' is not available for " - "graphics type '%s'"), graphicsType); + _("listen type 'none' is not available for graphics type '%1$s'"), + graphicsType); goto error; } break; @@ -11061,9 +11051,8 @@ virDomainGraphicsListenDefParseXML(virDomainGraphicsListenDef *def, if (def->type == VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_ADDRESS) { if (address && addressCompat && STRNEQ(address, addressCompat)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("graphics 'listen' attribute '%s' must match " - "'address' attribute of first listen element " - "(found '%s')"), addressCompat, address); + _("graphics 'listen' attribute '%1$s' must match 'address' attribute of first listen element (found '%2$s')"), + addressCompat, address); goto error; } @@ -11074,9 +11063,8 @@ virDomainGraphicsListenDefParseXML(virDomainGraphicsListenDef *def, if (def->type == VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_SOCKET) { if (socketPath && socketCompat && STRNEQ(socketPath, socketCompat)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("graphics 'socket' attribute '%s' must match " - "'socket' attribute of first listen element " - "(found '%s')"), socketCompat, socketPath); + _("graphics 'socket' attribute '%1$s' must match 'socket' attribute of first listen element (found '%2$s')"), + socketCompat, socketPath); goto error; } @@ -11122,7 +11110,7 @@ virDomainGraphicsListenDefParseXML(virDomainGraphicsListenDef *def, flags & VIR_DOMAIN_DEF_PARSE_STATUS) { if (virStringParseYesNo(autoGenerated, &def->autoGenerated) < 0) { virReportError(VIR_ERR_XML_ERROR, - _("Invalid autoGenerated value: %s"), + _("Invalid autoGenerated value: %1$s"), autoGenerated); goto error; } @@ -11233,7 +11221,7 @@ virDomainGraphicsDefParseXMLVNC(virDomainGraphicsDef *def, if (port) { if (virStrToLong_i(port, NULL, 10, &def->data.vnc.port) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("cannot parse vnc port %s"), port); + _("cannot parse vnc port %1$s"), port); return -1; } /* Legacy compat syntax, used -1 for auto-port */ @@ -11336,7 +11324,7 @@ virDomainGraphicsDefParseXMLRDP(virDomainGraphicsDef *def, if (port) { if (virStrToLong_i(port, NULL, 10, &def->data.rdp.port) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("cannot parse rdp port %s"), port); + _("cannot parse rdp port %1$s"), port); return -1; } /* Legacy compat syntax, used -1 for auto-port */ @@ -11700,7 +11688,7 @@ virDomainSoundCodecDefParseXML(xmlNodePtr node) type = virXMLPropString(node, "type"); if ((def->type = virDomainSoundCodecTypeFromString(type)) < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown codec type '%s'"), type); + _("unknown codec type '%1$s'"), type); goto error; } @@ -12036,7 +12024,7 @@ virDomainAudioDefParseXML(virDomainXMLOption *xmlopt G_GNUC_UNUSED, if (dspPolicySet != 0) { if (def->backend.oss.dspPolicy < 0) { virReportError(VIR_ERR_XML_ERROR, - _("cannot parse 'dspPolicy' value '%i'"), + _("cannot parse 'dspPolicy' value '%1$i'"), def->backend.oss.dspPolicy); goto error; } @@ -12120,7 +12108,7 @@ virDomainWatchdogDefParseXML(virDomainXMLOption *xmlopt, def->model = virDomainWatchdogModelTypeFromString(model); if (def->model < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown watchdog model '%s'"), model); + _("unknown watchdog model '%1$s'"), model); goto error; } @@ -12131,7 +12119,7 @@ virDomainWatchdogDefParseXML(virDomainXMLOption *xmlopt, def->action = virDomainWatchdogActionTypeFromString(action); if (def->action < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown watchdog action '%s'"), action); + _("unknown watchdog action '%1$s'"), action); goto error; } } @@ -12169,7 +12157,7 @@ virDomainRNGDefParseXML(virDomainXMLOption *xmlopt, } if ((def->model = virDomainRNGModelTypeFromString(model)) < 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown RNG model '%s'"), model); + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown RNG model '%1$s'"), model); goto error; } @@ -12205,7 +12193,7 @@ virDomainRNGDefParseXML(virDomainXMLOption *xmlopt, if ((def->backend = virDomainRNGBackendTypeFromString(backend)) < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown RNG backend model '%s'"), backend); + _("unknown RNG backend model '%1$s'"), backend); goto error; } @@ -12227,7 +12215,7 @@ virDomainRNGDefParseXML(virDomainXMLOption *xmlopt, def->source.chardev->type = virDomainChrTypeFromString(type); if (def->source.chardev->type < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown backend type '%s' for egd"), + _("unknown backend type '%1$s' for egd"), type); goto error; } @@ -12977,7 +12965,7 @@ virDomainHostdevDefParseXML(virDomainXMLOption *xmlopt, if (mode) { if ((def->mode = virDomainHostdevModeTypeFromString(mode)) < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown hostdev mode '%s'"), mode); + _("unknown hostdev mode '%1$s'"), mode); goto error; } } else { @@ -12997,7 +12985,7 @@ virDomainHostdevDefParseXML(virDomainXMLOption *xmlopt, break; default: virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unexpected hostdev mode %d"), def->mode); + _("Unexpected hostdev mode %1$d"), def->mode); goto error; } @@ -13055,7 +13043,7 @@ virDomainRedirdevDefParseXML(virDomainXMLOption *xmlopt, if (bus) { if ((def->bus = virDomainRedirdevBusTypeFromString(bus)) < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown redirdev bus '%s'"), bus); + _("unknown redirdev bus '%1$s'"), bus); goto error; } } else { @@ -13066,7 +13054,7 @@ virDomainRedirdevDefParseXML(virDomainXMLOption *xmlopt, if (type) { if ((def->source->type = virDomainChrTypeFromString(type)) < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown redirdev character device type '%s'"), type); + _("unknown redirdev character device type '%1$s'"), type); goto error; } } else { @@ -13139,7 +13127,7 @@ virDomainRedirFilterUSBVersionHelper(const char *version, error: virReportError(VIR_ERR_XML_ERROR, - _("Cannot parse USB device version %s"), version); + _("Cannot parse USB device version %1$s"), version); return -1; } @@ -13157,7 +13145,7 @@ virDomainRedirFilterUSBDevDefParseXML(xmlNodePtr node) if (def->usbClass != -1 && def->usbClass &~ 0xFF) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Invalid USB Class code 0x%x"), def->usbClass); + _("Invalid USB Class code 0x%1$x"), def->usbClass); return NULL; } @@ -13236,7 +13224,7 @@ virDomainEventActionParseXML(xmlXPathContextPtr ctxt, *val = convFunc(tmp); if (*val < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown %s action: %s"), name, tmp); + _("unknown %1$s action: %2$s"), name, tmp); return -1; } } @@ -13272,7 +13260,7 @@ virDomainPerfEventDefParseXML(virDomainPerfDef *perf, if (perf->events[name] != VIR_TRISTATE_BOOL_ABSENT) { virReportError(VIR_ERR_XML_ERROR, - _("perf event '%s' was already specified"), + _("perf event '%1$s' was already specified"), virPerfEventTypeToString(name)); return -1; } @@ -13325,7 +13313,7 @@ virDomainMemorySourceDefParseXML(xmlNodePtr node, if (virBitmapIsAllClear(def->sourceNodes)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Invalid value of 'nodemask': %s"), nodemask); + _("Invalid value of 'nodemask': %1$s"), nodemask); return -1; } } @@ -13355,7 +13343,7 @@ virDomainMemorySourceDefParseXML(xmlNodePtr node, if (virBitmapIsAllClear(def->sourceNodes)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Invalid value of 'nodemask': %s"), nodemask); + _("Invalid value of 'nodemask': %1$s"), nodemask); return -1; } } @@ -13506,7 +13494,7 @@ virDomainSecDefParseXML(xmlNodePtr lsecNode, case VIR_DOMAIN_LAUNCH_SECURITY_LAST: default: virReportError(VIR_ERR_XML_ERROR, - _("unsupported launch security type '%s'"), + _("unsupported launch security type '%1$s'"), virDomainLaunchSecurityTypeToString(sec->sectype)); return NULL; } @@ -13757,7 +13745,7 @@ virDomainDeviceDefParseType(const char *typestr, if ((tmp = virDomainDeviceTypeFromString(typestr)) < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown device type '%s'"), typestr); + _("unknown device type '%1$s'"), typestr); return -1; } @@ -14494,7 +14482,7 @@ virDomainNetFindIdx(virDomainDef *def, virDomainNetDef *net) */ if (MACAddrSpecified) { virReportError(VIR_ERR_OPERATION_FAILED, - _("multiple devices matching MAC address %s found"), + _("multiple devices matching MAC address %1$s found"), macAddr); } else { virReportError(VIR_ERR_OPERATION_FAILED, "%s", @@ -14521,8 +14509,7 @@ virDomainNetFindIdx(virDomainDef *def, virDomainNetDef *net) addr = g_strdup(_("(<null>)")); virReportError(VIR_ERR_DEVICE_MISSING, - _("no device found at address '%s' matching MAC address" - " '%s' and alias '%s'"), + _("no device found at address '%1$s' matching MAC address '%2$s' and alias '%3$s'"), addr, macAddr, alias); return -1; } @@ -14865,7 +14852,7 @@ virDomainControllerAliasFind(const virDomainDef *def, if (!contTypeStr) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unknown controller type %d"), + _("Unknown controller type %1$d"), type); return NULL; } @@ -14873,15 +14860,13 @@ virDomainControllerAliasFind(const virDomainDef *def, contIndex = virDomainControllerFind(def, type, idx); if (contIndex < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not find %s controller with index %d " - "required for device"), + _("Could not find %1$s controller with index %2$d required for device"), contTypeStr, idx); return NULL; } if (!def->controllers[contIndex]->info.alias) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Device alias was not set for %s controller " - "with index %d "), + _("Device alias was not set for %1$s controller with index %2$d"), contTypeStr, idx); return NULL; } @@ -15114,7 +15099,7 @@ virDomainChrGetDomainPtrsInternal(virDomainDef *vmdef, } virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unknown char device type: %d"), type); + _("Unknown char device type: %1$d"), type); return -1; } @@ -15851,7 +15836,7 @@ virDomainDefParseIOThreads(virDomainDef *def, tmp = virXPathString("string(./iothreads[1])", ctxt); if (tmp && virStrToLong_uip(tmp, NULL, 10, &iothreads) < 0) { virReportError(VIR_ERR_XML_ERROR, - _("invalid iothreads count '%s'"), tmp); + _("invalid iothreads count '%1$s'"), tmp); return -1; } @@ -15876,7 +15861,7 @@ virDomainDefParseIOThreads(virDomainDef *def, if (virDomainIOThreadIDFind(def, iothrid->iothread_id)) { virReportError(VIR_ERR_XML_ERROR, - _("duplicate iothread id '%u' found"), + _("duplicate iothread id '%1$u' found"), iothrid->iothread_id); return -1; } @@ -15916,7 +15901,7 @@ virDomainVcpuPinDefParseXML(virDomainDef *def, if (vcpu->cpumask) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("duplicate vcpupin for vcpu '%d'"), vcpuid); + _("duplicate vcpupin for vcpu '%1$d'"), vcpuid); return -1; } @@ -15925,7 +15910,7 @@ virDomainVcpuPinDefParseXML(virDomainDef *def, if (virBitmapIsAllClear(vcpu->cpumask)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Invalid value of 'cpuset': %s"), tmp); + _("Invalid value of 'cpuset': %1$s"), tmp); return -1; } @@ -15953,7 +15938,7 @@ virDomainIOThreadPinDefParseXML(xmlNodePtr node, if (!(iothrid = virDomainIOThreadIDFind(def, iothreadid))) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Cannot find 'iothread' : %u"), + _("Cannot find 'iothread' : %1$u"), iothreadid); return -1; } @@ -15969,14 +15954,14 @@ virDomainIOThreadPinDefParseXML(xmlNodePtr node, if (virBitmapIsAllClear(cpumask)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Invalid value of 'cpuset': %s"), + _("Invalid value of 'cpuset': %1$s"), tmp); return -1; } if (iothrid->cpumask) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("duplicate iothreadpin for same iothread '%u'"), + _("duplicate iothreadpin for same iothread '%1$u'"), iothreadid); return -1; } @@ -16007,7 +15992,7 @@ virDomainEmulatorPinDefParseXML(xmlNodePtr node) if (virBitmapIsAllClear(def)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Invalid value of 'cpuset': %s"), tmp); + _("Invalid value of 'cpuset': %1$s"), tmp); return NULL; } @@ -16159,7 +16144,7 @@ virDomainHugepagesParseXML(xmlNodePtr node, if (virBitmapIsAllClear(hugepage->nodemask)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Invalid value of 'nodeset': %s"), nodeset); + _("Invalid value of 'nodeset': %1$s"), nodeset); return -1; } } @@ -16215,7 +16200,7 @@ virDomainFeaturesHyperVDefParse(virDomainDef *def, feature = virDomainHypervTypeFromString((const char *)node->name); if (feature < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unsupported HyperV Enlightenment feature: %s"), + _("unsupported HyperV Enlightenment feature: %1$s"), node->name); return -1; } @@ -16249,7 +16234,7 @@ virDomainFeaturesHyperVDefParse(virDomainDef *def, while (child) { if (STRNEQ((const char *)child->name, "direct")) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unsupported Hyper-V stimer feature: %s"), + _("unsupported Hyper-V stimer feature: %1$s"), child->name); return -1; } @@ -16289,7 +16274,7 @@ virDomainFeaturesHyperVDefParse(virDomainDef *def, if (!STRLIM(def->hyperv_vendor_id, VIR_DOMAIN_HYPERV_VENDOR_ID_MAX)) { virReportError(VIR_ERR_XML_ERROR, - _("HyperV vendor_id value must not be more than %d characters."), + _("HyperV vendor_id value must not be more than %1$d characters."), VIR_DOMAIN_HYPERV_VENDOR_ID_MAX); return -1; } @@ -16329,7 +16314,7 @@ virDomainFeaturesKVMDefParse(virDomainDef *def, feature = virDomainKVMTypeFromString((const char *)node->name); if (feature < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unsupported KVM feature: %s"), + _("unsupported KVM feature: %1$s"), node->name); return -1; } @@ -16383,7 +16368,7 @@ virDomainFeaturesXENDefParse(virDomainDef *def, feature = virDomainXenTypeFromString((const char *)node->name); if (feature < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unsupported Xen feature: %s"), + _("unsupported Xen feature: %1$s"), node->name); return -1; } @@ -16440,7 +16425,7 @@ virDomainFeaturesCapabilitiesDefParse(virDomainDef *def, int val = virDomainProcessCapsFeatureTypeFromString((const char *)node->name); if (val < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unexpected capability feature '%s'"), node->name); + _("unexpected capability feature '%1$s'"), node->name); return -1; } @@ -16498,7 +16483,7 @@ virDomainFeaturesDefParse(virDomainDef *def, int val = virDomainFeatureTypeFromString((const char *)nodes[i]->name); if (val < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unexpected feature '%s'"), nodes[i]->name); + _("unexpected feature '%1$s'"), nodes[i]->name); return -1; } @@ -16772,7 +16757,7 @@ virDomainLoaderDefParseXMLNvram(virDomainLoaderDef *loader, if (format != VIR_STORAGE_FILE_RAW && format != VIR_STORAGE_FILE_QCOW2) { virReportError(VIR_ERR_XML_ERROR, - _("Unsupported nvram format '%s'"), + _("Unsupported nvram format '%1$s'"), virStorageFileFormatTypeToString(format)); return -1; } @@ -16861,7 +16846,7 @@ virDomainLoaderDefParseXMLLoader(virDomainLoaderDef *loader, if (format != VIR_STORAGE_FILE_RAW && format != VIR_STORAGE_FILE_QCOW2) { virReportError(VIR_ERR_XML_ERROR, - _("Unsupported loader format '%s'"), + _("Unsupported loader format '%1$s'"), virStorageFileFormatTypeToString(format)); return -1; } @@ -16891,7 +16876,7 @@ virDomainLoaderDefParseXML(virDomainLoaderDef *loader, if (loader->nvram && loader->format != loader->nvram->format) { virReportError(VIR_ERR_XML_ERROR, - _("Format mismatch: loader.format='%s' nvram.format='%s'"), + _("Format mismatch: loader.format='%1$s' nvram.format='%2$s'"), virStorageFileFormatTypeToString(loader->format), virStorageFileFormatTypeToString(loader->nvram->format)); return -1; @@ -16951,7 +16936,7 @@ virDomainSchedulerParse(xmlNodePtr node, if (!(tmp = virXMLPropString(node, attributeName))) { virReportError(VIR_ERR_XML_ERROR, - _("Missing attribute '%s' in element '%s'"), + _("Missing attribute '%1$s' in element '%2$s'"), attributeName, elementName); return NULL; } @@ -16961,7 +16946,7 @@ virDomainSchedulerParse(xmlNodePtr node, if (virBitmapIsAllClear(ret)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("'%s' scheduler bitmap '%s' is empty"), + _("'%1$s' scheduler bitmap '%2$s' is empty"), attributeName, tmp); return NULL; } @@ -16996,7 +16981,7 @@ virDomainThreadSchedParseHelper(xmlNodePtr node, if (sched->policy != VIR_PROC_POLICY_NONE) { virReportError(VIR_ERR_XML_DETAIL, - _("'%s' attributes '%s' must not overlap"), + _("'%1$s' attributes '%2$s' must not overlap"), elementName, attributeName); return -1; } @@ -17029,7 +17014,7 @@ virDomainDefGetIOThreadSched(virDomainDef *def, if (!(iothrinfo = virDomainIOThreadIDFind(def, iothread))) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Cannot find 'iothread' : %u"), + _("Cannot find 'iothread' : %1$u"), iothread); return NULL; } @@ -17093,7 +17078,7 @@ virDomainVcpuParse(virDomainDef *def, if (virBitmapIsAllClear(def->cpumask)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Invalid value of 'cpuset': %s"), tmp); + _("Invalid value of 'cpuset': %1$s"), tmp); return -1; } @@ -17122,8 +17107,8 @@ virDomainVcpuParse(virDomainDef *def, if (id >= def->maxvcpus) { virReportError(VIR_ERR_XML_ERROR, - _("vcpu id '%u' is out of range of maximum " - "vcpu count"), id); + _("vcpu id '%1$u' is out of range of maximum vcpu count"), + id); return -1; } @@ -17198,7 +17183,7 @@ virDomainDefParseBootInitOptions(virDomainDef *def, if (!nodes[i]->children || !nodes[i]->children->content) { virReportError(VIR_ERR_XML_ERROR, - _("No value supplied for <initenv name='%s'> element"), + _("No value supplied for <initenv name='%1$s'> element"), name); return -1; } @@ -17269,7 +17254,7 @@ virDomainDefParseBootFirmwareOptions(virDomainDef *def, if (fw <= 0) { virReportError(VIR_ERR_XML_ERROR, - _("unknown firmware value %s"), + _("unknown firmware value %1$s"), firmware); return -1; } @@ -17338,7 +17323,7 @@ virDomainDefParseBootAcpiOptions(virDomainDef *def, def->os.slic_table = virFileSanitizePath(tmp); } else { virReportError(VIR_ERR_XML_ERROR, - _("Unknown acpi table type: %s"), + _("Unknown acpi table type: %1$s"), tmp); return -1; } @@ -17415,13 +17400,13 @@ virDomainResctrlParseVcpus(virDomainDef *def, vcpus_str = virXMLPropString(node, "vcpus"); if (!vcpus_str) { - virReportError(VIR_ERR_XML_ERROR, _("Missing %s attribute 'vcpus'"), + virReportError(VIR_ERR_XML_ERROR, _("Missing %1$s attribute 'vcpus'"), node->name); return -1; } if (virBitmapParse(vcpus_str, vcpus, VIR_DOMAIN_CPUMASK_LEN) < 0) { virReportError(VIR_ERR_XML_ERROR, - _("Invalid %s attribute 'vcpus' value '%s'"), + _("Invalid %1$s attribute 'vcpus' value '%2$s'"), node->name, vcpus_str); return -1; } @@ -17612,7 +17597,7 @@ virDomainResctrlMonDefParse(virDomainDef *def, if (level != VIR_DOMAIN_RESCTRL_MONITOR_CACHELEVEL) { virReportError(VIR_ERR_XML_ERROR, - _("Invalid monitor cache level '%d'"), + _("Invalid monitor cache level '%1$d'"), level); goto cleanup; } @@ -17867,7 +17852,7 @@ virDomainDefParseCaps(virDomainDef *def, } if ((def->virtType = virDomainVirtTypeFromString(virttype)) < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("invalid domain type %s"), virttype); + _("invalid domain type %1$s"), virttype); return -1; } @@ -17882,7 +17867,7 @@ virDomainDefParseCaps(virDomainDef *def, } else { if ((def->os.type = virDomainOSTypeFromString(ostype)) < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown OS type '%s'"), ostype); + _("unknown OS type '%1$s'"), ostype); return -1; } } @@ -17899,7 +17884,7 @@ virDomainDefParseCaps(virDomainDef *def, if (arch && !(def->os.arch = virArchFromString(arch))) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Unknown architecture %s"), arch); + _("Unknown architecture %1$s"), arch); return -1; } @@ -17954,7 +17939,7 @@ virDomainDefParseMemory(virDomainDef *def, if (tmp) { if ((def->mem.source = virDomainMemorySourceTypeFromString(tmp)) <= 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown memoryBacking/source/type '%s'"), tmp); + _("unknown memoryBacking/source/type '%1$s'"), tmp); return -1; } VIR_FREE(tmp); @@ -17964,7 +17949,7 @@ virDomainDefParseMemory(virDomainDef *def, if (tmp) { if ((def->mem.access = virDomainMemoryAccessTypeFromString(tmp)) <= 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown memoryBacking/access/mode '%s'"), tmp); + _("unknown memoryBacking/access/mode '%1$s'"), tmp); return -1; } VIR_FREE(tmp); @@ -17974,7 +17959,7 @@ virDomainDefParseMemory(virDomainDef *def, if (tmp) { if ((def->mem.allocation = virDomainMemoryAllocationTypeFromString(tmp)) <= 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown memoryBacking/allocation/mode '%s'"), tmp); + _("unknown memoryBacking/allocation/mode '%1$s'"), tmp); return -1; } VIR_FREE(tmp); @@ -18422,7 +18407,7 @@ virDomainDefClockParse(virDomainDef *def, if ((tmp = virXPathString("string(./clock/@offset)", ctxt)) && (def->clock.offset = virDomainClockOffsetTypeFromString(tmp)) < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown clock offset '%s'"), tmp); + _("unknown clock offset '%1$s'"), tmp); return -1; } VIR_FREE(tmp); @@ -18438,7 +18423,7 @@ virDomainDefClockParse(virDomainDef *def, if (virStrToLong_ll(tmp, NULL, 10, &def->clock.data.variable.adjustment) < 0) { virReportError(VIR_ERR_XML_ERROR, - _("unknown clock adjustment '%s'"), + _("unknown clock adjustment '%1$s'"), tmp); return -1; } @@ -18469,7 +18454,7 @@ virDomainDefClockParse(virDomainDef *def, if (tmp) { if ((def->clock.data.variable.basis = virDomainClockBasisTypeFromString(tmp)) < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown clock basis '%s'"), tmp); + _("unknown clock basis '%1$s'"), tmp); return -1; } VIR_FREE(tmp); @@ -19317,7 +19302,7 @@ virDomainDefParseXML(xmlXPathContextPtr ctxt, if ((mode = virDomainSmbiosModeTypeFromString(tmp)) < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown smbios mode '%s'"), tmp); + _("unknown smbios mode '%1$s'"), tmp); return NULL; } def->os.smbios_mode = mode; @@ -19387,7 +19372,7 @@ virDomainObjParseXML(xmlXPathContextPtr ctxt, if ((tmp = virXMLPropString(ctxt->node, "reason"))) { if ((reason = virDomainStateReasonFromString(state, tmp)) < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("invalid domain state reason '%s'"), tmp); + _("invalid domain state reason '%1$s'"), tmp); return NULL; } } @@ -19531,7 +19516,7 @@ virDomainTimerDefCheckABIStability(virDomainTimerDef *src, { if (src->name != dst->name) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target timer %s does not match source %s"), + _("Target timer %1$s does not match source %2$s"), virDomainTimerNameTypeToString(dst->name), virDomainTimerNameTypeToString(src->name)); return false; @@ -19539,7 +19524,7 @@ virDomainTimerDefCheckABIStability(virDomainTimerDef *src, if (src->present != dst->present) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target timer presence '%s' does not match source '%s'"), + _("Target timer presence '%1$s' does not match source '%2$s'"), virTristateBoolTypeToString(dst->present), virTristateBoolTypeToString(src->present)); return false; @@ -19548,14 +19533,14 @@ virDomainTimerDefCheckABIStability(virDomainTimerDef *src, if (src->name == VIR_DOMAIN_TIMER_NAME_TSC) { if (src->frequency != dst->frequency) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target TSC frequency %llu does not match source %llu"), + _("Target TSC frequency %1$llu does not match source %2$llu"), dst->frequency, src->frequency); return false; } if (src->mode != dst->mode) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target TSC mode %s does not match source %s"), + _("Target TSC mode %1$s does not match source %2$s"), virDomainTimerModeTypeToString(dst->mode), virDomainTimerModeTypeToString(src->mode)); return false; @@ -19572,7 +19557,7 @@ virDomainDeviceInfoCheckABIStability(virDomainDeviceInfo *src, { if (src->type != dst->type) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target device address type %s does not match source %s"), + _("Target device address type %1$s does not match source %2$s"), virDomainDeviceAddressTypeToString(dst->type), virDomainDeviceAddressTypeToString(src->type)); return false; @@ -19585,8 +19570,7 @@ virDomainDeviceInfoCheckABIStability(virDomainDeviceInfo *src, src->addr.pci.slot != dst->addr.pci.slot || src->addr.pci.function != dst->addr.pci.function) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target device PCI address " VIR_PCI_DEVICE_ADDRESS_FMT - "does not match source " VIR_PCI_DEVICE_ADDRESS_FMT), + _("Target device PCI address %1$04x:%2$02x:%3$02x.%4$d does not match source %5$04x:%6$02x:%7$02x.%8$d"), dst->addr.pci.domain, dst->addr.pci.bus, dst->addr.pci.slot, dst->addr.pci.function, src->addr.pci.domain, src->addr.pci.bus, @@ -19600,8 +19584,7 @@ virDomainDeviceInfoCheckABIStability(virDomainDeviceInfo *src, src->addr.drive.bus != dst->addr.drive.bus || src->addr.drive.unit != dst->addr.drive.unit) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target device drive address %d:%d:%d " - "does not match source %d:%d:%d"), + _("Target device drive address %1$d:%2$d:%3$d does not match source %4$d:%5$d:%6$d"), dst->addr.drive.controller, dst->addr.drive.bus, dst->addr.drive.unit, src->addr.drive.controller, src->addr.drive.bus, @@ -19615,8 +19598,7 @@ virDomainDeviceInfoCheckABIStability(virDomainDeviceInfo *src, src->addr.vioserial.bus != dst->addr.vioserial.bus || src->addr.vioserial.port != dst->addr.vioserial.port) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target device virtio serial address %d:%d:%d " - "does not match source %d:%d:%d"), + _("Target device virtio serial address %1$d:%2$d:%3$d does not match source %4$d:%5$d:%6$d"), dst->addr.vioserial.controller, dst->addr.vioserial.bus, dst->addr.vioserial.port, src->addr.vioserial.controller, src->addr.vioserial.bus, @@ -19629,8 +19611,7 @@ virDomainDeviceInfoCheckABIStability(virDomainDeviceInfo *src, if (src->addr.ccid.controller != dst->addr.ccid.controller || src->addr.ccid.slot != dst->addr.ccid.slot) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target device ccid address %d:%d " - "does not match source %d:%d"), + _("Target device ccid address %1$d:%2$d does not match source %3$d:%4$d"), dst->addr.ccid.controller, dst->addr.ccid.slot, src->addr.ccid.controller, @@ -19643,8 +19624,7 @@ virDomainDeviceInfoCheckABIStability(virDomainDeviceInfo *src, if (src->addr.isa.iobase != dst->addr.isa.iobase || src->addr.isa.irq != dst->addr.isa.irq) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target device isa address %d:%d " - "does not match source %d:%d"), + _("Target device isa address %1$d:%2$d does not match source %3$d:%4$d"), dst->addr.isa.iobase, dst->addr.isa.irq, src->addr.isa.iobase, @@ -19656,8 +19636,7 @@ virDomainDeviceInfoCheckABIStability(virDomainDeviceInfo *src, case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DIMM: if (src->addr.dimm.slot != dst->addr.dimm.slot) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target device dimm slot %u does not match " - "source %u"), + _("Target device dimm slot %1$u does not match source %2$u"), dst->addr.dimm.slot, src->addr.dimm.slot); return false; @@ -19665,8 +19644,7 @@ virDomainDeviceInfoCheckABIStability(virDomainDeviceInfo *src, if (src->addr.dimm.base != dst->addr.dimm.base) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target device dimm base address '%llx' does " - "not match source '%llx'"), + _("Target device dimm base address '%1$llx' does not match source '%2$llx'"), dst->addr.dimm.base, src->addr.dimm.base); return false; @@ -19686,7 +19664,7 @@ virDomainDeviceInfoCheckABIStability(virDomainDeviceInfo *src, if (src->acpiIndex != dst->acpiIndex) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target ACPI index '%u' does not match source '%u'"), + _("Target ACPI index '%1$u' does not match source '%2$u'"), dst->acpiIndex, src->acpiIndex); return false; } @@ -19710,32 +19688,28 @@ virDomainVirtioOptionsCheckABIStability(virDomainVirtioOptions *src, if (src->iommu != dst->iommu) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target device iommu option '%s' does not " - "match source '%s'"), + _("Target device iommu option '%1$s' does not match source '%2$s'"), virTristateSwitchTypeToString(dst->iommu), virTristateSwitchTypeToString(src->iommu)); return false; } if (src->ats != dst->ats) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target device ats option '%s' does not " - "match source '%s'"), + _("Target device ats option '%1$s' does not match source '%2$s'"), virTristateSwitchTypeToString(dst->ats), virTristateSwitchTypeToString(src->ats)); return false; } if (src->packed != dst->packed) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target device packed option '%s' does not " - "match source '%s'"), + _("Target device packed option '%1$s' does not match source '%2$s'"), virTristateSwitchTypeToString(dst->packed), virTristateSwitchTypeToString(src->packed)); return false; } if (src->page_per_vq != dst->page_per_vq) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target device page_per_vq option '%s' does not " - "match source '%s'"), + _("Target device page_per_vq option '%1$s' does not match source '%2$s'"), virTristateSwitchTypeToString(dst->page_per_vq), virTristateSwitchTypeToString(src->page_per_vq)); return false; @@ -19750,7 +19724,7 @@ virDomainDiskDefCheckABIStability(virDomainDiskDef *src, { if (src->device != dst->device) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target disk device %s does not match source %s"), + _("Target disk device %1$s does not match source %2$s"), virDomainDiskDeviceTypeToString(dst->device), virDomainDiskDeviceTypeToString(src->device)); return false; @@ -19758,7 +19732,7 @@ virDomainDiskDefCheckABIStability(virDomainDiskDef *src, if (src->bus != dst->bus) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target disk bus %s does not match source %s"), + _("Target disk bus %1$s does not match source %2$s"), virDomainDiskBusTypeToString(dst->bus), virDomainDiskBusTypeToString(src->bus)); return false; @@ -19766,21 +19740,21 @@ virDomainDiskDefCheckABIStability(virDomainDiskDef *src, if (STRNEQ(src->dst, dst->dst)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target disk %s does not match source %s"), + _("Target disk %1$s does not match source %2$s"), dst->dst, src->dst); return false; } if (STRNEQ_NULLABLE(src->serial, dst->serial)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target disk serial %s does not match source %s"), + _("Target disk serial %1$s does not match source %2$s"), NULLSTR(dst->serial), NULLSTR(src->serial)); return false; } if (STRNEQ_NULLABLE(src->wwn, dst->wwn)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target disk wwn '%s' does not match source '%s'"), + _("Target disk wwn '%1$s' does not match source '%2$s'"), NULLSTR(dst->wwn), NULLSTR(src->wwn)); return false; @@ -19794,7 +19768,7 @@ virDomainDiskDefCheckABIStability(virDomainDiskDef *src, if (src->model != dst->model) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target disk model %s does not match source %s"), + _("Target disk model %1$s does not match source %2$s"), virDomainDiskModelTypeToString(dst->model), virDomainDiskModelTypeToString(src->model)); return false; @@ -19802,21 +19776,21 @@ virDomainDiskDefCheckABIStability(virDomainDiskDef *src, if (src->rotation_rate != dst->rotation_rate) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target disk rotation rate %u RPM does not match source %u RPM"), + _("Target disk rotation rate %1$u RPM does not match source %2$u RPM"), dst->rotation_rate, src->rotation_rate); return false; } if (src->queues != dst->queues) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target disk queue count %u does not match source %u"), + _("Target disk queue count %1$u does not match source %2$u"), dst->queues, src->queues); return false; } if (src->queue_size != dst->queue_size) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target disk queue size %u does not match source %u"), + _("Target disk queue size %1$u does not match source %2$u"), dst->queues, src->queues); return false; } @@ -19837,7 +19811,7 @@ virDomainControllerDefCheckABIStability(virDomainControllerDef *src, { if (src->type != dst->type) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target controller type %s does not match source %s"), + _("Target controller type %1$s does not match source %2$s"), virDomainControllerTypeToString(dst->type), virDomainControllerTypeToString(src->type)); return false; @@ -19845,14 +19819,14 @@ virDomainControllerDefCheckABIStability(virDomainControllerDef *src, if (src->idx != dst->idx) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target controller index %d does not match source %d"), + _("Target controller index %1$d does not match source %2$d"), dst->idx, src->idx); return false; } if (src->model != dst->model) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target controller model %d does not match source %d"), + _("Target controller model %1$d does not match source %2$d"), dst->model, src->model); return false; } @@ -19860,21 +19834,21 @@ virDomainControllerDefCheckABIStability(virDomainControllerDef *src, if (src->type == VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL) { if (src->opts.vioserial.ports != dst->opts.vioserial.ports) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target controller ports %d does not match source %d"), + _("Target controller ports %1$d does not match source %2$d"), dst->opts.vioserial.ports, src->opts.vioserial.ports); return false; } if (src->opts.vioserial.vectors != dst->opts.vioserial.vectors) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target controller vectors %d does not match source %d"), + _("Target controller vectors %1$d does not match source %2$d"), dst->opts.vioserial.vectors, src->opts.vioserial.vectors); return false; } } else if (src->type == VIR_DOMAIN_CONTROLLER_TYPE_USB) { if (src->opts.usbopts.ports != dst->opts.usbopts.ports) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target controller ports %d does not match source %d"), + _("Target controller ports %1$d does not match source %2$d"), dst->opts.usbopts.ports, src->opts.usbopts.ports); return false; } @@ -19896,7 +19870,7 @@ virDomainFsDefCheckABIStability(virDomainFSDef *src, { if (STRNEQ_NULLABLE(src->dst, dst->dst)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target filesystem guest target %s does not match source %s"), + _("Target filesystem guest target %1$s does not match source %2$s"), dst->dst, src->dst); return false; } @@ -19946,8 +19920,7 @@ virDomainNetDefCheckABIStability(virDomainNetDef *src, if (virMacAddrCmp(&src->mac, &dst->mac) != 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target network card mac %s" - " does not match source %s"), + _("Target network card mac %1$s does not match source %2$s"), virMacAddrFormat(&dst->mac, dstmac), virMacAddrFormat(&src->mac, srcmac)); return false; @@ -19955,14 +19928,14 @@ virDomainNetDefCheckABIStability(virDomainNetDef *src, if (STRNEQ_NULLABLE(src->modelstr, dst->modelstr)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target network card model %s does not match source %s"), + _("Target network card model %1$s does not match source %2$s"), NULLSTR(dst->modelstr), NULLSTR(src->modelstr)); return false; } if (src->model != dst->model) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target network card model %s does not match source %s"), + _("Target network card model %1$s does not match source %2$s"), virDomainNetModelTypeToString(dst->model), virDomainNetModelTypeToString(src->model)); return false; @@ -19970,7 +19943,7 @@ virDomainNetDefCheckABIStability(virDomainNetDef *src, if (src->mtu != dst->mtu) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target network card MTU %d does not match source %d"), + _("Target network card MTU %1$d does not match source %2$d"), dst->mtu, src->mtu); return false; } @@ -19991,7 +19964,7 @@ virDomainInputDefCheckABIStability(virDomainInputDef *src, { if (src->type != dst->type) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target input device type %s does not match source %s"), + _("Target input device type %1$s does not match source %2$s"), virDomainInputTypeToString(dst->type), virDomainInputTypeToString(src->type)); return false; @@ -19999,7 +19972,7 @@ virDomainInputDefCheckABIStability(virDomainInputDef *src, if (src->bus != dst->bus) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target input device bus %s does not match source %s"), + _("Target input device bus %1$s does not match source %2$s"), virDomainInputBusTypeToString(dst->bus), virDomainInputBusTypeToString(src->bus)); return false; @@ -20007,7 +19980,7 @@ virDomainInputDefCheckABIStability(virDomainInputDef *src, if (src->model != dst->model) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target input model %s does not match source %s"), + _("Target input model %1$s does not match source %2$s"), virDomainInputBusTypeToString(dst->model), virDomainInputBusTypeToString(src->model)); return false; @@ -20029,7 +20002,7 @@ virDomainSoundDefCheckABIStability(virDomainSoundDef *src, { if (src->model != dst->model) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target sound card model %s does not match source %s"), + _("Target sound card model %1$s does not match source %2$s"), virDomainSoundModelTypeToString(dst->model), virDomainSoundModelTypeToString(src->model)); return false; @@ -20048,7 +20021,7 @@ virDomainVideoDefCheckABIStability(virDomainVideoDef *src, { if (src->type != dst->type) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target video card model %s does not match source %s"), + _("Target video card model %1$s does not match source %2$s"), virDomainVideoTypeToString(dst->type), virDomainVideoTypeToString(src->type)); return false; @@ -20056,35 +20029,35 @@ virDomainVideoDefCheckABIStability(virDomainVideoDef *src, if (src->ram != dst->ram) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target video card ram %u does not match source %u"), + _("Target video card ram %1$u does not match source %2$u"), dst->ram, src->ram); return false; } if (src->vram != dst->vram) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target video card vram %u does not match source %u"), + _("Target video card vram %1$u does not match source %2$u"), dst->vram, src->vram); return false; } if (src->vram64 != dst->vram64) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target video card vram64 %u does not match source %u"), + _("Target video card vram64 %1$u does not match source %2$u"), dst->vram64, src->vram64); return false; } if (src->vgamem != dst->vgamem) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target video card vgamem %u does not match source %u"), + _("Target video card vgamem %1$u does not match source %2$u"), dst->vgamem, src->vgamem); return false; } if (src->heads != dst->heads) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target video card heads %u does not match source %u"), + _("Target video card heads %1$u does not match source %2$u"), dst->heads, src->heads); return false; } @@ -20099,14 +20072,14 @@ virDomainVideoDefCheckABIStability(virDomainVideoDef *src, if (src->accel) { if (src->accel->accel2d != dst->accel->accel2d) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target video card 2d accel %u does not match source %u"), + _("Target video card 2d accel %1$u does not match source %2$u"), dst->accel->accel2d, src->accel->accel2d); return false; } if (src->accel->accel3d != dst->accel->accel3d) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target video card 3d accel %u does not match source %u"), + _("Target video card 3d accel %1$u does not match source %2$u"), dst->accel->accel3d, src->accel->accel3d); return false; } @@ -20128,7 +20101,7 @@ virDomainHostdevDefCheckABIStability(virDomainHostdevDef *src, { if (src->mode != dst->mode) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target host device mode %s does not match source %s"), + _("Target host device mode %1$s does not match source %2$s"), virDomainHostdevModeTypeToString(dst->mode), virDomainHostdevModeTypeToString(src->mode)); return false; @@ -20137,7 +20110,7 @@ virDomainHostdevDefCheckABIStability(virDomainHostdevDef *src, if (src->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS && src->source.subsys.type != dst->source.subsys.type) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target host device subsystem %s does not match source %s"), + _("Target host device subsystem %1$s does not match source %2$s"), virDomainHostdevSubsysTypeToString(dst->source.subsys.type), virDomainHostdevSubsysTypeToString(src->source.subsys.type)); return false; @@ -20167,7 +20140,7 @@ virDomainSerialDefCheckABIStability(virDomainChrDef *src, { if (src->targetType != dst->targetType) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target serial type %s does not match source %s"), + _("Target serial type %1$s does not match source %2$s"), virDomainChrSerialTargetTypeToString(dst->targetType), virDomainChrSerialTargetTypeToString(src->targetType)); return false; @@ -20175,7 +20148,7 @@ virDomainSerialDefCheckABIStability(virDomainChrDef *src, if (src->targetModel != dst->targetModel) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target serial model %s does not match source %s"), + _("Target serial model %1$s does not match source %2$s"), virDomainChrSerialTargetModelTypeToString(dst->targetModel), virDomainChrSerialTargetModelTypeToString(src->targetModel)); return false; @@ -20183,7 +20156,7 @@ virDomainSerialDefCheckABIStability(virDomainChrDef *src, if (src->target.port != dst->target.port) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target serial port %d does not match source %d"), + _("Target serial port %1$d does not match source %2$d"), dst->target.port, src->target.port); return false; } @@ -20201,7 +20174,7 @@ virDomainParallelDefCheckABIStability(virDomainChrDef *src, { if (src->target.port != dst->target.port) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target parallel port %d does not match source %d"), + _("Target parallel port %1$d does not match source %2$d"), dst->target.port, src->target.port); return false; } @@ -20219,7 +20192,7 @@ virDomainChannelDefCheckABIStability(virDomainChrDef *src, { if (src->targetType != dst->targetType) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target channel type %s does not match source %s"), + _("Target channel type %1$s does not match source %2$s"), virDomainChrChannelTargetTypeToString(dst->targetType), virDomainChrChannelTargetTypeToString(src->targetType)); return false; @@ -20231,7 +20204,7 @@ virDomainChannelDefCheckABIStability(virDomainChrDef *src, case VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_VIRTIO: if (STRNEQ_NULLABLE(src->target.name, dst->target.name)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target channel name %s does not match source %s"), + _("Target channel name %1$s does not match source %2$s"), NULLSTR(dst->target.name), NULLSTR(src->target.name)); return false; } @@ -20251,7 +20224,7 @@ virDomainChannelDefCheckABIStability(virDomainChrDef *src, g_autofree char *saddr = virSocketAddrFormatFull(src->target.addr, true, ":"); g_autofree char *daddr = virSocketAddrFormatFull(dst->target.addr, true, ":"); virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target channel addr %s does not match source %s"), + _("Target channel addr %1$s does not match source %2$s"), NULLSTR(daddr), NULLSTR(saddr)); return false; } @@ -20271,7 +20244,7 @@ virDomainConsoleDefCheckABIStability(virDomainChrDef *src, { if (src->targetType != dst->targetType) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target console type %s does not match source %s"), + _("Target console type %1$s does not match source %2$s"), virDomainChrConsoleTargetTypeToString(dst->targetType), virDomainChrConsoleTargetTypeToString(src->targetType)); return false; @@ -20290,7 +20263,7 @@ virDomainWatchdogDefCheckABIStability(virDomainWatchdogDef *src, { if (src->model != dst->model) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target watchdog model %s does not match source %s"), + _("Target watchdog model %1$s does not match source %2$s"), virDomainWatchdogModelTypeToString(dst->model), virDomainWatchdogModelTypeToString(src->model)); return false; @@ -20309,7 +20282,7 @@ virDomainMemballoonDefCheckABIStability(virDomainMemballoonDef *src, { if (src->model != dst->model) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target balloon model %s does not match source %s"), + _("Target balloon model %1$s does not match source %2$s"), virDomainMemballoonModelTypeToString(dst->model), virDomainMemballoonModelTypeToString(src->model)); return false; @@ -20317,8 +20290,7 @@ virDomainMemballoonDefCheckABIStability(virDomainMemballoonDef *src, if (src->autodeflate != dst->autodeflate) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target balloon autodeflate attribute value " - "'%s' does not match source '%s'"), + _("Target balloon autodeflate attribute value '%1$s' does not match source '%2$s'"), virTristateSwitchTypeToString(dst->autodeflate), virTristateSwitchTypeToString(src->autodeflate)); return false; @@ -20326,8 +20298,7 @@ virDomainMemballoonDefCheckABIStability(virDomainMemballoonDef *src, if (src->free_page_reporting != dst->free_page_reporting) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target balloon freePageReporting attribute value " - "'%s' does not match source '%s'"), + _("Target balloon freePageReporting attribute value '%1$s' does not match source '%2$s'"), virTristateSwitchTypeToString(dst->free_page_reporting), virTristateSwitchTypeToString(src->free_page_reporting)); return false; @@ -20349,7 +20320,7 @@ virDomainRNGDefCheckABIStability(virDomainRNGDef *src, { if (src->model != dst->model) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target RNG model '%s' does not match source '%s'"), + _("Target RNG model '%1$s' does not match source '%2$s'"), virDomainRNGModelTypeToString(dst->model), virDomainRNGModelTypeToString(src->model)); return false; @@ -20371,7 +20342,7 @@ virDomainHubDefCheckABIStability(virDomainHubDef *src, { if (src->type != dst->type) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target hub device type %s does not match source %s"), + _("Target hub device type %1$s does not match source %2$s"), virDomainHubTypeToString(dst->type), virDomainHubTypeToString(src->type)); return false; @@ -20390,8 +20361,7 @@ virDomainRedirdevDefCheckABIStability(virDomainRedirdevDef *src, { if (src->bus != dst->bus) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target redirected device bus %s does not match " - "source %s"), + _("Target redirected device bus %1$s does not match source %2$s"), virDomainRedirdevBusTypeToString(dst->bus), virDomainRedirdevBusTypeToString(src->bus)); return false; @@ -20401,8 +20371,7 @@ virDomainRedirdevDefCheckABIStability(virDomainRedirdevDef *src, case VIR_DOMAIN_REDIRDEV_BUS_USB: if (src->source->type != dst->source->type) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target redirected device source type %s does " - "not match source device source type %s"), + _("Target redirected device source type %1$s does not match source device source type %2$s"), virDomainChrTypeToString(dst->source->type), virDomainChrTypeToString(src->source->type)); return false; @@ -20427,8 +20396,7 @@ virDomainRedirFilterDefCheckABIStability(virDomainRedirFilterDef *src, if (src->nusbdevs != dst->nusbdevs) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target USB redirection filter rule " - "count %zu does not match source %zu"), + _("Target USB redirection filter rule count %1$zu does not match source %2$zu"), dst->nusbdevs, src->nusbdevs); return false; } @@ -20462,7 +20430,7 @@ virDomainRedirFilterDefCheckABIStability(virDomainRedirFilterDef *src, if (srcUSBDev->allow != dstUSBDev->allow) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target USB allow '%s' does not match source '%s'"), + _("Target USB allow '%1$s' does not match source '%2$s'"), dstUSBDev->allow ? "yes" : "no", srcUSBDev->allow ? "yes" : "no"); return false; @@ -20501,8 +20469,7 @@ virDomainDefFeaturesCheckABIStability(virDomainDef *src, case VIR_DOMAIN_FEATURE_CCF_ASSIST: if (src->features[i] != dst->features[i]) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("State of feature '%s' differs: " - "source: '%s', destination: '%s'"), + _("State of feature '%1$s' differs: source: '%2$s', destination: '%3$s'"), featureName, virTristateSwitchTypeToString(src->features[i]), virTristateSwitchTypeToString(dst->features[i])); @@ -20513,8 +20480,7 @@ virDomainDefFeaturesCheckABIStability(virDomainDef *src, case VIR_DOMAIN_FEATURE_CAPABILITIES: if (src->features[i] != dst->features[i]) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("State of feature '%s' differs: " - "source: '%s=%s', destination: '%s=%s'"), + _("State of feature '%1$s' differs: source: '%2$s=%3$s', destination: '%4$s=%5$s'"), featureName, "policy", virDomainCapabilitiesPolicyTypeToString(src->features[i]), @@ -20528,8 +20494,7 @@ virDomainDefFeaturesCheckABIStability(virDomainDef *src, if (src->features[i] != dst->features[i] || src->gic_version != dst->gic_version) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("State of feature '%s' differs: " - "source: '%s,%s=%s', destination: '%s,%s=%s'"), + _("State of feature '%1$s' differs: source: '%2$s,%3$s=%4$s', destination: '%5$s,%6$s=%7$s'"), featureName, virTristateSwitchTypeToString(src->features[i]), "version", virGICVersionTypeToString(src->gic_version), @@ -20544,8 +20509,7 @@ virDomainDefFeaturesCheckABIStability(virDomainDef *src, src->hpt_resizing != dst->hpt_resizing || src->hpt_maxpagesize != dst->hpt_maxpagesize) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("State of feature '%s' differs: " - "source: '%s,%s=%s,%s=%llu', destination: '%s,%s=%s,%s=%llu'"), + _("State of feature '%1$s' differs: source: '%2$s,%3$s=%4$s,%5$s=%6$llu', destination: '%7$s,%8$s=%9$s,%10$s=%11$llu'"), featureName, virTristateSwitchTypeToString(src->features[i]), "resizing", virDomainHPTResizingTypeToString(src->hpt_resizing), @@ -20561,8 +20525,7 @@ virDomainDefFeaturesCheckABIStability(virDomainDef *src, if (src->features[i] != dst->features[i] || src->apic_eoi != dst->apic_eoi) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("State of feature '%s' differs: " - "source: '%s,%s=%s', destination: '%s,%s=%s'"), + _("State of feature '%1$s' differs: source: '%2$s,%3$s=%4$s', destination: '%5$s,%6$s=%7$s'"), featureName, virTristateSwitchTypeToString(src->features[i]), "eoi", virTristateSwitchTypeToString(src->apic_eoi), @@ -20575,8 +20538,7 @@ virDomainDefFeaturesCheckABIStability(virDomainDef *src, case VIR_DOMAIN_FEATURE_IOAPIC: if (src->features[i] != dst->features[i]) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("State of feature '%s' differs: " - "source: '%s=%s', destination: '%s=%s'"), + _("State of feature '%1$s' differs: source: '%2$s=%3$s', destination: '%4$s=%5$s'"), featureName, "driver", virDomainIOAPICTypeToString(src->features[i]), "driver", virDomainIOAPICTypeToString(dst->features[i])); @@ -20587,8 +20549,7 @@ virDomainDefFeaturesCheckABIStability(virDomainDef *src, case VIR_DOMAIN_FEATURE_CFPC: if (src->features[i] != dst->features[i]) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("State of feature '%s' differs: " - "source: '%s=%s', destination: '%s=%s'"), + _("State of feature '%1$s' differs: source: '%2$s=%3$s', destination: '%4$s=%5$s'"), featureName, "value", virDomainCFPCTypeToString(src->features[i]), "value", virDomainCFPCTypeToString(dst->features[i])); @@ -20599,8 +20560,7 @@ virDomainDefFeaturesCheckABIStability(virDomainDef *src, case VIR_DOMAIN_FEATURE_SBBC: if (src->features[i] != dst->features[i]) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("State of feature '%s' differs: " - "source: '%s=%s', destination: '%s=%s'"), + _("State of feature '%1$s' differs: source: '%2$s=%3$s', destination: '%4$s=%5$s'"), featureName, "value", virDomainSBBCTypeToString(src->features[i]), "value", virDomainSBBCTypeToString(dst->features[i])); @@ -20611,8 +20571,7 @@ virDomainDefFeaturesCheckABIStability(virDomainDef *src, case VIR_DOMAIN_FEATURE_IBS: if (src->features[i] != dst->features[i]) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("State of feature '%s' differs: " - "source: '%s=%s', destination: '%s=%s'"), + _("State of feature '%1$s' differs: source: '%2$s=%3$s', destination: '%4$s=%5$s'"), featureName, "value", virDomainIBSTypeToString(src->features[i]), "value", virDomainIBSTypeToString(dst->features[i])); @@ -20646,9 +20605,7 @@ virDomainDefFeaturesCheckABIStability(virDomainDef *src, case VIR_DOMAIN_HYPERV_AVIC: if (src->hyperv_features[i] != dst->hyperv_features[i]) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("State of HyperV enlightenment " - "feature '%s' differs: " - "source: '%s', destination: '%s'"), + _("State of HyperV enlightenment feature '%1$s' differs: source: '%2$s', destination: '%3$s'"), virDomainHypervTypeToString(i), virTristateSwitchTypeToString(src->hyperv_features[i]), virTristateSwitchTypeToString(dst->hyperv_features[i])); @@ -20661,8 +20618,7 @@ virDomainDefFeaturesCheckABIStability(virDomainDef *src, /* spinlock count matters! */ if (src->hyperv_spinlocks != dst->hyperv_spinlocks) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("HyperV spinlock retry count differs: " - "source: '%u', destination: '%u'"), + _("HyperV spinlock retry count differs: source: '%1$u', destination: '%2$u'"), src->hyperv_spinlocks, dst->hyperv_spinlocks); return false; @@ -20672,8 +20628,7 @@ virDomainDefFeaturesCheckABIStability(virDomainDef *src, case VIR_DOMAIN_HYPERV_VENDOR_ID: if (STRNEQ_NULLABLE(src->hyperv_vendor_id, dst->hyperv_vendor_id)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("HyperV vendor_id differs: " - "source: '%s', destination: '%s'"), + _("HyperV vendor_id differs: source: '%1$s', destination: '%2$s'"), src->hyperv_vendor_id, dst->hyperv_vendor_id); return false; @@ -20689,8 +20644,7 @@ virDomainDefFeaturesCheckABIStability(virDomainDef *src, if (src->hyperv_features[VIR_DOMAIN_HYPERV_STIMER] == VIR_TRISTATE_SWITCH_ON) { if (src->hyperv_stimer_direct != dst->hyperv_stimer_direct) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("State of HyperV stimer direct feature differs: " - "source: '%s', destination: '%s'"), + _("State of HyperV stimer direct feature differs: source: '%1$s', destination: '%2$s'"), virTristateSwitchTypeToString(src->hyperv_stimer_direct), virTristateSwitchTypeToString(dst->hyperv_stimer_direct)); return false; @@ -20702,8 +20656,7 @@ virDomainDefFeaturesCheckABIStability(virDomainDef *src, for (i = 0; i < VIR_DOMAIN_XEN_LAST; i++) { if (src->xen_features[i] != dst->xen_features[i]) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("State of Xen feature '%s' differs: " - "source: '%s', destination: '%s'"), + _("State of Xen feature '%1$s' differs: source: '%2$s', destination: '%3$s'"), virDomainXenTypeToString(i), virTristateSwitchTypeToString(src->xen_features[i]), virTristateSwitchTypeToString(dst->xen_features[i])); @@ -20716,8 +20669,7 @@ virDomainDefFeaturesCheckABIStability(virDomainDef *src, case VIR_DOMAIN_XEN_PASSTHROUGH: if (src->xen_passthrough_mode != dst->xen_passthrough_mode) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("'mode' of Xen passthrough feature differs: " - "source: '%s', destination: '%s'"), + _("'mode' of Xen passthrough feature differs: source: '%1$s', destination: '%2$s'"), virDomainXenPassthroughModeTypeToString(src->xen_passthrough_mode), virDomainXenPassthroughModeTypeToString(dst->xen_passthrough_mode)); return false; @@ -20741,8 +20693,7 @@ virDomainDefFeaturesCheckABIStability(virDomainDef *src, case VIR_DOMAIN_KVM_DIRTY_RING: if (src->kvm_features->features[i] != dst->kvm_features->features[i]) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("State of KVM feature '%s' differs: " - "source: '%s', destination: '%s'"), + _("State of KVM feature '%1$s' differs: source: '%2$s', destination: '%3$s'"), virDomainKVMTypeToString(i), virTristateSwitchTypeToString(src->kvm_features->features[i]), virTristateSwitchTypeToString(dst->kvm_features->features[i])); @@ -20758,8 +20709,7 @@ virDomainDefFeaturesCheckABIStability(virDomainDef *src, if (src->kvm_features->dirty_ring_size != dst->kvm_features->dirty_ring_size) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("dirty ring size of KVM feature '%s' differs: " - "source: '%d', destination: '%d'"), + _("dirty ring size of KVM feature '%1$s' differs: source: '%2$d', destination: '%3$d'"), virDomainKVMTypeToString(i), src->kvm_features->dirty_ring_size, dst->kvm_features->dirty_ring_size); @@ -20771,7 +20721,7 @@ virDomainDefFeaturesCheckABIStability(virDomainDef *src, if (src->features[VIR_DOMAIN_FEATURE_SMM] == VIR_TRISTATE_SWITCH_ON) { if (src->tseg_specified != dst->tseg_specified) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("SMM TSEG differs: source: %s, destination: '%s'"), + _("SMM TSEG differs: source: %1$s, destination: '%2$s'"), src->tseg_specified ? _("specified") : _("not specified"), dst->tseg_specified ? _("specified") : _("not specified")); return false; @@ -20786,8 +20736,7 @@ virDomainDefFeaturesCheckABIStability(virDomainDef *src, &unit_dst); virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Size of SMM TSEG size differs: " - "source: '%llu %s', destination: '%llu %s'"), + _("Size of SMM TSEG size differs: source: '%1$llu %2$s', destination: '%3$llu %4$s'"), short_size_src, unit_src, short_size_dst, unit_dst); return false; @@ -20803,7 +20752,7 @@ virDomainPanicDefCheckABIStability(virDomainPanicDef *src, { if (src->model != dst->model) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target panic model '%s' does not match source '%s'"), + _("Target panic model '%1$s' does not match source '%2$s'"), virDomainPanicModelTypeToString(dst->model), virDomainPanicModelTypeToString(src->model)); return false; @@ -20819,8 +20768,7 @@ virDomainShmemDefCheckABIStability(virDomainShmemDef *src, { if (src->role != dst->role) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target shared memory role '%s' does not match " - "source role '%s'"), + _("Target shared memory role '%1$s' does not match source role '%2$s'"), virDomainShmemRoleTypeToString(dst->role), virDomainShmemRoleTypeToString(src->role)); return false; @@ -20828,8 +20776,7 @@ virDomainShmemDefCheckABIStability(virDomainShmemDef *src, if (src->model != dst->model) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target shared memory model '%s' does not match " - "source model '%s'"), + _("Target shared memory model '%1$s' does not match source model '%2$s'"), virDomainShmemModelTypeToString(dst->model), virDomainShmemModelTypeToString(src->model)); return false; @@ -20837,8 +20784,8 @@ virDomainShmemDefCheckABIStability(virDomainShmemDef *src, if (src->size != dst->size) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target shared memory size '%llu' does not match " - "source size '%llu'"), dst->size, src->size); + _("Target shared memory size '%1$llu' does not match source size '%2$llu'"), + dst->size, src->size); return false; } @@ -20911,8 +20858,7 @@ virDomainMemtuneCheckABIStability(const virDomainDef *src, { if (virDomainDefGetMemoryInitial(src) != virDomainDefGetMemoryInitial(dst)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target domain max memory %lld " - "does not match source %lld"), + _("Target domain max memory %1$lld does not match source %2$lld"), virDomainDefGetMemoryInitial(dst), virDomainDefGetMemoryInitial(src)); return false; @@ -20921,8 +20867,7 @@ virDomainMemtuneCheckABIStability(const virDomainDef *src, if (!(flags & VIR_DOMAIN_DEF_ABI_CHECK_SKIP_VOLATILE) && src->mem.cur_balloon != dst->mem.cur_balloon) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target domain current memory %lld " - "does not match source %lld"), + _("Target domain current memory %1$lld does not match source %2$lld"), dst->mem.cur_balloon, src->mem.cur_balloon); return false; @@ -20930,8 +20875,7 @@ virDomainMemtuneCheckABIStability(const virDomainDef *src, if (src->mem.max_memory != dst->mem.max_memory) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target maximum memory size '%llu' " - "doesn't match source '%llu'"), + _("Target maximum memory size '%1$llu' doesn't match source '%2$llu'"), dst->mem.max_memory, src->mem.max_memory); return false; @@ -20939,8 +20883,7 @@ virDomainMemtuneCheckABIStability(const virDomainDef *src, if (src->mem.memory_slots != dst->mem.memory_slots) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target domain memory slots " - "count '%u' doesn't match source '%u'"), + _("Target domain memory slots count '%1$u' doesn't match source '%2$u'"), dst->mem.memory_slots, src->mem.memory_slots); return false; @@ -20956,8 +20899,7 @@ virDomainMemoryDefCheckABIStability(virDomainMemoryDef *src, { if (src->model != dst->model) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target memory device model '%s' " - "doesn't match source model '%s'"), + _("Target memory device model '%1$s' doesn't match source model '%2$s'"), virDomainMemoryModelTypeToString(dst->model), virDomainMemoryModelTypeToString(src->model)); return false; @@ -20965,32 +20907,28 @@ virDomainMemoryDefCheckABIStability(virDomainMemoryDef *src, if (src->targetNode != dst->targetNode) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target memory device targetNode '%d' " - "doesn't match source targetNode '%d'"), + _("Target memory device targetNode '%1$d' doesn't match source targetNode '%2$d'"), dst->targetNode, src->targetNode); return false; } if (src->size != dst->size) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target memory device size '%llu' doesn't match " - "source memory device size '%llu'"), + _("Target memory device size '%1$llu' doesn't match source memory device size '%2$llu'"), dst->size, src->size); return false; } if (src->blocksize != dst->blocksize) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target memory device block size '%llu' doesn't match " - "source memory device block size '%llu'"), + _("Target memory device block size '%1$llu' doesn't match source memory device block size '%2$llu'"), dst->blocksize, src->blocksize); return false; } if (src->requestedsize != dst->requestedsize) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target memory device requested size '%llu' doesn't match " - "source memory device requested size '%llu'"), + _("Target memory device requested size '%1$llu' doesn't match source memory device requested size '%2$llu'"), dst->requestedsize, src->requestedsize); return false; } @@ -20998,16 +20936,14 @@ virDomainMemoryDefCheckABIStability(virDomainMemoryDef *src, if (src->model == VIR_DOMAIN_MEMORY_MODEL_NVDIMM) { if (src->labelsize != dst->labelsize) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target NVDIMM label size '%llu' doesn't match " - "source NVDIMM label size '%llu'"), + _("Target NVDIMM label size '%1$llu' doesn't match source NVDIMM label size '%2$llu'"), src->labelsize, dst->labelsize); return false; } if (src->alignsize != dst->alignsize) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target NVDIMM alignment '%llu' doesn't match " - "source NVDIMM alignment '%llu'"), + _("Target NVDIMM alignment '%1$llu' doesn't match source NVDIMM alignment '%2$llu'"), src->alignsize, dst->alignsize); return false; } @@ -21045,48 +20981,42 @@ virDomainIOMMUDefCheckABIStability(virDomainIOMMUDef *src, { if (src->model != dst->model) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target domain IOMMU device model '%s' " - "does not match source '%s'"), + _("Target domain IOMMU device model '%1$s' does not match source '%2$s'"), virDomainIOMMUModelTypeToString(dst->model), virDomainIOMMUModelTypeToString(src->model)); return false; } if (src->intremap != dst->intremap) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target domain IOMMU device intremap value '%s' " - "does not match source '%s'"), + _("Target domain IOMMU device intremap value '%1$s' does not match source '%2$s'"), virTristateSwitchTypeToString(dst->intremap), virTristateSwitchTypeToString(src->intremap)); return false; } if (src->caching_mode != dst->caching_mode) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target domain IOMMU device caching mode '%s' " - "does not match source '%s'"), + _("Target domain IOMMU device caching mode '%1$s' does not match source '%2$s'"), virTristateSwitchTypeToString(dst->caching_mode), virTristateSwitchTypeToString(src->caching_mode)); return false; } if (src->eim != dst->eim) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target domain IOMMU device eim value '%s' " - "does not match source '%s'"), + _("Target domain IOMMU device eim value '%1$s' does not match source '%2$s'"), virTristateSwitchTypeToString(dst->eim), virTristateSwitchTypeToString(src->eim)); return false; } if (src->iotlb != dst->iotlb) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target domain IOMMU device iotlb value '%s' " - "does not match source '%s'"), + _("Target domain IOMMU device iotlb value '%1$s' does not match source '%2$s'"), virTristateSwitchTypeToString(dst->iotlb), virTristateSwitchTypeToString(src->iotlb)); return false; } if (src->aw_bits != dst->aw_bits) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target domain IOMMU device aw_bits value '%d' " - "does not match source '%d'"), + _("Target domain IOMMU device aw_bits value '%1$d' does not match source '%2$d'"), dst->aw_bits, src->aw_bits); return false; } @@ -21101,8 +21031,7 @@ virDomainVsockDefCheckABIStability(virDomainVsockDef *src, { if (src->model != dst->model) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target domain vsock device model '%s' " - "does not match source '%s'"), + _("Target domain vsock device model '%1$s' does not match source '%2$s'"), virDomainVsockModelTypeToString(dst->model), virDomainVsockModelTypeToString(src->model)); return false; @@ -21126,7 +21055,7 @@ virDomainDefVcpuCheckAbiStability(virDomainDef *src, if (src->maxvcpus != dst->maxvcpus) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target domain vCPU max %zu does not match source %zu"), + _("Target domain vCPU max %1$zu does not match source %2$zu"), dst->maxvcpus, src->maxvcpus); return false; } @@ -21137,15 +21066,15 @@ virDomainDefVcpuCheckAbiStability(virDomainDef *src, if (svcpu->online != dvcpu->online) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("State of vCPU '%zu' differs between source and " - "destination definitions"), i); + _("State of vCPU '%1$zu' differs between source and destination definitions"), + i); return false; } if (svcpu->order != dvcpu->order) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("vcpu enable order of vCPU '%zu' differs between " - "source and destination definitions"), i); + _("vcpu enable order of vCPU '%1$zu' differs between source and destination definitions"), + i); return false; } } @@ -21171,7 +21100,7 @@ virDomainDefCheckABIStabilityFlags(virDomainDef *src, if (src->virtType != dst->virtType) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target domain virt type %s does not match source %s"), + _("Target domain virt type %1$s does not match source %2$s"), virDomainVirtTypeToString(dst->virtType), virDomainVirtTypeToString(src->virtType)); goto error; @@ -21183,7 +21112,7 @@ virDomainDefCheckABIStabilityFlags(virDomainDef *src, virUUIDFormat(src->uuid, uuidsrc); virUUIDFormat(dst->uuid, uuiddst); virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target domain uuid %s does not match source %s"), + _("Target domain uuid %1$s does not match source %2$s"), uuiddst, uuidsrc); goto error; } @@ -21202,7 +21131,7 @@ virDomainDefCheckABIStabilityFlags(virDomainDef *src, virUUIDFormat(src->genid, guidsrc); virUUIDFormat(dst->genid, guiddst); virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target domain genid %s does not match source %s"), + _("Target domain genid %1$s does not match source %2$s"), guiddst, guidsrc); goto error; } @@ -21213,7 +21142,7 @@ virDomainDefCheckABIStabilityFlags(virDomainDef *src, */ if (STRNEQ_NULLABLE(src->name, dst->name)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target domain name '%s' does not match source '%s'"), + _("Target domain name '%1$s' does not match source '%2$s'"), dst->name, src->name); goto error; } @@ -21229,28 +21158,28 @@ virDomainDefCheckABIStabilityFlags(virDomainDef *src, if (src->os.type != dst->os.type) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target domain OS type %s does not match source %s"), + _("Target domain OS type %1$s does not match source %2$s"), virDomainOSTypeToString(dst->os.type), virDomainOSTypeToString(src->os.type)); goto error; } if (src->os.arch != dst->os.arch) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target domain architecture %s does not match source %s"), + _("Target domain architecture %1$s does not match source %2$s"), virArchToString(dst->os.arch), virArchToString(src->os.arch)); goto error; } if (STRNEQ_NULLABLE(src->os.machine, dst->os.machine)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target domain machine type %s does not match source %s"), + _("Target domain machine type %1$s does not match source %2$s"), dst->os.machine, src->os.machine); goto error; } if (src->os.smbios_mode != dst->os.smbios_mode) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target domain SMBIOS mode %s does not match source %s"), + _("Target domain SMBIOS mode %1$s does not match source %2$s"), virDomainSmbiosModeTypeToString(dst->os.smbios_mode), virDomainSmbiosModeTypeToString(src->os.smbios_mode)); goto error; @@ -21287,7 +21216,7 @@ virDomainDefCheckABIStabilityFlags(virDomainDef *src, if (src->ndisks != dst->ndisks) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target domain disk count %zu does not match source %zu"), + _("Target domain disk count %1$zu does not match source %2$zu"), dst->ndisks, src->ndisks); goto error; } @@ -21298,8 +21227,7 @@ virDomainDefCheckABIStabilityFlags(virDomainDef *src, if (src->ncontrollers != dst->ncontrollers) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target domain controller count %zu " - "does not match source %zu"), + _("Target domain controller count %1$zu does not match source %2$zu"), dst->ncontrollers, src->ncontrollers); goto error; } @@ -21311,8 +21239,7 @@ virDomainDefCheckABIStabilityFlags(virDomainDef *src, if (src->nfss != dst->nfss) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target domain filesystem count %zu " - "does not match source %zu"), + _("Target domain filesystem count %1$zu does not match source %2$zu"), dst->nfss, src->nfss); goto error; } @@ -21323,8 +21250,7 @@ virDomainDefCheckABIStabilityFlags(virDomainDef *src, if (src->nnets != dst->nnets) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target domain net card count %zu " - "does not match source %zu"), + _("Target domain net card count %1$zu does not match source %2$zu"), dst->nnets, src->nnets); goto error; } @@ -21335,8 +21261,7 @@ virDomainDefCheckABIStabilityFlags(virDomainDef *src, if (src->ninputs != dst->ninputs) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target domain input device count %zu " - "does not match source %zu"), + _("Target domain input device count %1$zu does not match source %2$zu"), dst->ninputs, src->ninputs); goto error; } @@ -21347,8 +21272,7 @@ virDomainDefCheckABIStabilityFlags(virDomainDef *src, if (src->nsounds != dst->nsounds) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target domain sound card count %zu " - "does not match source %zu"), + _("Target domain sound card count %1$zu does not match source %2$zu"), dst->nsounds, src->nsounds); goto error; } @@ -21359,8 +21283,7 @@ virDomainDefCheckABIStabilityFlags(virDomainDef *src, if (src->nvideos != dst->nvideos) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target domain video card count %zu " - "does not match source %zu"), + _("Target domain video card count %1$zu does not match source %2$zu"), dst->nvideos, src->nvideos); goto error; } @@ -21371,8 +21294,7 @@ virDomainDefCheckABIStabilityFlags(virDomainDef *src, if (src->nhostdevs != dst->nhostdevs) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target domain host device count %zu " - "does not match source %zu"), + _("Target domain host device count %1$zu does not match source %2$zu"), dst->nhostdevs, src->nhostdevs); goto error; } @@ -21384,8 +21306,7 @@ virDomainDefCheckABIStabilityFlags(virDomainDef *src, if (src->nsmartcards != dst->nsmartcards) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target domain smartcard count %zu " - "does not match source %zu"), + _("Target domain smartcard count %1$zu does not match source %2$zu"), dst->nsmartcards, src->nsmartcards); goto error; } @@ -21397,8 +21318,7 @@ virDomainDefCheckABIStabilityFlags(virDomainDef *src, if (src->nserials != dst->nserials) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target domain serial port count %zu " - "does not match source %zu"), + _("Target domain serial port count %1$zu does not match source %2$zu"), dst->nserials, src->nserials); goto error; } @@ -21410,8 +21330,7 @@ virDomainDefCheckABIStabilityFlags(virDomainDef *src, if (src->nparallels != dst->nparallels) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target domain parallel port count %zu " - "does not match source %zu"), + _("Target domain parallel port count %1$zu does not match source %2$zu"), dst->nparallels, src->nparallels); goto error; } @@ -21423,8 +21342,7 @@ virDomainDefCheckABIStabilityFlags(virDomainDef *src, if (src->nchannels != dst->nchannels) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target domain channel count %zu " - "does not match source %zu"), + _("Target domain channel count %1$zu does not match source %2$zu"), dst->nchannels, src->nchannels); goto error; } @@ -21436,8 +21354,7 @@ virDomainDefCheckABIStabilityFlags(virDomainDef *src, if (src->nconsoles != dst->nconsoles) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target domain console count %zu " - "does not match source %zu"), + _("Target domain console count %1$zu does not match source %2$zu"), dst->nconsoles, src->nconsoles); goto error; } @@ -21449,8 +21366,7 @@ virDomainDefCheckABIStabilityFlags(virDomainDef *src, if (src->nhubs != dst->nhubs) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target domain hub device count %zu " - "does not match source %zu"), + _("Target domain hub device count %1$zu does not match source %2$zu"), dst->nhubs, src->nhubs); goto error; } @@ -21461,8 +21377,7 @@ virDomainDefCheckABIStabilityFlags(virDomainDef *src, if (src->nredirdevs != dst->nredirdevs) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target domain redirected devices count %zu " - "does not match source %zu"), + _("Target domain redirected devices count %1$zu does not match source %2$zu"), dst->nredirdevs, src->nredirdevs); goto error; } @@ -21476,8 +21391,7 @@ virDomainDefCheckABIStabilityFlags(virDomainDef *src, if ((!src->redirfilter && dst->redirfilter) || (src->redirfilter && !dst->redirfilter)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target domain USB redirection filter count %d " - "does not match source %d"), + _("Target domain USB redirection filter count %1$d does not match source %2$d"), dst->redirfilter ? 1 : 0, src->redirfilter ? 1 : 0); goto error; } @@ -21490,7 +21404,7 @@ virDomainDefCheckABIStabilityFlags(virDomainDef *src, if (src->nwatchdogs != dst->nwatchdogs) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target domain watchdog device count %zu does not match source %zu"), + _("Target domain watchdog device count %1$zu does not match source %2$zu"), dst->nwatchdogs, src->nwatchdogs); goto error; } @@ -21503,8 +21417,7 @@ virDomainDefCheckABIStabilityFlags(virDomainDef *src, if ((!src->memballoon && dst->memballoon) || (src->memballoon && !dst->memballoon)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target domain memory balloon count %d " - "does not match source %d"), + _("Target domain memory balloon count %1$d does not match source %2$d"), dst->memballoon ? 1 : 0, src->memballoon ? 1 : 0); goto error; } @@ -21516,8 +21429,8 @@ virDomainDefCheckABIStabilityFlags(virDomainDef *src, if (src->nrngs != dst->nrngs) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target domain RNG device count %zu " - "does not match source %zu"), dst->nrngs, src->nrngs); + _("Target domain RNG device count %1$zu does not match source %2$zu"), + dst->nrngs, src->nrngs); goto error; } @@ -21527,8 +21440,8 @@ virDomainDefCheckABIStabilityFlags(virDomainDef *src, if (src->npanics != dst->npanics) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target domain panic device count %zu " - "does not match source %zu"), dst->npanics, src->npanics); + _("Target domain panic device count %1$zu does not match source %2$zu"), + dst->npanics, src->npanics); goto error; } @@ -21539,8 +21452,8 @@ virDomainDefCheckABIStabilityFlags(virDomainDef *src, if (src->nshmems != dst->nshmems) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target domain shared memory device count %zu " - "does not match source %zu"), dst->nshmems, src->nshmems); + _("Target domain shared memory device count %1$zu does not match source %2$zu"), + dst->nshmems, src->nshmems); goto error; } @@ -21551,8 +21464,7 @@ virDomainDefCheckABIStabilityFlags(virDomainDef *src, if (src->ntpms != dst->ntpms) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target domain TPM device count %zu " - "does not match source %zu"), + _("Target domain TPM device count %1$zu does not match source %2$zu"), dst->ntpms, src->ntpms); goto error; } @@ -21564,8 +21476,8 @@ virDomainDefCheckABIStabilityFlags(virDomainDef *src, if (src->nmems != dst->nmems) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target domain memory device count %zu " - "does not match source %zu"), dst->nmems, src->nmems); + _("Target domain memory device count %1$zu does not match source %2$zu"), + dst->nmems, src->nmems); goto error; } @@ -21912,7 +21824,7 @@ virDomainEventActionDefFormat(virBuffer *buf, const char *typeStr = convFunc(type); if (!typeStr) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unexpected %s action: %d"), name, type); + _("unexpected %1$s action: %2$d"), name, type); return -1; } @@ -22331,7 +22243,7 @@ virDomainDiskSourceFormat(virBuffer *buf, case VIR_STORAGE_TYPE_NONE: case VIR_STORAGE_TYPE_LAST: virReportError(VIR_ERR_INTERNAL_ERROR, - _("unexpected disk type %d"), src->type); + _("unexpected disk type %1$d"), src->type); return -1; } @@ -22399,7 +22311,7 @@ virDomainDiskBackingStoreFormat(virBuffer *buf, if (backingStore->format <= 0 || backingStore->format >= VIR_STORAGE_FILE_LAST) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unexpected disk backing store format %d"), + _("unexpected disk backing store format %1$d"), backingStore->format); return -1; } @@ -22661,22 +22573,22 @@ virDomainDiskDefFormat(virBuffer *buf, if (!type || !def->src->type) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unexpected disk type %d"), def->src->type); + _("unexpected disk type %1$d"), def->src->type); return -1; } if (!device) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unexpected disk device %d"), def->device); + _("unexpected disk device %1$d"), def->device); return -1; } if (!bus) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unexpected disk bus %d"), def->bus); + _("unexpected disk bus %1$d"), def->bus); return -1; } if (!sgio) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unexpected disk sgio mode '%d'"), def->sgio); + _("Unexpected disk sgio mode '%1$d'"), def->sgio); return -1; } @@ -22851,7 +22763,7 @@ virDomainControllerDefFormatPCI(virBuffer *buf, const char *modelName = virDomainControllerPCIModelNameTypeToString(def->opts.pciopts.modelName); if (!modelName) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unexpected model name value %d"), + _("unexpected model name value %1$d"), def->opts.pciopts.modelName); return -1; } @@ -22893,7 +22805,7 @@ virDomainControllerDefFormat(virBuffer *buf, if (!type) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unexpected controller type %d"), def->type); + _("unexpected controller type %1$d"), def->type); return -1; } @@ -22902,7 +22814,7 @@ virDomainControllerDefFormat(virBuffer *buf, if (!model) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unexpected model type %d"), def->model); + _("unexpected model type %1$d"), def->model); return -1; } } @@ -23008,19 +22920,19 @@ virDomainFSDefFormat(virBuffer *buf, if (!type) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unexpected filesystem type %d"), def->type); + _("unexpected filesystem type %1$d"), def->type); return -1; } if (!accessmode) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unexpected accessmode %d"), def->accessmode); + _("unexpected accessmode %1$d"), def->accessmode); return -1; } if (!multidevs) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unexpected multidevs %d"), def->multidevs); + _("unexpected multidevs %1$d"), def->multidevs); return -1; } @@ -23263,7 +23175,7 @@ virDomainHostdevDefFormatSubsysPCI(virBuffer *buf, if (!backend) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unexpected pci hostdev driver name type %d"), + _("unexpected pci hostdev driver name type %1$d"), pcisrc->backend); return -1; } @@ -23430,7 +23342,7 @@ virDomainHostdevDefFormatCaps(virBuffer *buf, break; default: virReportError(VIR_ERR_INTERNAL_ERROR, - _("unexpected hostdev type %d"), + _("unexpected hostdev type %1$d"), def->source.caps.type); return -1; } @@ -23509,7 +23421,7 @@ virDomainActualNetDefContentsFormat(virBuffer *buf, mode = virNetDevMacVLanModeTypeToString(virDomainNetGetActualDirectMode(def)); if (!mode) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unexpected source mode %d"), + _("unexpected source mode %1$d"), virDomainNetGetActualDirectMode(def)); return -1; } @@ -23556,7 +23468,7 @@ virDomainActualNetDefFormat(virBuffer *buf, if (!typeStr) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unexpected net type %d"), def->type); + _("unexpected net type %1$d"), def->type); return -1; } @@ -23841,7 +23753,7 @@ virDomainNetDefFormat(virBuffer *buf, if (publicActual) { if (!(typeStr = virDomainNetTypeToString(actualType))) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unexpected actual net type %d"), actualType); + _("unexpected actual net type %1$d"), actualType); return -1; } if (actualType == VIR_DOMAIN_NET_TYPE_HOSTDEV) @@ -23849,7 +23761,7 @@ virDomainNetDefFormat(virBuffer *buf, } else { if (!(typeStr = virDomainNetTypeToString(def->type))) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unexpected net type %d"), def->type); + _("unexpected net type %1$d"), def->type); return -1; } if (def->type == VIR_DOMAIN_NET_TYPE_HOSTDEV) @@ -24129,7 +24041,7 @@ virDomainChrAttrsDefFormat(virBuffer *buf, if (!type) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unexpected char type %d"), def->type); + _("unexpected char type %1$d"), def->type); return -1; } @@ -24386,7 +24298,7 @@ virDomainChrTargetDefFormat(virBuffer *buf, case VIR_DOMAIN_CHR_DEVICE_TYPE_LAST: virReportError(VIR_ERR_INTERNAL_ERROR, - _("unexpected char device type %d"), + _("unexpected char device type %1$d"), def->deviceType); return -1; } @@ -24404,7 +24316,7 @@ virDomainChrDefFormat(virBuffer *buf, if (!elementName) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unexpected char device type %d"), + _("unexpected char device type %1$d"), def->deviceType); return -1; } @@ -24445,7 +24357,7 @@ virDomainSmartcardDefFormat(virBuffer *buf, if (!mode) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unexpected smartcard type %d"), def->type); + _("unexpected smartcard type %1$d"), def->type); return -1; } @@ -24492,7 +24404,7 @@ virDomainSoundCodecDefFormat(virBuffer *buf, if (!type) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unexpected codec type %d"), def->type); + _("unexpected codec type %1$d"), def->type); return -1; } @@ -24603,7 +24515,7 @@ virDomainSoundDefFormat(virBuffer *buf, if (!model) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unexpected sound model %d"), def->model); + _("unexpected sound model %1$d"), def->model); return -1; } @@ -24754,7 +24666,7 @@ virDomainAudioDefFormat(virBuffer *buf, if (!type) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unexpected audio type %d"), def->type); + _("unexpected audio type %1$d"), def->type); return -1; } @@ -24851,7 +24763,7 @@ virDomainMemballoonDefFormat(virBuffer *buf, if (!model) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unexpected memballoon model %d"), def->model); + _("unexpected memballoon model %1$d"), def->model); return -1; } @@ -24904,13 +24816,13 @@ virDomainWatchdogDefFormat(virBuffer *buf, if (!model) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unexpected watchdog model %d"), def->model); + _("unexpected watchdog model %1$d"), def->model); return -1; } if (!action) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unexpected watchdog action %d"), def->action); + _("unexpected watchdog action %1$d"), def->action); return -1; } @@ -25261,7 +25173,7 @@ virDomainVideoDefFormat(virBuffer *buf, if (!model) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unexpected video model %d"), def->type); + _("unexpected video model %1$d"), def->type); return -1; } @@ -25342,12 +25254,12 @@ virDomainInputDefFormat(virBuffer *buf, if (!type) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unexpected input type %d"), def->type); + _("unexpected input type %1$d"), def->type); return -1; } if (!bus) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unexpected input bus type %d"), def->bus); + _("unexpected input bus type %1$d"), def->bus); return -1; } @@ -25360,7 +25272,7 @@ virDomainInputDefFormat(virBuffer *buf, if (!model) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unexpected input model %d"), def->model); + _("unexpected input model %1$d"), def->model); return -1; } @@ -25609,7 +25521,7 @@ virDomainGraphicsDefFormat(virBuffer *buf, if (!type) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unexpected net type %d"), def->type); + _("unexpected net type %1$d"), def->type); return -1; } @@ -25964,7 +25876,7 @@ virDomainHostdevDefFormat(virBuffer *buf, if (!mode) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unexpected hostdev mode %d"), def->mode); + _("unexpected hostdev mode %1$d"), def->mode); return -1; } @@ -25973,7 +25885,7 @@ virDomainHostdevDefFormat(virBuffer *buf, type = virDomainHostdevSubsysTypeToString(def->source.subsys.type); if (!type) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unexpected hostdev type %d"), + _("unexpected hostdev type %1$d"), def->source.subsys.type); return -1; } @@ -25982,14 +25894,14 @@ virDomainHostdevDefFormat(virBuffer *buf, type = virDomainHostdevCapsTypeToString(def->source.caps.type); if (!type) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unexpected hostdev type %d"), + _("unexpected hostdev type %1$d"), def->source.caps.type); return -1; } break; default: virReportError(VIR_ERR_INTERNAL_ERROR, - _("unexpected hostdev mode %d"), def->mode); + _("unexpected hostdev mode %1$d"), def->mode); return -1; } @@ -26130,7 +26042,7 @@ virDomainHubDefFormat(virBuffer *buf, if (!type) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unexpected hub type %d"), def->type); + _("unexpected hub type %1$d"), def->type); return -1; } @@ -27037,7 +26949,7 @@ virDomainDefFormatFeatures(virBuffer *buf, case VIR_TRISTATE_SWITCH_LAST: case VIR_TRISTATE_SWITCH_OFF: virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unexpected state of feature '%s'"), name); + _("Unexpected state of feature '%1$s'"), name); return -1; break; } @@ -27391,7 +27303,7 @@ virDomainDefFormatInternalSetRootName(virDomainDef *def, if (!(type = virDomainVirtTypeToString(def->virtType))) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unexpected domain type %d"), def->virtType); + _("unexpected domain type %1$d"), def->virtType); return -1; } @@ -27560,7 +27472,7 @@ virDomainDefFormatInternalSetRootName(virDomainDef *def, virDomainBootTypeToString(def->os.bootDevs[n]); if (!boottype) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unexpected boot device type %d"), + _("unexpected boot device type %1$d"), def->os.bootDevs[n]); return -1; } @@ -27593,7 +27505,7 @@ virDomainDefFormatInternalSetRootName(virDomainDef *def, mode = virDomainSmbiosModeTypeToString(def->os.smbios_mode); if (mode == NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unexpected smbios mode %d"), def->os.smbios_mode); + _("unexpected smbios mode %1$d"), def->os.smbios_mode); return -1; } virBufferAsprintf(buf, "<smbios mode='%s'/>\n", mode); @@ -27956,7 +27868,7 @@ virDomainDeviceInfoCheckBootIndex(virDomainDef *def G_GNUC_UNUSED, if (info->bootIndex == data->newInfo->bootIndex) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("boot order %u is already used by another device"), + _("boot order %1$u is already used by another device"), data->newInfo->bootIndex); return -1; } @@ -28030,8 +27942,7 @@ virDomainDefCompatibleDevice(virDomainDef *def, if (action == VIR_DOMAIN_DEVICE_ACTION_ATTACH && (virDomainDefGetMemoryTotal(def) + sz) > def->mem.max_memory) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Attaching memory device with size '%llu' would " - "exceed domain's maxMemory config size '%llu'"), + _("Attaching memory device with size '%1$llu' would exceed domain's maxMemory config size '%2$llu'"), sz, def->mem.max_memory); return -1; } @@ -28056,7 +27967,7 @@ virDomainDefSaveXML(virDomainDef *def, if (g_mkdir_with_parents(configDir, 0777) < 0) { virReportSystemError(errno, - _("cannot create config directory '%s'"), + _("cannot create config directory '%1$s'"), configDir); return -1; } @@ -28121,7 +28032,7 @@ virDomainDeleteConfig(const char *configDir, if (unlink(configFile) < 0 && errno != ENOENT) { virReportSystemError(errno, - _("cannot remove config %s"), + _("cannot remove config %1$s"), configFile); return -1; } @@ -28517,7 +28428,7 @@ virDomainObjSetState(virDomainObj *dom, virDomainState state, int reason) break; case VIR_DOMAIN_LAST: default: - VIR_ERROR(_("invalid domain state: %d"), state); + VIR_ERROR(_("invalid domain state: %1$d"), state); return; } @@ -28899,7 +28810,7 @@ virDomainNetFind(virDomainDef *def, const char *device) } virReportError(VIR_ERR_INVALID_ARG, - _("'%s' is not a known interface"), device); + _("'%1$s' is not a known interface"), device); return NULL; } @@ -29001,7 +28912,7 @@ virDomainDefFindDevice(virDomainDef *def, if (dev->type == VIR_DOMAIN_DEVICE_NONE) { if (reportError) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("no device found with alias %s"), devAlias); + _("no device found with alias %1$s"), devAlias); } else { VIR_DEBUG("no device found with alias %s", devAlias); } @@ -29207,7 +29118,7 @@ virDomainObjGetMetadata(virDomainObj *vm, if (type >= VIR_DOMAIN_METADATA_LAST) { virReportError(VIR_ERR_INVALID_ARG, - _("unknown metadata type '%d'"), type); + _("unknown metadata type '%1$d'"), type); return NULL; } @@ -29256,7 +29167,7 @@ virDomainDefSetMetadata(virDomainDef *def, if (type >= VIR_DOMAIN_METADATA_LAST) { virReportError(VIR_ERR_INVALID_ARG, - _("unknown metadata type '%d'"), type); + _("unknown metadata type '%1$d'"), type); return -1; } @@ -29380,7 +29291,7 @@ virDomainDiskDefCheckDuplicateInfo(const virDomainDiskDef *a, { if (STREQ(a->dst, b->dst)) { virReportError(VIR_ERR_XML_ERROR, - _("target '%s' duplicated for disk sources '%s' and '%s'"), + _("target '%1$s' duplicated for disk sources '%2$s' and '%3$s'"), a->dst, NULLSTR(virDomainDiskGetSource(a)), NULLSTR(virDomainDiskGetSource(b))); @@ -29599,7 +29510,7 @@ virDomainNetDefToNetworkPort(virDomainDef *dom, if (iface->type != VIR_DOMAIN_NET_TYPE_NETWORK) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Expected an interface of type 'network' not '%s'"), + _("Expected an interface of type 'network' not '%1$s'"), virDomainNetTypeToString(iface->type)); return NULL; } @@ -29641,7 +29552,7 @@ virDomainNetDefActualFromNetworkPort(virDomainNetDef *iface, if (iface->type != VIR_DOMAIN_NET_TYPE_NETWORK) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Expected an interface of type 'network' not '%s'"), + _("Expected an interface of type 'network' not '%1$s'"), virDomainNetTypeToString(iface->type)); return -1; } @@ -29749,7 +29660,7 @@ virDomainNetDefActualToNetworkPort(virDomainDef *dom, if (!iface->data.network.actual) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Missing actual data for interface '%s'"), + _("Missing actual data for interface '%1$s'"), iface->ifname); return NULL; } @@ -29758,7 +29669,7 @@ virDomainNetDefActualToNetworkPort(virDomainDef *dom, if (iface->type != VIR_DOMAIN_NET_TYPE_NETWORK) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Expected an interface of type 'network' not '%s'"), + _("Expected an interface of type 'network' not '%1$s'"), virDomainNetTypeToString(iface->type)); return NULL; } @@ -29804,7 +29715,7 @@ virDomainNetDefActualToNetworkPort(virDomainDef *dom, if (actual->data.hostdev.def.mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS || actual->data.hostdev.def.source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Actual interface '%s' hostdev was not a PCI device"), + _("Actual interface '%1$s' hostdev was not a PCI device"), iface->ifname); return NULL; } @@ -29849,7 +29760,7 @@ virDomainNetDefActualToNetworkPort(virDomainDef *dom, case VIR_DOMAIN_NET_TYPE_NULL: case VIR_DOMAIN_NET_TYPE_VDS: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Unexpected network port type %s"), + _("Unexpected network port type %1$s"), virDomainNetTypeToString(virDomainNetGetActualType(iface))); return NULL; @@ -30204,7 +30115,7 @@ virDomainDiskAddISCSIPoolSourceHost(virStorageSource *src, if (g_strv_length(tokens) != 4) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unexpected iscsi volume name '%s'"), + _("unexpected iscsi volume name '%1$s'"), src->srcpool->volume); return -1; } @@ -30290,8 +30201,7 @@ virDomainStorageSourceTranslateSourcePool(virStorageSource *src, if (virStoragePoolIsActive(pool) != 1) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("storage pool '%s' containing volume '%s' " - "is not active"), + _("storage pool '%1$s' containing volume '%2$s' is not active"), src->srcpool->pool, src->srcpool->volume); return -1; } @@ -30356,8 +30266,7 @@ virDomainStorageSourceTranslateSourcePool(virStorageSource *src, case VIR_STORAGE_VOL_NETWORK: case VIR_STORAGE_VOL_NETDIR: virReportError(VIR_ERR_INTERNAL_ERROR, - _("unexpected storage volume type '%s' " - "for storage pool type '%s'"), + _("unexpected storage volume type '%1$s' for storage pool type '%2$s'"), virStorageVolTypeToString(info.type), virStoragePoolTypeToString(pooldef->type)); return -1; @@ -30396,8 +30305,7 @@ virDomainStorageSourceTranslateSourcePool(virStorageSource *src, case VIR_STORAGE_POOL_GLUSTER: case VIR_STORAGE_POOL_LAST: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("using '%s' pools for backing 'volume' disks " - "isn't yet supported"), + _("using '%1$s' pools for backing 'volume' disks isn't yet supported"), virStoragePoolTypeToString(pooldef->type)); return -1; } @@ -30811,7 +30719,7 @@ virDomainObjGetMessages(virDomainObj *vm, for (i = 0; i < VIR_DOMAIN_TAINT_LAST; i++) { if (vm->taint & (1 << i)) { (*msgs)[n++] = g_strdup_printf( - _("tainted: %s"), + _("tainted: %1$s"), _(virDomainTaintMessageTypeToString(i))); } } @@ -30823,7 +30731,7 @@ virDomainObjGetMessages(virDomainObj *vm, for (i = 0; i < vm->ndeprecations; i++) { (*msgs)[n++] = g_strdup_printf( - _("deprecated configuration: %s"), + _("deprecated configuration: %1$s"), vm->deprecations[i]); } } -- 2.39.2

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com&gt; --- src/conf/domain_validate.c | 136 +++++++++++++++++-------------------- 1 file changed, 62 insertions(+), 74 deletions(-) diff --git a/src/conf/domain_validate.c b/src/conf/domain_validate.c index 5fb2d4971c..d30bb31dda 100644 --- a/src/conf/domain_validate.c +++ b/src/conf/domain_validate.c @@ -76,7 +76,7 @@ virDomainDefResourceValidate(const virDomainDef *def) len = strlen(def->resource->appid); if (len < APPID_LEN_MIN || len > APPID_LEN_MAX) { virReportError(VIR_ERR_INVALID_ARG, - _("Fibre Channel 'appid' string length must be between [%d, %d]"), + _("Fibre Channel 'appid' string length must be between [%1$d, %2$d]"), APPID_LEN_MIN, APPID_LEN_MAX); return -1; } @@ -277,7 +277,7 @@ virDomainDiskAddressDiskBusCompatibility(virDomainDiskBus bus, } virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unexpected bus type '%d'"), + _("unexpected bus type '%1$d'"), bus); return true; } @@ -508,7 +508,7 @@ virDomainDiskDefValidateSourceChainOne(const virStorageSource *src) case VIR_STORAGE_NET_PROTOCOL_VXHS: case VIR_STORAGE_NET_PROTOCOL_NFS: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("authentication is not supported for protocol '%s'"), + _("authentication is not supported for protocol '%1$s'"), virStorageNetProtocolTypeToString(src->protocol)); return -1; @@ -519,7 +519,7 @@ virDomainDiskDefValidateSourceChainOne(const virStorageSource *src) if ((actUsage = virSecretUsageTypeFromString(authdef->secrettype)) < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown secret type '%s'"), + _("unknown secret type '%1$s'"), NULLSTR(authdef->secrettype)); return -1; } @@ -529,7 +529,7 @@ virDomainDiskDefValidateSourceChainOne(const virStorageSource *src) (src->protocol == VIR_STORAGE_NET_PROTOCOL_RBD && actUsage != VIR_SECRET_USAGE_TYPE_CEPH)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("invalid secret type '%s'"), + _("invalid secret type '%1$s'"), virSecretUsageTypeToString(actUsage)); return -1; } @@ -603,7 +603,7 @@ virDomainDiskDefSourceLUNValidate(const virStorageSource *src) if (virStorageSourceGetActualType(src) == VIR_STORAGE_TYPE_NETWORK) { if (src->protocol != VIR_STORAGE_NET_PROTOCOL_ISCSI) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("disk device='lun' is not supported for protocol='%s'"), + _("disk device='lun' is not supported for protocol='%1$s'"), virStorageNetProtocolTypeToString(src->protocol)); return -1; } @@ -649,7 +649,7 @@ virDomainDiskDefValidateStartupPolicy(const virDomainDiskDef *disk) if (virStorageSourceGetActualType(disk->src) != VIR_STORAGE_TYPE_VOLUME && !virStorageSourceIsLocalStorage(disk->src)) { virReportError(VIR_ERR_XML_ERROR, - _("disk startupPolicy '%s' is not allowed for disk of '%s' type"), + _("disk startupPolicy '%1$s' is not allowed for disk of '%2$s' type"), virDomainStartupPolicyTypeToString(disk->startupPolicy), virStorageTypeToString(disk->src->type)); return -1; @@ -676,7 +676,7 @@ virDomainDiskDefValidate(const virDomainDef *def, /* disk target is used widely in other code so it must be validated first */ if (!disk->dst) { if (disk->src->srcpool) { - virReportError(VIR_ERR_NO_TARGET, _("pool = '%s', volume = '%s'"), + virReportError(VIR_ERR_NO_TARGET, _("pool = '%1$s', volume = '%2$s'"), disk->src->srcpool->pool, disk->src->srcpool->volume); } else { @@ -764,7 +764,7 @@ virDomainDiskDefValidate(const virDomainDef *def, */ if (!virDomainDiskAddressDiskBusCompatibility(disk->bus, disk->info.type)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Invalid address type '%s' for the disk '%s' with the bus type '%s'"), + _("Invalid address type '%1$s' for the disk '%2$s' with the bus type '%3$s'"), virDomainDeviceAddressTypeToString(disk->info.type), disk->dst, virDomainDiskBusTypeToString(disk->bus)); @@ -776,7 +776,7 @@ virDomainDiskDefValidate(const virDomainDef *def, disk->model == VIR_DOMAIN_DISK_MODEL_VIRTIO_TRANSITIONAL || disk->model == VIR_DOMAIN_DISK_MODEL_VIRTIO_NON_TRANSITIONAL) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("disk model '%s' not supported for bus '%s'"), + _("disk model '%1$s' not supported for bus '%2$s'"), virDomainDiskModelTypeToString(disk->model), virDomainDiskBusTypeToString(disk->bus)); return -1; @@ -843,7 +843,7 @@ virDomainDiskDefValidate(const virDomainDef *def, if (strlen(disk->vendor) > VENDOR_LEN) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("disk vendor is more than %d characters"), + _("disk vendor is more than %1$d characters"), VENDOR_LEN); return -1; } @@ -858,7 +858,7 @@ virDomainDiskDefValidate(const virDomainDef *def, if (strlen(disk->product) > PRODUCT_LEN) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("disk product is more than %d characters"), + _("disk product is more than %1$d characters"), PRODUCT_LEN); return -1; } @@ -867,7 +867,7 @@ virDomainDiskDefValidate(const virDomainDef *def, if (disk->device == VIR_DOMAIN_DISK_DEVICE_FLOPPY && disk->bus != VIR_DOMAIN_DISK_BUS_FDC) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Invalid bus type '%s' for floppy disk"), + _("Invalid bus type '%1$s' for floppy disk"), virDomainDiskBusTypeToString(disk->bus)); return -1; } @@ -875,7 +875,7 @@ virDomainDiskDefValidate(const virDomainDef *def, if (disk->device != VIR_DOMAIN_DISK_DEVICE_FLOPPY && disk->bus == VIR_DOMAIN_DISK_BUS_FDC) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Invalid bus type '%s' for disk"), + _("Invalid bus type '%1$s' for disk"), virDomainDiskBusTypeToString(disk->bus)); return -1; } @@ -901,14 +901,14 @@ virDomainDiskDefValidate(const virDomainDef *def, !STRPREFIX(disk->dst, "xvd") && !STRPREFIX(disk->dst, "ubd")) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Invalid harddisk device name: %s"), disk->dst); + _("Invalid harddisk device name: %1$s"), disk->dst); return -1; } if (disk->device == VIR_DOMAIN_DISK_DEVICE_FLOPPY && !STRPREFIX(disk->dst, "fd")) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Invalid floppy device name: %s"), disk->dst); + _("Invalid floppy device name: %1$s"), disk->dst); return -1; } @@ -1115,7 +1115,7 @@ virDomainDefTunablesValidate(const virDomainDef *def) if (STREQ(def->blkio.devices[j].path, def->blkio.devices[i].path)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("duplicate blkio device path '%s'"), + _("duplicate blkio device path '%1$s'"), def->blkio.devices[i].path); return -1; } @@ -1143,7 +1143,7 @@ virDomainControllerDefValidate(const virDomainControllerDef *controller) if (controller->idx > 255) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("PCI controller index %d too high, maximum is 255"), + _("PCI controller index %1$d too high, maximum is 255"), controller->idx); return -1; } @@ -1153,7 +1153,7 @@ virDomainControllerDefValidate(const virDomainControllerDef *controller) if (opts->targetIndex < 0 || opts->targetIndex > 30) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("PCI controller target index '%d' out of range - must be 0-30"), + _("PCI controller target index '%1$d' out of range - must be 0-30"), opts->targetIndex); return -1; } @@ -1169,7 +1169,7 @@ virDomainControllerDefValidate(const virDomainControllerDef *controller) if (opts->chassisNr != -1) { if (opts->chassisNr < 1 || opts->chassisNr > 255) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("PCI controller chassisNr '%d' out of range - must be 1-255"), + _("PCI controller chassisNr '%1$d' out of range - must be 1-255"), opts->chassisNr); return -1; } @@ -1178,7 +1178,7 @@ virDomainControllerDefValidate(const virDomainControllerDef *controller) if (opts->chassis != -1) { if (opts->chassis < 0 || opts->chassis > 255) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("PCI controller chassis '%d' out of range - must be 0-255"), + _("PCI controller chassis '%1$d' out of range - must be 0-255"), opts->chassis); return -1; } @@ -1187,7 +1187,7 @@ virDomainControllerDefValidate(const virDomainControllerDef *controller) if (opts->port != -1) { if (opts->port < 0 || opts->port > 255) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("PCI controller port '%d' out of range - must be 0-255"), + _("PCI controller port '%1$d' out of range - must be 0-255"), opts->port); return -1; } @@ -1196,7 +1196,7 @@ virDomainControllerDefValidate(const virDomainControllerDef *controller) if (opts->busNr != -1) { if (opts->busNr < 1 || opts->busNr > 254) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("PCI controller busNr '%d' out of range - must be 1-254"), + _("PCI controller busNr '%1$d' out of range - must be 1-254"), opts->busNr); return -1; } @@ -1321,9 +1321,7 @@ virDomainDefDuplicateDriveAddressesValidate(const virDomainDef *def) if (virDomainDeviceInfoAddressIsEqual(disk_info_i, disk_info_j)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Found duplicate drive address for disk with " - "target name '%s' controller='%u' bus='%u' " - "target='%u' unit='%u'"), + _("Found duplicate drive address for disk with target name '%1$s' controller='%2$u' bus='%3$u' target='%4$u' unit='%5$u'"), disk_i->dst, disk_info_i->addr.drive.controller, disk_info_i->addr.drive.bus, @@ -1363,9 +1361,7 @@ virDomainDefDuplicateDriveAddressesValidate(const virDomainDef *def) if (virDomainDeviceInfoAddressIsEqual(hdev_info_i, hdev_info_j)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("SCSI host address controller='%u' " - "bus='%u' target='%u' unit='%u' in " - "use by another SCSI host device"), + _("SCSI host address controller='%1$u' bus='%2$u' target='%3$u' unit='%4$u' in use by another SCSI host device"), hdev_addr_i->bus, hdev_addr_i->controller, hdev_addr_i->target, @@ -1377,9 +1373,7 @@ virDomainDefDuplicateDriveAddressesValidate(const virDomainDef *def) if (virDomainDriveAddressIsUsedByDisk(def, VIR_DOMAIN_DISK_BUS_SCSI, hdev_addr_i)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("SCSI host address controller='%u' " - "bus='%u' target='%u' unit='%u' in " - "use by another SCSI disk"), + _("SCSI host address controller='%1$u' bus='%2$u' target='%3$u' unit='%4$u' in use by another SCSI disk"), hdev_addr_i->bus, hdev_addr_i->controller, hdev_addr_i->target, @@ -1427,7 +1421,7 @@ virDomainDeviceDefValidateAliasesIterator(virDomainDef *def, if (virHashLookup(data->aliases, alias)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("non unique alias detected: %s"), + _("non unique alias detected: %1$s"), alias); return -1; } @@ -1487,7 +1481,7 @@ virDomainDeviceValidateAliasImpl(const virDomainDef *def, if (virHashLookup(aliases, info->alias)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("non unique alias detected: %s"), + _("non unique alias detected: %1$s"), info->alias); return -1; } @@ -1558,16 +1552,14 @@ virDomainDefMemtuneValidate(const virDomainDef *def) virBitmapOverlaps(mem->hugepages[i].nodemask, mem->hugepages[j].nodemask)) { virReportError(VIR_ERR_XML_DETAIL, - _("nodeset attribute of hugepages " - "of sizes %llu and %llu intersect"), + _("nodeset attribute of hugepages of sizes %1$llu and %2$llu intersect"), mem->hugepages[i].size, mem->hugepages[j].size); return -1; } else if (!mem->hugepages[i].nodemask && !mem->hugepages[j].nodemask) { virReportError(VIR_ERR_XML_DETAIL, - _("two master hugepages detected: " - "%llu and %llu"), + _("two master hugepages detected: %1$llu and %2$llu"), mem->hugepages[i].size, mem->hugepages[j].size); return -1; @@ -1583,7 +1575,7 @@ virDomainDefMemtuneValidate(const virDomainDef *def) nextBit = virBitmapNextSetBit(mem->hugepages[i].nodemask, pos); if (nextBit >= 0) { virReportError(VIR_ERR_XML_DETAIL, - _("hugepages: node %zd not found"), + _("hugepages: node %1$zd not found"), nextBit); return -1; } @@ -1649,7 +1641,7 @@ virDomainDefOSValidate(const virDomainDef *def, if (loader->nvram && def->os.firmware != VIR_DOMAIN_OS_DEF_FIRMWARE_EFI) { virReportError(VIR_ERR_XML_DETAIL, - _("firmware type '%s' does not support nvram"), + _("firmware type '%1$s' does not support nvram"), virDomainOsDefFirmwareTypeToString(def->os.firmware)); return -1; } @@ -1707,7 +1699,7 @@ virDomainDefOSValidate(const virDomainDef *def, (def->cputune.name < VIR_CGROUP_CPU_PERIOD_MIN || \ def->cputune.name > VIR_CGROUP_CPU_PERIOD_MAX)) { \ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, \ - _("Value of cputune '%s' must be in range [%llu, %llu]"), \ + _("Value of cputune '%1$s' must be in range [%2$llu, %3$llu]"), \ #name, \ VIR_CGROUP_CPU_PERIOD_MIN, \ VIR_CGROUP_CPU_PERIOD_MAX); \ @@ -1721,7 +1713,7 @@ virDomainDefOSValidate(const virDomainDef *def, (def->cputune.name < VIR_CGROUP_CPU_QUOTA_MIN || \ def->cputune.name > VIR_CGROUP_CPU_QUOTA_MAX)) { \ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, \ - _("Value of cputune '%s' must be in range [%llu, %llu]"), \ + _("Value of cputune '%1$s' must be in range [%2$llu, %3$llu]"), \ #name, \ VIR_CGROUP_CPU_QUOTA_MIN, \ VIR_CGROUP_CPU_QUOTA_MAX); \ @@ -1787,7 +1779,7 @@ virDomainDefFSValidate(const virDomainDef *def) if (virHashHasEntry(dsts, fs->dst)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("filesystem target '%s' specified twice"), + _("filesystem target '%1$s' specified twice"), fs->dst); return -1; } @@ -1998,7 +1990,7 @@ virDomainNetDefValidatePortOptions(const char *macstr, if (!(type == VIR_DOMAIN_NET_TYPE_NETWORK || type == VIR_DOMAIN_NET_TYPE_BRIDGE)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("interface %s - <port isolated='yes'/> is not supported for network interfaces with type='%s'"), + _("interface %1$s - <port isolated='yes'/> is not supported for network interfaces with type='%2$s'"), macstr, virDomainNetTypeToString(type)); return -1; } @@ -2008,7 +2000,7 @@ virDomainNetDefValidatePortOptions(const char *macstr, */ if (vport && vport->virtPortType != VIR_NETDEV_VPORT_PROFILE_NONE) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("interface %s - <port isolated='yes'/> is not supported for network interfaces with virtualport type='%s'"), + _("interface %1$s - <port isolated='yes'/> is not supported for network interfaces with virtualport type='%2$s'"), macstr, virNetDevVPortTypeToString(vport->virtPortType)); return -1; } @@ -2052,7 +2044,7 @@ virDomainActualNetDefValidate(const virDomainNetDef *net) (actualType == VIR_DOMAIN_NET_TYPE_BRIDGE && vport && vport->virtPortType == VIR_NETDEV_VPORT_PROFILE_OPENVSWITCH))) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("interface %s - vlan tag not supported for this connection type"), + _("interface %1$s - vlan tag not supported for this connection type"), macstr); return -1; } @@ -2063,8 +2055,7 @@ virDomainActualNetDefValidate(const virDomainNetDef *net) */ if (bandwidth && actualType == VIR_DOMAIN_NET_TYPE_HOSTDEV) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("interface %s - bandwidth settings are not supported " - "for hostdev interfaces"), + _("interface %1$s - bandwidth settings are not supported for hostdev interfaces"), macstr); return -1; } @@ -2088,18 +2079,15 @@ virDomainNetDefValidate(const virDomainNetDef *net) if ((net->hostIP.nroutes || net->hostIP.nips) && net->type != VIR_DOMAIN_NET_TYPE_ETHERNET) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Invalid attempt to set network interface " - "host-side IP route and/or address info on " - "interface of type '%s'. This is only supported " - "on interfaces of type 'ethernet'"), + _("Invalid attempt to set network interface host-side IP route and/or address info on interface of type '%1$s'. " + "This is only supported on interfaces of type 'ethernet'"), virDomainNetTypeToString(net->type)); return -1; } if (net->managed_tap == VIR_TRISTATE_BOOL_NO && net->type != VIR_DOMAIN_NET_TYPE_ETHERNET) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unmanaged target dev is not supported on " - "interfaces of type '%s'"), + _("unmanaged target dev is not supported on interfaces of type '%1$s'"), virDomainNetTypeToString(net->type)); return -1; } @@ -2114,7 +2102,7 @@ virDomainNetDefValidate(const virDomainNetDef *net) } else { if (net->teaming->persistent) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("teaming persistent attribute not allowed if teaming type is '%s'"), + _("teaming persistent attribute not allowed if teaming type is '%1$s'"), virDomainNetTeamingTypeToString(net->teaming->type)); return -1; } @@ -2292,7 +2280,7 @@ virDomainMemoryDefValidate(const virDomainMemoryDef *mem, if (mem->targetNode >= nodeCount) { virReportError(VIR_ERR_XML_DETAIL, - _("can't add memory backend for guest node '%d' as the guest has only '%zu' NUMA nodes configured"), + _("can't add memory backend for guest node '%1$d' as the guest has only '%2$zu' NUMA nodes configured"), mem->targetNode, nodeCount); return -1; } @@ -2329,14 +2317,14 @@ virDomainMemoryDefValidate(const virDomainMemoryDef *mem, case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_PMEM: if (!mem->nvdimmPath) { virReportError(VIR_ERR_XML_DETAIL, - _("path is required for model '%s'"), + _("path is required for model '%1$s'"), virDomainMemoryModelTypeToString(mem->model)); return -1; } if (mem->discard == VIR_TRISTATE_BOOL_YES) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("discard is not supported for model '%s'"), + _("discard is not supported for model '%1$s'"), virDomainMemoryModelTypeToString(mem->model)); return -1; } @@ -2357,7 +2345,7 @@ virDomainMemoryDefValidate(const virDomainMemoryDef *mem, case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_MEM: if (mem->requestedsize > mem->size) { virReportError(VIR_ERR_XML_DETAIL, - _("requested size must be smaller than or equal to @size (%lluKiB)"), + _("requested size must be smaller than or equal to @size (%1$lluKiB)"), mem->size); return -1; } @@ -2378,7 +2366,7 @@ virDomainMemoryDefValidate(const virDomainMemoryDef *mem, if (mem->blocksize < thpSize) { virReportError(VIR_ERR_XML_DETAIL, - _("block size too small, must be at least %lluKiB"), + _("block size too small, must be at least %1$lluKiB"), thpSize); return -1; } @@ -2396,7 +2384,7 @@ virDomainMemoryDefValidate(const virDomainMemoryDef *mem, case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC: if (mem->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("memory device address is not supported for model '%s'"), + _("memory device address is not supported for model '%1$s'"), virDomainMemoryModelTypeToString(mem->model)); return -1; } @@ -2464,13 +2452,13 @@ virDomainInputDefValidate(const virDomainInputDef *input, input->type != VIR_DOMAIN_INPUT_TYPE_MOUSE && input->type != VIR_DOMAIN_INPUT_TYPE_KBD) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("ps2 bus does not support %s input device"), + _("ps2 bus does not support %1$s input device"), virDomainInputTypeToString(input->type)); return -1; } if (input->bus == VIR_DOMAIN_INPUT_BUS_XEN) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unsupported input bus %s"), + _("unsupported input bus %1$s"), virDomainInputBusTypeToString(input->bus)); return -1; } @@ -2480,14 +2468,14 @@ virDomainInputDefValidate(const virDomainInputDef *input, case VIR_DOMAIN_OSTYPE_XENPVH: if (input->bus != VIR_DOMAIN_INPUT_BUS_XEN) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unsupported input bus %s"), + _("unsupported input bus %1$s"), virDomainInputBusTypeToString(input->bus)); return -1; } if (input->type != VIR_DOMAIN_INPUT_TYPE_MOUSE && input->type != VIR_DOMAIN_INPUT_TYPE_KBD) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("xen bus does not support %s input device"), + _("xen bus does not support %1$s input device"), virDomainInputTypeToString(input->type)); return -1; } @@ -2498,7 +2486,7 @@ virDomainInputDefValidate(const virDomainInputDef *input, def->virtType == VIR_DOMAIN_VIRT_PARALLELS) { if (input->bus != VIR_DOMAIN_INPUT_BUS_PARALLELS) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("parallels containers don't support input bus %s"), + _("parallels containers don't support input bus %1$s"), virDomainInputBusTypeToString(input->bus)); return -1; } @@ -2506,7 +2494,7 @@ virDomainInputDefValidate(const virDomainInputDef *input, if (input->type != VIR_DOMAIN_INPUT_TYPE_MOUSE && input->type != VIR_DOMAIN_INPUT_TYPE_KBD) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("parallels bus does not support %s input device"), + _("parallels bus does not support %1$s input device"), virDomainInputTypeToString(input->type)); return -1; } @@ -2556,7 +2544,7 @@ virDomainInputDefValidate(const virDomainInputDef *input, case VIR_DOMAIN_INPUT_MODEL_VIRTIO_NON_TRANSITIONAL: if (input->bus != VIR_DOMAIN_INPUT_BUS_VIRTIO) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("only bus 'virtio' is supported for input model '%s'"), + _("only bus 'virtio' is supported for input model '%1$s'"), virDomainInputModelTypeToString(input->model)); return -1; } @@ -2637,7 +2625,7 @@ virDomainEnsureAudioID(const virDomainDef *def, } virReportError(VIR_ERR_XML_ERROR, - _("no audio device with ID %u"), + _("no audio device with ID %1$u"), id); return -1; } @@ -2660,7 +2648,7 @@ virDomainAudioDefValidate(const virDomainDef *def, continue; if (def->audios[i]->id == audio->id) { virReportError(VIR_ERR_XML_ERROR, - _("audio ID %u is used multiple times"), + _("audio ID %1$u is used multiple times"), audio->id); return -1; } @@ -2723,7 +2711,7 @@ virDomainIOMMUDefValidate(const virDomainIOMMUDef *iommu) iommu->iotlb != VIR_TRISTATE_SWITCH_ABSENT || iommu->aw_bits != 0) { virReportError(VIR_ERR_XML_ERROR, - _("iommu model '%s' doesn't support additional attributes"), + _("iommu model '%1$s' doesn't support additional attributes"), virDomainIOMMUModelTypeToString(iommu->model)); return -1; } @@ -2739,7 +2727,7 @@ virDomainIOMMUDefValidate(const virDomainIOMMUDef *iommu) case VIR_DOMAIN_IOMMU_MODEL_INTEL: if (iommu->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) { virReportError(VIR_ERR_XML_ERROR, - _("iommu model '%s' can't have address"), + _("iommu model '%1$s' can't have address"), virDomainIOMMUModelTypeToString(iommu->model)); return -1; } @@ -2762,7 +2750,7 @@ virDomainTPMDevValidate(const virDomainTPMDef *tpm) if (tpm->data.emulator.activePcrBanks && tpm->data.emulator.version != VIR_DOMAIN_TPM_VERSION_2_0) { virReportError(VIR_ERR_XML_ERROR, - _("<active_pcr_banks/> requires TPM version '%s'"), + _("<active_pcr_banks/> requires TPM version '%1$s'"), virDomainTPMVersionTypeToString(VIR_DOMAIN_TPM_VERSION_2_0)); return -1; } @@ -2822,7 +2810,7 @@ virDomainDeviceInfoValidate(const virDomainDeviceDef *dev) case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_UNASSIGNED: if (dev->type != VIR_DOMAIN_DEVICE_HOSTDEV) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("address of type '%s' is supported only for hostdevs"), + _("address of type '%1$s' is supported only for hostdevs"), virDomainDeviceAddressTypeToString(info->type)); return -1; } -- 2.39.2

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com&gt; --- src/conf/node_device_conf.c | 178 ++++++++++++++++++------------------ 1 file changed, 87 insertions(+), 91 deletions(-) diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index af331baaf3..fcee9c027c 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -892,7 +892,7 @@ virNodeDevCapDRMParseXML(xmlXPathContextPtr ctxt, if ((val = virNodeDevDRMTypeFromString(type)) < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown drm type '%s' for '%s'"), type, def->name); + _("unknown drm type '%1$s' for '%2$s'"), type, def->name); return -1; } drm->type = val; @@ -937,7 +937,7 @@ virNodeDevCapMdevTypesParseXML(xmlXPathContextPtr ctxt, if (!(type->device_api = virXPathString("string(./deviceAPI[1])", ctxt))) { virReportError(VIR_ERR_XML_ERROR, - _("missing device API for mediated device type '%s'"), + _("missing device API for mediated device type '%1$s'"), type->id); goto cleanup; } @@ -945,8 +945,7 @@ virNodeDevCapMdevTypesParseXML(xmlXPathContextPtr ctxt, if (virXPathUInt("string(./availableInstances)", ctxt, &type->available_instances) < 0) { virReportError(VIR_ERR_XML_ERROR, - _("missing number of available instances for " - "mediated device type '%s'"), + _("missing number of available instances for mediated device type '%1$s'"), type->id); goto cleanup; } @@ -1104,17 +1103,18 @@ virNodeDeviceCapVPDParseXML(xmlXPathContextPtr ctxt, virPCIVPDResource **res) if (STREQ(access, "readonly")) { if (virNodeDeviceCapVPDParseReadOnlyFields(ctxt, newres) < 0) { virReportError(VIR_ERR_XML_ERROR, - _("Could not parse %s VPD resource fields"), access); + _("Could not parse %1$s VPD resource fields"), access); return -1; } } else if (STREQ(access, "readwrite")) { if (virNodeDeviceCapVPDParseReadWriteFields(ctxt, newres) < 0) { virReportError(VIR_ERR_XML_ERROR, - _("Could not parse %s VPD resource fields"), access); + _("Could not parse %1$s VPD resource fields"), access); return -1; } } else { - virReportError(VIR_ERR_XML_ERROR, _("Unsupported VPD field access type specified %s"), + virReportError(VIR_ERR_XML_ERROR, + _("Unsupported VPD field access type specified %1$s"), access); return -1; } @@ -1170,36 +1170,36 @@ virNodeDevCCWDeviceAddressParseXML(xmlXPathContextPtr ctxt, if (!(cssid = virXPathString("string(./cssid[1])", ctxt))) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("missing cssid value for '%s'"), dev_name); + _("missing cssid value for '%1$s'"), dev_name); return -1; } if (virStrToLong_uip(cssid, NULL, 0, &ccw_addr->cssid) < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("invalid cssid value '%s' for '%s'"), + _("invalid cssid value '%1$s' for '%2$s'"), cssid, dev_name); return -1; } if (!(ssid = virXPathString("string(./ssid[1])", ctxt))) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("missing ssid value for '%s'"), dev_name); + _("missing ssid value for '%1$s'"), dev_name); return -1; } if (virStrToLong_uip(ssid, NULL, 0, &ccw_addr->ssid) < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("invalid ssid value '%s' for '%s'"), + _("invalid ssid value '%1$s' for '%2$s'"), ssid, dev_name); return -1; } if (!(devno = virXPathString("string(./devno[1])", ctxt))) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("missing devno value for '%s'"), dev_name); + _("missing devno value for '%1$s'"), dev_name); return -1; } if (virStrToLong_uip(devno, NULL, 16, &ccw_addr->devno) < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("invalid devno value '%s' for '%s'"), + _("invalid devno value '%1$s' for '%2$s'"), devno, dev_name); return -1; } @@ -1312,13 +1312,13 @@ virNodeDevCapAPAdapterParseXML(xmlXPathContextPtr ctxt, if (!(adapter = virXPathString("string(./ap-adapter[1])", ctxt))) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("missing ap-adapter value for '%s'"), def->name); + _("missing ap-adapter value for '%1$s'"), def->name); return -1; } if (virStrToLong_uip(adapter, NULL, 0, ap_adapter) < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("invalid ap-adapter value '%s' for '%s'"), + _("invalid ap-adapter value '%1$s' for '%2$s'"), adapter, def->name); return -1; } @@ -1359,20 +1359,20 @@ virNodeDevCapAPQueueParseXML(xmlXPathContextPtr ctxt, if (!(dom = virXPathString("string(./ap-domain[1])", ctxt))) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("missing ap-domain value for '%s'"), def->name); + _("missing ap-domain value for '%1$s'"), def->name); return -1; } if (virStrToLong_uip(dom, NULL, 0, &ap_queue->ap_domain) < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("invalid ap-domain value '%s' for '%s'"), + _("invalid ap-domain value '%1$s' for '%2$s'"), dom, def->name); return -1; } if (ap_queue->ap_domain > 255) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("ap-domain value '%s' is out of range for '%s'"), + _("ap-domain value '%1$s' is out of range for '%2$s'"), dom, def->name); return -1; } @@ -1423,7 +1423,7 @@ virNodeDevCapStorageParseXML(xmlXPathContextPtr ctxt, storage->block = virXPathString("string(./block[1])", ctxt); if (!storage->block) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("no block device path supplied for '%s'"), + _("no block device path supplied for '%1$s'"), def->name); return -1; } @@ -1442,7 +1442,7 @@ virNodeDevCapStorageParseXML(xmlXPathContextPtr ctxt, if (!type) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("missing storage capability type for '%s'"), + _("missing storage capability type for '%1$s'"), def->name); return -1; } @@ -1464,8 +1464,8 @@ virNodeDevCapStorageParseXML(xmlXPathContextPtr ctxt, val = 0; if (virNodeDevCapsDefParseULongLong("string(./media_size[1])", ctxt, &val, def, - _("no removable media size supplied for '%s'"), - _("invalid removable media size supplied for '%s'")) < 0) { + _("no removable media size supplied for '%1$s'"), + _("invalid removable media size supplied for '%1$s'")) < 0) { return -1; } storage->removable_media_size = val; @@ -1473,7 +1473,7 @@ virNodeDevCapStorageParseXML(xmlXPathContextPtr ctxt, ctxt->node = orignode2; } else { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unknown storage capability type '%s' for '%s'"), + _("unknown storage capability type '%1$s' for '%2$s'"), type, def->name); return -1; } @@ -1482,8 +1482,8 @@ virNodeDevCapStorageParseXML(xmlXPathContextPtr ctxt, if (!(storage->flags & VIR_NODE_DEV_CAP_STORAGE_REMOVABLE)) { val = 0; if (virNodeDevCapsDefParseULongLong("string(./size[1])", ctxt, &val, def, - _("no size supplied for '%s'"), - _("invalid size supplied for '%s'")) < 0) + _("no size supplied for '%1$s'"), + _("invalid size supplied for '%1$s'")) < 0) return -1; storage->size = val; } @@ -1504,26 +1504,26 @@ virNodeDevCapSCSIParseXML(xmlXPathContextPtr ctxt, if (virNodeDevCapsDefParseUInt("string(./host[1])", ctxt, &scsi->host, def, - _("no SCSI host ID supplied for '%s'"), - _("invalid SCSI host ID supplied for '%s'")) < 0) + _("no SCSI host ID supplied for '%1$s'"), + _("invalid SCSI host ID supplied for '%1$s'")) < 0) return -1; if (virNodeDevCapsDefParseUInt("string(./bus[1])", ctxt, &scsi->bus, def, - _("no SCSI bus ID supplied for '%s'"), - _("invalid SCSI bus ID supplied for '%s'")) < 0) + _("no SCSI bus ID supplied for '%1$s'"), + _("invalid SCSI bus ID supplied for '%1$s'")) < 0) return -1; if (virNodeDevCapsDefParseUInt("string(./target[1])", ctxt, &scsi->target, def, - _("no SCSI target ID supplied for '%s'"), - _("invalid SCSI target ID supplied for '%s'")) < 0) + _("no SCSI target ID supplied for '%1$s'"), + _("invalid SCSI target ID supplied for '%1$s'")) < 0) return -1; if (virNodeDevCapsDefParseUInt("string(./lun[1])", ctxt, &scsi->lun, def, - _("no SCSI LUN ID supplied for '%s'"), - _("invalid SCSI LUN ID supplied for '%s'")) < 0) + _("no SCSI LUN ID supplied for '%1$s'"), + _("invalid SCSI LUN ID supplied for '%1$s'")) < 0) return -1; scsi->type = virXPathString("string(./type[1])", ctxt); @@ -1548,7 +1548,7 @@ virNodeDevCapSCSITargetParseXML(xmlXPathContextPtr ctxt, scsi_target->name = virXPathString("string(./target[1])", ctxt); if (!scsi_target->name) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("no target name supplied for '%s'"), + _("no target name supplied for '%1$s'"), def->name); return -1; } @@ -1562,7 +1562,7 @@ virNodeDevCapSCSITargetParseXML(xmlXPathContextPtr ctxt, if (!type) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("missing type for SCSI target capability for '%s'"), + _("missing type for SCSI target capability for '%1$s'"), def->name); return -1; } @@ -1576,20 +1576,20 @@ virNodeDevCapSCSITargetParseXML(xmlXPathContextPtr ctxt, ctxt, &scsi_target->rport) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("missing rport name for '%s'"), def->name); + _("missing rport name for '%1$s'"), def->name); return -1; } if (virNodeDevCapsDefParseString("string(./wwpn[1])", ctxt, &scsi_target->wwpn) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("missing wwpn identifier for '%s'"), + _("missing wwpn identifier for '%1$s'"), def->name); return -1; } } else { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unknown SCSI target capability type '%s' for '%s'"), + _("unknown SCSI target capability type '%1$s' for '%2$s'"), type, def->name); return -1; } @@ -1617,15 +1617,15 @@ virNodeDevCapSCSIHostParseXML(xmlXPathContextPtr ctxt, if (create == EXISTING_DEVICE) { if (virNodeDevCapsDefParseUInt("string(./host[1])", ctxt, &scsi_host->host, def, - _("no SCSI host ID supplied for '%s'"), - _("invalid SCSI host ID supplied for '%s'")) < 0) { + _("no SCSI host ID supplied for '%1$s'"), + _("invalid SCSI host ID supplied for '%1$s'")) < 0) { return -1; } /* Optional unique_id value */ scsi_host->unique_id = -1; if (virNodeDevCapsDefParseIntOptional("string(./unique_id[1])", ctxt, &scsi_host->unique_id, def, - _("invalid unique_id supplied for '%s'")) < 0) { + _("invalid unique_id supplied for '%1$s'")) < 0) { return -1; } } @@ -1639,7 +1639,7 @@ virNodeDevCapSCSIHostParseXML(xmlXPathContextPtr ctxt, if (!type) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("missing SCSI host capability type for '%s'"), + _("missing SCSI host capability type for '%1$s'"), def->name); return -1; } @@ -1658,8 +1658,7 @@ virNodeDevCapSCSIHostParseXML(xmlXPathContextPtr ctxt, &scsi_host->wwnn) < 0) { if (virRandomGenerateWWN(&scsi_host->wwnn, virt_type) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("no WWNN supplied for '%s', and " - "auto-generation failed"), + _("no WWNN supplied for '%1$s', and auto-generation failed"), def->name); return -1; } @@ -1670,8 +1669,7 @@ virNodeDevCapSCSIHostParseXML(xmlXPathContextPtr ctxt, &scsi_host->wwpn) < 0) { if (virRandomGenerateWWN(&scsi_host->wwpn, virt_type) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("no WWPN supplied for '%s', and " - "auto-generation failed"), + _("no WWPN supplied for '%1$s', and auto-generation failed"), def->name); return -1; } @@ -1684,7 +1682,7 @@ virNodeDevCapSCSIHostParseXML(xmlXPathContextPtr ctxt, } else { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unknown SCSI host capability type '%s' for '%s'"), + _("unknown SCSI host capability type '%1$s' for '%2$s'"), type, def->name); return -1; } @@ -1712,7 +1710,7 @@ virNodeDevCapNetParseXML(xmlXPathContextPtr ctxt, net->ifname = virXPathString("string(./interface[1])", ctxt); if (!net->ifname) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("no network interface supplied for '%s'"), + _("no network interface supplied for '%1$s'"), def->name); return -1; } @@ -1736,7 +1734,7 @@ virNodeDevCapNetParseXML(xmlXPathContextPtr ctxt, if ((val = virNetDevFeatureTypeFromString(tmp)) < 0) { virReportError(VIR_ERR_XML_ERROR, - _("unknown network device feature '%s'"), + _("unknown network device feature '%1$s'"), tmp); return -1; } @@ -1750,7 +1748,7 @@ virNodeDevCapNetParseXML(xmlXPathContextPtr ctxt, int val = virNodeDevNetCapTypeFromString(type); if (val < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("invalid network type supplied for '%s'"), + _("invalid network type supplied for '%1$s'"), def->name); return -1; } @@ -1777,26 +1775,26 @@ virNodeDevCapUSBInterfaceParseXML(xmlXPathContextPtr ctxt, if (virNodeDevCapsDefParseUInt("string(./number[1])", ctxt, &usb_if->number, def, - _("no USB interface number supplied for '%s'"), - _("invalid USB interface number supplied for '%s'")) < 0) + _("no USB interface number supplied for '%1$s'"), + _("invalid USB interface number supplied for '%1$s'")) < 0) return -1; if (virNodeDevCapsDefParseUInt("string(./class[1])", ctxt, &usb_if->klass, def, - _("no USB interface class supplied for '%s'"), - _("invalid USB interface class supplied for '%s'")) < 0) + _("no USB interface class supplied for '%1$s'"), + _("invalid USB interface class supplied for '%1$s'")) < 0) return -1; if (virNodeDevCapsDefParseUInt("string(./subclass[1])", ctxt, &usb_if->subclass, def, - _("no USB interface subclass supplied for '%s'"), - _("invalid USB interface subclass supplied for '%s'")) < 0) + _("no USB interface subclass supplied for '%1$s'"), + _("invalid USB interface subclass supplied for '%1$s'")) < 0) return -1; if (virNodeDevCapsDefParseUInt("string(./protocol[1])", ctxt, &usb_if->protocol, def, - _("no USB interface protocol supplied for '%s'"), - _("invalid USB interface protocol supplied for '%s'")) < 0) + _("no USB interface protocol supplied for '%1$s'"), + _("invalid USB interface protocol supplied for '%1$s'")) < 0) return -1; usb_if->description = virXPathString("string(./description[1])", ctxt); @@ -1839,26 +1837,26 @@ virNodeDevCapUSBDevParseXML(xmlXPathContextPtr ctxt, if (virNodeDevCapsDefParseUInt("string(./bus[1])", ctxt, &usb_dev->bus, def, - _("no USB bus number supplied for '%s'"), - _("invalid USB bus number supplied for '%s'")) < 0) + _("no USB bus number supplied for '%1$s'"), + _("invalid USB bus number supplied for '%1$s'")) < 0) return -1; if (virNodeDevCapsDefParseUInt("string(./device[1])", ctxt, &usb_dev->device, def, - _("no USB device number supplied for '%s'"), - _("invalid USB device number supplied for '%s'")) < 0) + _("no USB device number supplied for '%1$s'"), + _("invalid USB device number supplied for '%1$s'")) < 0) return -1; if (virNodeDevCapsDefParseHexId("string(./vendor[1]/@id)", ctxt, &usb_dev->vendor, def, - _("no USB vendor ID supplied for '%s'"), - _("invalid USB vendor ID supplied for '%s'")) < 0) + _("no USB vendor ID supplied for '%1$s'"), + _("invalid USB vendor ID supplied for '%1$s'")) < 0) return -1; if (virNodeDevCapsDefParseHexId("string(./product[1]/@id)", ctxt, &usb_dev->product, def, - _("no USB product ID supplied for '%s'"), - _("invalid USB product ID supplied for '%s'")) < 0) + _("no USB product ID supplied for '%1$s'"), + _("invalid USB product ID supplied for '%1$s'")) < 0) return -1; usb_dev->vendor_name = virXPathString("string(./vendor[1])", ctxt); @@ -2075,7 +2073,7 @@ virNodeDevCapPCIDevParseXML(xmlXPathContextPtr ctxt, if (virStrToLong_i(tmp, NULL, 16, &pci_dev->klass) < 0 || pci_dev->klass > 0xffffff) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("invalid PCI class supplied for '%s'"), def->name); + _("invalid PCI class supplied for '%1$s'"), def->name); goto out; } } else { @@ -2084,38 +2082,38 @@ virNodeDevCapPCIDevParseXML(xmlXPathContextPtr ctxt, if (virNodeDevCapsDefParseUInt("string(./domain[1])", ctxt, &pci_dev->domain, def, - _("no PCI domain ID supplied for '%s'"), - _("invalid PCI domain ID supplied for '%s'")) < 0) + _("no PCI domain ID supplied for '%1$s'"), + _("invalid PCI domain ID supplied for '%1$s'")) < 0) goto out; if (virNodeDevCapsDefParseUInt("string(./bus[1])", ctxt, &pci_dev->bus, def, - _("no PCI bus ID supplied for '%s'"), - _("invalid PCI bus ID supplied for '%s'")) < 0) + _("no PCI bus ID supplied for '%1$s'"), + _("invalid PCI bus ID supplied for '%1$s'")) < 0) goto out; if (virNodeDevCapsDefParseUInt("string(./slot[1])", ctxt, &pci_dev->slot, def, - _("no PCI slot ID supplied for '%s'"), - _("invalid PCI slot ID supplied for '%s'")) < 0) + _("no PCI slot ID supplied for '%1$s'"), + _("invalid PCI slot ID supplied for '%1$s'")) < 0) goto out; if (virNodeDevCapsDefParseUInt("string(./function[1])", ctxt, &pci_dev->function, def, - _("no PCI function ID supplied for '%s'"), - _("invalid PCI function ID supplied for '%s'")) < 0) + _("no PCI function ID supplied for '%1$s'"), + _("invalid PCI function ID supplied for '%1$s'")) < 0) goto out; if (virNodeDevCapsDefParseHexId("string(./vendor[1]/@id)", ctxt, &pci_dev->vendor, def, - _("no PCI vendor ID supplied for '%s'"), - _("invalid PCI vendor ID supplied for '%s'")) < 0) + _("no PCI vendor ID supplied for '%1$s'"), + _("invalid PCI vendor ID supplied for '%1$s'")) < 0) goto out; if (virNodeDevCapsDefParseHexId("string(./product[1]/@id)", ctxt, &pci_dev->product, def, - _("no PCI product ID supplied for '%s'"), - _("invalid PCI product ID supplied for '%s'")) < 0) + _("no PCI product ID supplied for '%1$s'"), + _("invalid PCI product ID supplied for '%1$s'")) < 0) goto out; pci_dev->vendor_name = virXPathString("string(./vendor[1])", ctxt); @@ -2140,7 +2138,7 @@ virNodeDevCapPCIDevParseXML(xmlXPathContextPtr ctxt, pci_dev->numa_node = -1; if (virNodeDevCapsDefParseIntOptional("string(./numa[1]/@node)", ctxt, &pci_dev->numa_node, def, - _("invalid NUMA node ID supplied for '%s'")) < 0) + _("invalid NUMA node ID supplied for '%1$s'")) < 0) goto out; if ((pciExpress = virXPathNode("./pci-express[1]", ctxt))) { @@ -2182,13 +2180,13 @@ virNodeDevCapSystemParseXML(xmlXPathContextPtr ctxt, tmp = virXPathString("string(./hardware/uuid[1])", ctxt); if (!tmp) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("no system UUID supplied for '%s'"), def->name); + _("no system UUID supplied for '%1$s'"), def->name); return -1; } if (virUUIDParse(tmp, hardware->uuid) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("malformed uuid element for '%s'"), def->name); + _("malformed uuid element for '%1$s'"), def->name); return -1; } @@ -2237,7 +2235,7 @@ virNodeDevCapMdevParseXML(xmlXPathContextPtr ctxt, if (!(mdev->type = virXPathString("string(./type[1]/@id)", ctxt))) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("missing type id attribute for '%s'"), def->name); + _("missing type id attribute for '%1$s'"), def->name); return -1; } @@ -2246,7 +2244,7 @@ virNodeDevCapMdevParseXML(xmlXPathContextPtr ctxt, /* make sure that the provided uuid is valid */ if (virUUIDParse(uuidstr, uuidbuf) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Invalid uuid '%s' for new mdev device"), uuidstr); + _("Invalid uuid '%1$s' for new mdev device"), uuidstr); return -1; } mdev->uuid = g_new0(char, VIR_UUID_STRING_BUFLEN); @@ -2258,7 +2256,7 @@ virNodeDevCapMdevParseXML(xmlXPathContextPtr ctxt, if (virXPathUInt("string(./iommuGroup[1]/@number)", ctxt, &mdev->iommuGroupNumber) < -1) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("invalid iommuGroup number attribute for '%s'"), + _("invalid iommuGroup number attribute for '%1$s'"), def->name); return -1; } @@ -2353,7 +2351,7 @@ virNodeDevCapsDefParseXML(xmlXPathContextPtr ctxt, case VIR_NODE_DEV_CAP_VPD: case VIR_NODE_DEV_CAP_LAST: virReportError(VIR_ERR_INTERNAL_ERROR, - _("unknown capability type '%d' for '%s'"), + _("unknown capability type '%1$d' for '%2$s'"), caps->data.type, def->name); ret = -1; break; @@ -2426,16 +2424,14 @@ virNodeDeviceDefParseXML(xmlXPathContextPtr ctxt, def->parent_wwpn = virXPathString("string(./parent[1]/@wwpn)", ctxt); if (def->parent_wwnn && !def->parent_wwpn) { virReportError(VIR_ERR_XML_ERROR, - _("when providing parent wwnn='%s', the " - "wwpn must also be provided"), + _("when providing parent wwnn='%1$s', the wwpn must also be provided"), def->parent_wwnn); return NULL; } if (!def->parent_wwnn && def->parent_wwpn) { virReportError(VIR_ERR_XML_ERROR, - _("when providing parent wwpn='%s', the " - "wwnn must also be provided"), + _("when providing parent wwpn='%1$s', the wwnn must also be provided"), def->parent_wwpn); return NULL; } @@ -2448,7 +2444,7 @@ virNodeDeviceDefParseXML(xmlXPathContextPtr ctxt, if (n == 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("no device capabilities for '%s'"), + _("no device capabilities for '%1$s'"), def->name); return NULL; } -- 2.39.2

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com&gt; --- src/cpu/cpu.c | 40 +++++++++++++------------- src/cpu/cpu_arm.c | 23 ++++++++------- src/cpu/cpu_map.c | 6 ++-- src/cpu/cpu_ppc64.c | 33 ++++++++++------------ src/cpu/cpu_s390.c | 5 ++-- src/cpu/cpu_x86.c | 68 +++++++++++++++++++++------------------------ 6 files changed, 83 insertions(+), 92 deletions(-) diff --git a/src/cpu/cpu.c b/src/cpu/cpu.c index 26f41272a7..bb5737e938 100644 --- a/src/cpu/cpu.c +++ b/src/cpu/cpu.c @@ -64,7 +64,7 @@ cpuGetSubDriver(virArch arch) } virReportError(VIR_ERR_NO_SUPPORT, - _("'%s' architecture is not supported by CPU driver"), + _("'%1$s' architecture is not supported by CPU driver"), virArchToString(arch)); return NULL; } @@ -81,7 +81,7 @@ cpuGetSubDriverByName(const char *name) } virReportError(VIR_ERR_INTERNAL_ERROR, - _("CPU driver '%s' does not exist"), + _("CPU driver '%1$s' does not exist"), name); return NULL; } @@ -156,7 +156,7 @@ virCPUCompare(virArch arch, if (!driver->compare) { virReportError(VIR_ERR_NO_SUPPORT, - _("cannot compare CPUs of %s architecture"), + _("cannot compare CPUs of %1$s architecture"), virArchToString(arch)); return VIR_CPU_COMPARE_ERROR; } @@ -210,7 +210,7 @@ cpuDecode(virCPUDef *cpu, if (driver->decode == NULL) { virReportError(VIR_ERR_NO_SUPPORT, - _("cannot decode CPU data for %s architecture"), + _("cannot decode CPU data for %1$s architecture"), virArchToString(cpu->arch)); return -1; } @@ -266,7 +266,7 @@ cpuEncode(virArch arch, if (driver->encode == NULL) { virReportError(VIR_ERR_NO_SUPPORT, - _("cannot encode CPU data for %s architecture"), + _("cannot encode CPU data for %1$s architecture"), virArchToString(arch)); return -1; } @@ -417,7 +417,7 @@ virCPUGetHost(virArch arch, case VIR_CPU_TYPE_GUEST: if (nodeInfo) { virReportError(VIR_ERR_INVALID_ARG, - _("cannot set topology for CPU type '%s'"), + _("cannot set topology for CPU type '%1$s'"), virCPUTypeToString(type)); return NULL; } @@ -427,7 +427,7 @@ virCPUGetHost(virArch arch, case VIR_CPU_TYPE_AUTO: case VIR_CPU_TYPE_LAST: virReportError(VIR_ERR_INVALID_ARG, - _("unsupported CPU type: %s"), + _("unsupported CPU type: %1$s"), virCPUTypeToString(type)); return NULL; } @@ -450,7 +450,7 @@ virCPUGetHost(virArch arch, virArchToString(arch)); } else { virReportError(VIR_ERR_NO_SUPPORT, - _("cannot detect host CPU model for %s architecture"), + _("cannot detect host CPU model for %1$s architecture"), virArchToString(arch)); return NULL; } @@ -524,12 +524,12 @@ virCPUBaseline(virArch arch, for (i = 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; } } @@ -542,7 +542,7 @@ virCPUBaseline(virArch arch, if (!driver->baseline) { virReportError(VIR_ERR_NO_SUPPORT, - _("cannot compute baseline CPU of %s architecture"), + _("cannot compute baseline CPU of %1$s architecture"), virArchToString(arch)); return NULL; } @@ -614,7 +614,7 @@ virCPUUpdate(virArch arch, if (!driver->update) { virReportError(VIR_ERR_NO_SUPPORT, - _("cannot update guest CPU for %s architecture"), + _("cannot update guest CPU for %1$s architecture"), virArchToString(arch)); return -1; } @@ -701,7 +701,7 @@ virCPUCheckFeature(virArch arch, if (!driver->checkFeature) { virReportError(VIR_ERR_NO_SUPPORT, - _("cannot check guest CPU feature for %s architecture"), + _("cannot check guest CPU feature for %1$s architecture"), virArchToString(arch)); return -1; } @@ -738,7 +738,7 @@ virCPUCheckForbiddenFeatures(virCPUDef *guest, const virCPUDef *host) continue; virReportError(VIR_ERR_CPU_INCOMPATIBLE, - _("Host CPU provides forbidden feature '%s'"), + _("Host CPU provides forbidden feature '%1$s'"), guest->features[i].name); return -1; } @@ -772,7 +772,7 @@ virCPUDataCheckFeature(const virCPUData *data, if (!driver->dataCheckFeature) { virReportError(VIR_ERR_NO_SUPPORT, - _("cannot check guest CPU feature for %s architecture"), + _("cannot check guest CPU feature for %1$s architecture"), virArchToString(data->arch)); return -1; } @@ -802,7 +802,7 @@ virCPUDataFormat(const virCPUData *data) if (!driver->dataFormat) { virReportError(VIR_ERR_NO_SUPPORT, - _("cannot format %s CPU data"), + _("cannot format %1$s CPU data"), virArchToString(data->arch)); return NULL; } @@ -862,7 +862,7 @@ virCPUData *virCPUDataParseNode(xmlNodePtr node) return NULL; if (!driver->dataParse) { - virReportError(VIR_ERR_NO_SUPPORT, _("cannot parse %s CPU data"), arch); + virReportError(VIR_ERR_NO_SUPPORT, _("cannot parse %1$s CPU data"), arch); return NULL; } @@ -988,14 +988,14 @@ virCPUTranslate(virArch arch, if (cpu->fallback != VIR_CPU_FALLBACK_ALLOW) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("CPU model %s is not supported by hypervisor"), + _("CPU model %1$s is not supported by hypervisor"), cpu->model); return -1; } if (!driver->translate) { virReportError(VIR_ERR_NO_SUPPORT, - _("cannot translate CPU model %s to a supported model"), + _("cannot translate CPU model %1$s to a supported model"), cpu->model); return -1; } @@ -1177,7 +1177,7 @@ virCPUDataAddFeature(virCPUData *cpuData, if (!driver->dataAddFeature) { virReportError(VIR_ERR_NO_SUPPORT, - _("cannot add guest CPU feature for %s architecture"), + _("cannot add guest CPU feature for %1$s architecture"), virArchToString(cpuData->arch)); return -1; } diff --git a/src/cpu/cpu_arm.c b/src/cpu/cpu_arm.c index 8e562bd7a3..324c701e81 100644 --- a/src/cpu/cpu_arm.c +++ b/src/cpu/cpu_arm.c @@ -252,7 +252,7 @@ virCPUarmMapFeatureParse(xmlXPathContextPtr ctxt G_GNUC_UNUSED, if (virCPUarmMapFeatureFind(map, name)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("CPU feature %s already defined"), name); + _("CPU feature %1$s already defined"), name); return -1; } @@ -307,7 +307,7 @@ virCPUarmVendorParse(xmlXPathContextPtr ctxt, if (virCPUarmVendorFindByName(map, vendor->name)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("CPU vendor %s already defined"), + _("CPU vendor %1$s already defined"), vendor->name); return -1; } @@ -318,7 +318,7 @@ virCPUarmVendorParse(xmlXPathContextPtr ctxt, if (virCPUarmVendorFindByID(map, vendor->value)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("CPU vendor value 0x%2llx already defined"), + _("CPU vendor value 0x%1$2llx already defined"), vendor->value); return -1; } @@ -373,7 +373,7 @@ virCPUarmModelParse(xmlXPathContextPtr ctxt, if (virCPUarmModelFind(map, model->name)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("CPU model %s already defined"), + _("CPU model %1$s already defined"), model->name); return -1; } @@ -386,7 +386,7 @@ virCPUarmModelParse(xmlXPathContextPtr ctxt, if (!(model->vendor = virCPUarmVendorFindByName(map, vendor))) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unknown vendor %s referenced by CPU model %s"), + _("Unknown vendor %1$s referenced by CPU model %2$s"), vendor, model->name); return -1; } @@ -394,7 +394,7 @@ virCPUarmModelParse(xmlXPathContextPtr ctxt, if (!(pvrNode = virXPathNode("./pvr", ctxt))) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Missing PVR information for CPU model %s"), + _("Missing PVR information for CPU model %1$s"), model->name); return -1; } @@ -520,8 +520,7 @@ virCPUarmCompare(virCPUDef *host, if (failIncompatible) { virReportError(VIR_ERR_CPU_INCOMPATIBLE, - _("Host CPU model does not match required CPU " - "vendor %s or(and) model %s"), + _("Host CPU model does not match required CPU vendor %1$s or(and) model %2$s"), NULLSTR(cpu->vendor), NULLSTR(cpu->model)); return VIR_CPU_COMPARE_ERROR; } @@ -546,7 +545,7 @@ virCPUarmValidateFeatures(virCPUDef *cpu) if (!virCPUarmMapFeatureFind(map, feature->name)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown CPU feature: %s"), + _("unknown CPU feature: %1$s"), feature->name); return -1; } @@ -635,14 +634,14 @@ virCPUarmDecode(virCPUDef *cpu, if (!(model = virCPUarmModelFindByPVR(map, cpuData->pvr))) { virReportError(VIR_ERR_OPERATION_FAILED, - _("Cannot find CPU model with PVR 0x%03llx"), + _("Cannot find CPU model with PVR 0x%1$03llx"), cpuData->pvr); return -1; } if (!virCPUModelIsAllowed(model->name, models)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("CPU model %s is not supported by hypervisor"), + _("CPU model %1$s is not supported by hypervisor"), model->name); return -1; } @@ -652,7 +651,7 @@ virCPUarmDecode(virCPUDef *cpu, if (cpuData->vendor_id && !(vendor = virCPUarmVendorFindByID(map, cpuData->vendor_id))) { virReportError(VIR_ERR_OPERATION_FAILED, - _("Cannot find CPU vendor with vendor id 0x%02llx"), + _("Cannot find CPU vendor with vendor id 0x%1$02llx"), cpuData->vendor_id); return -1; } diff --git a/src/cpu/cpu_map.c b/src/cpu/cpu_map.c index 1d8051a13b..16795a9a0a 100644 --- a/src/cpu/cpu_map.c +++ b/src/cpu/cpu_map.c @@ -47,7 +47,7 @@ loadData(const char *mapfile, if (n > 0 && !callback) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unexpected element '%s' in CPU map '%s'"), element, mapfile); + _("Unexpected element '%1$s' in CPU map '%2$s'"), element, mapfile); return -1; } @@ -56,7 +56,7 @@ loadData(const char *mapfile, if (!(name = virXMLPropString(nodes[i], "name"))) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("cannot find %s name in CPU map '%s'"), element, mapfile); + _("cannot find %1$s name in CPU map '%2$s'"), element, mapfile); return -1; } VIR_DEBUG("Load %s name %s", element, name); @@ -173,7 +173,7 @@ int cpuMapLoad(const char *arch, if ((ctxt->node = virXPathNode(xpath, ctxt)) == NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("cannot find CPU map for %s architecture"), arch); + _("cannot find CPU map for %1$s architecture"), arch); return -1; } diff --git a/src/cpu/cpu_ppc64.c b/src/cpu/cpu_ppc64.c index a33e4da9a9..e13cdbdf6b 100644 --- a/src/cpu/cpu_ppc64.c +++ b/src/cpu/cpu_ppc64.c @@ -110,7 +110,7 @@ ppc64CheckCompatibilityMode(const char *host_model, virStrToLong_i(tmp, NULL, 10, &compat) < 0 || compat < 6 || compat > 10) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unknown compatibility mode %s"), + _("Unknown compatibility mode %1$s"), compat_mode); return VIR_CPU_COMPARE_ERROR; } @@ -246,7 +246,7 @@ ppc64ModelFromCPU(const virCPUDef *cpu, if (!(model = ppc64ModelFind(map, cpu->model))) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unknown CPU model %s"), cpu->model); + _("Unknown CPU model %1$s"), cpu->model); return NULL; } @@ -286,7 +286,7 @@ ppc64VendorParse(xmlXPathContextPtr ctxt G_GNUC_UNUSED, if (ppc64VendorFind(map, vendor->name)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("CPU vendor %s already defined"), vendor->name); + _("CPU vendor %1$s already defined"), vendor->name); return -1; } @@ -313,7 +313,7 @@ ppc64ModelParse(xmlXPathContextPtr ctxt, if (ppc64ModelFind(map, model->name)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("CPU model %s already defined"), model->name); + _("CPU model %1$s already defined"), model->name); return -1; } @@ -321,14 +321,14 @@ ppc64ModelParse(xmlXPathContextPtr ctxt, vendor = virXPathString("string(./vendor/@name)", ctxt); if (!vendor) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Invalid vendor element in CPU model %s"), + _("Invalid vendor element in CPU model %1$s"), model->name); return -1; } if (!(model->vendor = ppc64VendorFind(map, vendor))) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unknown vendor %s referenced by CPU model %s"), + _("Unknown vendor %1$s referenced by CPU model %2$s"), vendor, model->name); return -1; } @@ -336,7 +336,7 @@ ppc64ModelParse(xmlXPathContextPtr ctxt, if ((n = virXPathNodeSet("./pvr", ctxt, &nodes)) <= 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Missing PVR information for CPU model %s"), + _("Missing PVR information for CPU model %1$s"), model->name); return -1; } @@ -428,7 +428,7 @@ ppc64Compute(virCPUDef *host, VIR_DEBUG("CPU arch %s does not match host arch", virArchToString(cpu->arch)); if (message) - *message = g_strdup_printf(_("CPU arch %s does not match host arch"), + *message = g_strdup_printf(_("CPU arch %1$s does not match host arch"), virArchToString(cpu->arch)); return VIR_CPU_COMPARE_INCOMPATIBLE; @@ -440,8 +440,7 @@ ppc64Compute(virCPUDef *host, VIR_DEBUG("host CPU vendor does not match required CPU vendor %s", cpu->vendor); if (message) { - *message = g_strdup_printf(_("host CPU vendor does not match required " - "CPU vendor %s"), + *message = g_strdup_printf(_("host CPU vendor does not match required CPU vendor %1$s"), cpu->vendor); } @@ -497,8 +496,7 @@ ppc64Compute(virCPUDef *host, VIR_DEBUG("host CPU model does not match required CPU model %s", guest_model->name); if (message) { - *message = g_strdup_printf(_("host CPU model does not match required " - "CPU model %s"), + *message = g_strdup_printf(_("host CPU model does not match required CPU model %1$s"), guest_model->name); } @@ -554,14 +552,14 @@ ppc64DriverDecode(virCPUDef *cpu, if (!(model = ppc64ModelFindPVR(map, data->data.ppc64.pvr[0].value))) { virReportError(VIR_ERR_OPERATION_FAILED, - _("Cannot find CPU model with PVR 0x%08x"), + _("Cannot find CPU model with PVR 0x%1$08x"), data->data.ppc64.pvr[0].value); return -1; } if (!virCPUModelIsAllowed(model->name, models)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("CPU model %s is not supported by hypervisor"), + _("CPU model %1$s is not supported by hypervisor"), model->name); return -1; } @@ -687,7 +685,7 @@ virCPUppc64Baseline(virCPUDef **cpus, if (!(model = ppc64ModelFind(map, cpus[0]->model))) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unknown CPU model %s"), cpus[0]->model); + _("Unknown CPU model %1$s"), cpus[0]->model); return NULL; } @@ -716,15 +714,14 @@ virCPUppc64Baseline(virCPUDef **cpus, if (!(vnd = ppc64VendorFind(map, cpus[i]->vendor))) { virReportError(VIR_ERR_OPERATION_FAILED, - _("Unknown CPU vendor %s"), cpus[i]->vendor); + _("Unknown CPU vendor %1$s"), cpus[i]->vendor); return NULL; } if (model->vendor) { if (model->vendor != vnd) { virReportError(VIR_ERR_OPERATION_FAILED, - _("CPU vendor %s of model %s differs from " - "vendor %s"), + _("CPU vendor %1$s of model %2$s differs from vendor %3$s"), model->vendor->name, model->name, vnd->name); return NULL; diff --git a/src/cpu/cpu_s390.c b/src/cpu/cpu_s390.c index 1de5251974..ffb1a2cf7b 100644 --- a/src/cpu/cpu_s390.c +++ b/src/cpu/cpu_s390.c @@ -53,7 +53,7 @@ virCPUs390Update(virCPUDef *guest, if (guest->mode == VIR_CPU_MODE_CUSTOM) { if (guest->match == VIR_CPU_MATCH_MINIMUM) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("match mode %s not supported"), + _("match mode %1$s not supported"), virCPUMatchTypeToString(guest->match)); } else { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", @@ -94,8 +94,7 @@ virCPUs390ValidateFeatures(virCPUDef *cpu) for (i = 0; i < cpu->nfeatures; i++) { if (cpu->features[i].policy == VIR_CPU_FEATURE_OPTIONAL) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("only cpu feature policies 'require' and " - "'disable' are supported for %s"), + _("only cpu feature policies 'require' and 'disable' are supported for %1$s"), cpu->features[i].name); return -1; } diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c index a8a537cbb6..8d371d5501 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -681,7 +681,7 @@ virCPUx86VendorToData(const char *vendor, if (strlen(vendor) != VENDOR_STRING_LENGTH) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Invalid CPU vendor string '%s'"), vendor); + _("Invalid CPU vendor string '%1$s'"), vendor); return -1; } @@ -946,14 +946,14 @@ x86VendorParse(xmlXPathContextPtr ctxt, if (x86VendorFind(map, vendor->name)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("CPU vendor %s already defined"), vendor->name); + _("CPU vendor %1$s already defined"), vendor->name); return -1; } string = virXPathString("string(@string)", ctxt); if (!string) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Missing vendor string for CPU vendor %s"), + _("Missing vendor string for CPU vendor %1$s"), vendor->name); return -1; } @@ -990,7 +990,7 @@ x86FeatureInData(const char *name, if (!(feature = x86FeatureFind(map, name)) && !(feature = x86FeatureFindInternal(name))) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unknown CPU feature %s"), name); + _("unknown CPU feature %1$s"), name); return -1; } @@ -1113,13 +1113,13 @@ x86ParseDataItemList(virCPUx86Data *cpudata, if (virXMLNodeNameEqual(node, "cpuid")) { if (x86ParseCPUID(node, &item) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Invalid cpuid[%zu]"), i); + _("Invalid cpuid[%1$zu]"), i); return -1; } } else { if (x86ParseMSR(node, &item) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Invalid msr[%zu]"), i); + _("Invalid msr[%1$zu]"), i); return -1; } } @@ -1149,7 +1149,7 @@ x86FeatureParse(xmlXPathContextPtr ctxt, if (x86FeatureFind(map, feature->name)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("CPU feature %s already defined"), feature->name); + _("CPU feature %1$s already defined"), feature->name); return -1; } @@ -1348,7 +1348,7 @@ x86ModelFromCPU(const virCPUDef *cpu, (policy == VIR_CPU_FEATURE_REQUIRE || policy == -1)) { if (!(model = x86ModelFind(map, cpu->model))) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unknown CPU model %s"), cpu->model); + _("Unknown CPU model %1$s"), cpu->model); return NULL; } @@ -1372,7 +1372,7 @@ x86ModelFromCPU(const virCPUDef *cpu, if (!(feature = x86FeatureFind(map, cpu->features[i].name))) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unknown CPU feature %s"), cpu->features[i].name); + _("Unknown CPU feature %1$s"), cpu->features[i].name); return NULL; } @@ -1460,7 +1460,7 @@ x86ModelParseDecode(virCPUx86Model *model, if (!(decode_node = virXPathNode("./decode", ctxt))) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("missing decode element in CPU model %s"), + _("missing decode element in CPU model %1$s"), model->name); return -1; } @@ -1496,14 +1496,14 @@ x86ModelParseAncestor(virCPUx86Model *model, name = virXPathString("string(./model/@name)", ctxt); if (!name) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Missing ancestor's name in CPU model %s"), + _("Missing ancestor's name in CPU model %1$s"), model->name); return -1; } if (!(ancestor = x86ModelFind(map, name))) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Ancestor model %s not found for CPU model %s"), + _("Ancestor model %1$s not found for CPU model %2$s"), name, model->name); return -1; } @@ -1543,7 +1543,7 @@ x86ModelParseSignatures(virCPUx86Model *model, rc = virXPathUInt("string(@family)", ctxt, &sig->family); if (rc < 0 || sig->family == 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Invalid CPU signature family in model %s"), + _("Invalid CPU signature family in model %1$s"), model->name); return -1; } @@ -1551,7 +1551,7 @@ x86ModelParseSignatures(virCPUx86Model *model, rc = virXPathUInt("string(@model)", ctxt, &sig->model); if (rc < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Invalid CPU signature model in model %s"), + _("Invalid CPU signature model in model %1$s"), model->name); return -1; } @@ -1580,14 +1580,14 @@ x86ModelParseVendor(virCPUx86Model *model, vendor = virXPathString("string(./vendor/@name)", ctxt); if (!vendor) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Invalid vendor element in CPU model %s"), + _("Invalid vendor element in CPU model %1$s"), model->name); return -1; } if (!(model->vendor = x86VendorFind(map, vendor))) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unknown vendor %s referenced by CPU model %s"), + _("Unknown vendor %1$s referenced by CPU model %2$s"), vendor, model->name); return -1; } @@ -1618,14 +1618,14 @@ x86ModelParseFeatures(virCPUx86Model *model, if (!(ftname = virXMLPropString(nodes[i], "name"))) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Missing feature name for CPU model %s"), + _("Missing feature name for CPU model %1$s"), model->name); return -1; } if (!(feature = x86FeatureFind(map, ftname))) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Feature %s required by CPU model %s not found"), + _("Feature %1$s required by CPU model %2$s not found"), ftname, model->name); return -1; } @@ -1660,7 +1660,7 @@ x86ModelParse(xmlXPathContextPtr ctxt, if (x86ModelFind(map, name)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Multiple definitions of CPU model '%s'"), name); + _("Multiple definitions of CPU model '%1$s'"), name); return -1; } @@ -1857,7 +1857,7 @@ x86Compute(virCPUDef *host, VIR_DEBUG("CPU arch %s does not match host arch", virArchToString(cpu->arch)); if (message) { - *message = g_strdup_printf(_("CPU arch %s does not match host arch"), + *message = g_strdup_printf(_("CPU arch %1$s does not match host arch"), virArchToString(cpu->arch)); } return VIR_CPU_COMPARE_INCOMPATIBLE; @@ -1869,8 +1869,7 @@ x86Compute(virCPUDef *host, VIR_DEBUG("host CPU vendor does not match required CPU vendor %s", cpu->vendor); if (message) { - *message = g_strdup_printf(_("host CPU vendor does not match required " - "CPU vendor %s"), + *message = g_strdup_printf(_("host CPU vendor does not match required CPU vendor %1$s"), cpu->vendor); } @@ -2196,7 +2195,7 @@ x86Decode(virCPUDef *cpu, STREQ(candidate->name, preferred[0])) { if (cpu->fallback != VIR_CPU_FALLBACK_ALLOW) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("CPU model %s is not supported by hypervisor"), + _("CPU model %1$s is not supported by hypervisor"), preferred[0]); return -1; } else { @@ -2379,7 +2378,7 @@ x86Encode(virArch arch, if (cpu->vendor && !(v = x86VendorFind(map, cpu->vendor))) { virReportError(VIR_ERR_OPERATION_FAILED, - _("CPU vendor %s not found"), cpu->vendor); + _("CPU vendor %1$s not found"), cpu->vendor); return -1; } @@ -2840,7 +2839,7 @@ virCPUx86Baseline(virCPUDef **cpus, outputVendor = false; } else if (!(vendor = x86VendorFind(map, cpus[0]->vendor))) { virReportError(VIR_ERR_OPERATION_FAILED, - _("Unknown CPU vendor %s"), cpus[0]->vendor); + _("Unknown CPU vendor %1$s"), cpus[0]->vendor); return NULL; } @@ -2862,7 +2861,7 @@ virCPUx86Baseline(virCPUDef **cpus, if (cpus[i]->vendor && model->vendor && STRNEQ(cpus[i]->vendor, model->vendor->name)) { virReportError(VIR_ERR_OPERATION_FAILED, - _("CPU vendor %s of model %s differs from vendor %s"), + _("CPU vendor %1$s of model %2$s differs from vendor %3$s"), model->vendor->name, model->name, cpus[i]->vendor); return NULL; } @@ -2879,7 +2878,7 @@ virCPUx86Baseline(virCPUDef **cpus, if (!vendor) { if (!(vendor = x86VendorFind(map, vn))) { virReportError(VIR_ERR_OPERATION_FAILED, - _("Unknown CPU vendor %s"), vn); + _("Unknown CPU vendor %1$s"), vn); return NULL; } } else if (STRNEQ(vendor->name, vn)) { @@ -3008,7 +3007,7 @@ virCPUx86Update(virCPUDef *guest, if (!(guestModel = x86ModelFind(map, guest->model))) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unknown CPU model %s"), guest->model); + _("Unknown CPU model %1$s"), guest->model); return -1; } @@ -3097,18 +3096,15 @@ virCPUx86UpdateLive(virCPUDef *cpu, if (added || removed) { if (added && removed) virReportError(VIR_ERR_OPERATION_FAILED, - _("guest CPU doesn't match specification: " - "extra features: %s, missing features: %s"), + _("guest CPU doesn't match specification: extra features: %1$s, missing features: %2$s"), added, removed); else if (added) virReportError(VIR_ERR_OPERATION_FAILED, - _("guest CPU doesn't match specification: " - "extra features: %s"), + _("guest CPU doesn't match specification: extra features: %1$s"), added); else virReportError(VIR_ERR_OPERATION_FAILED, - _("guest CPU doesn't match specification: " - "missing features: %s"), + _("guest CPU doesn't match specification: missing features: %1$s"), removed); return -1; } @@ -3218,7 +3214,7 @@ virCPUx86ExpandFeatures(virCPUDef *cpu) if (!(model = x86ModelFind(map, cpu->model))) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unknown CPU model %s"), cpu->model); + _("unknown CPU model %1$s"), cpu->model); return -1; } @@ -3293,7 +3289,7 @@ virCPUx86ValidateFeatures(virCPUDef *cpu) for (i = 0; i < cpu->nfeatures; i++) { if (!x86FeatureFind(map, cpu->features[i].name)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown CPU feature: %s"), + _("unknown CPU feature: %1$s"), cpu->features[i].name); return -1; } -- 2.39.2

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com&gt; --- src/hyperv/hyperv_driver.c | 46 +++++++++++++++--------------- src/hyperv/hyperv_network_driver.c | 4 +-- src/hyperv/hyperv_util.c | 3 +- src/hyperv/hyperv_wmi.c | 43 ++++++++++++++-------------- 4 files changed, 47 insertions(+), 49 deletions(-) diff --git a/src/hyperv/hyperv_driver.c b/src/hyperv/hyperv_driver.c index 5c3c810ba5..414274fdfd 100644 --- a/src/hyperv/hyperv_driver.c +++ b/src/hyperv/hyperv_driver.c @@ -69,7 +69,7 @@ hypervGetProcessorsByName(hypervPrivate *priv, const char *name, if (!processorList) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not look up processor(s) on '%s'"), + _("Could not look up processor(s) on '%1$s'"), name); return -1; } @@ -155,7 +155,7 @@ hypervGetVirtualSystemByID(hypervPrivate *priv, int id, return -1; if (*computerSystemList == NULL) { - virReportError(VIR_ERR_NO_DOMAIN, _("No domain with ID %d"), id); + virReportError(VIR_ERR_NO_DOMAIN, _("No domain with ID %1$d"), id); return -1; } @@ -179,7 +179,7 @@ hypervGetVirtualSystemByName(hypervPrivate *priv, const char *name, if (*computerSystemList == NULL) { virReportError(VIR_ERR_NO_DOMAIN, - _("No domain with name %s"), name); + _("No domain with name %1$s"), name); return -1; } @@ -250,7 +250,7 @@ hypervLookupHostSystemBiosUuid(hypervPrivate *priv, unsigned char *uuid) if (virUUIDParse(computerSystem->data->UUID, uuid) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not parse UUID from string '%s'"), + _("Could not parse UUID from string '%1$s'"), computerSystem->data->UUID); return -1; } @@ -384,7 +384,7 @@ hypervGetDeviceParentRasdFromDeviceId(const char *parentDeviceId, return 0; virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to locate parent device with ID '%s'"), + _("Failed to locate parent device with ID '%1$s'"), parentDeviceId); return -1; @@ -424,13 +424,13 @@ hypervDomainCreateSCSIController(virDomainPtr domain, virDomainControllerDef *de if (def->model != VIR_DOMAIN_CONTROLLER_MODEL_SCSI_DEFAULT && def->model != VIR_DOMAIN_CONTROLLER_MODEL_SCSI_AUTO) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Unsupported SCSI controller model '%d'"), def->model); + _("Unsupported SCSI controller model '%1$d'"), def->model); return -1; } if (def->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Unsupported SCSI controller address type '%d'"), def->info.type); + _("Unsupported SCSI controller address type '%1$d'"), def->info.type); return -1; } @@ -1327,7 +1327,7 @@ hypervDomainDefParseVirtualExtent(hypervPrivate *priv, disk->device = VIR_DOMAIN_DISK_DEVICE_FLOPPY; } else { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unrecognized controller type %d"), + _("Unrecognized controller type %1$d"), controller->data->ResourceType); goto cleanup; } @@ -1773,7 +1773,7 @@ hypervConnectOpen(virConnectPtr conn, virConnectAuthPtr auth, if (!os) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not get version information for host %s"), + _("Could not get version information for host %1$s"), conn->uri->server); goto cleanup; } @@ -1818,7 +1818,7 @@ hypervConnectGetVersion(virConnectPtr conn, unsigned long *version) if (hypervParseVersionString(priv->version, &major, &minor, &micro) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not parse version from '%s'"), + _("Could not parse version from '%1$s'"), priv->version); return -1; } @@ -1842,7 +1842,7 @@ hypervConnectGetVersion(virConnectPtr conn, unsigned long *version) */ if (major > 99 || minor > 99 || micro > 999999) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not produce packed version number from '%s'"), + _("Could not produce packed version number from '%1$s'"), priv->version); return -1; } @@ -1891,7 +1891,7 @@ hypervConnectGetMaxVcpus(virConnectPtr conn, const char *type G_GNUC_UNUSED) if (!processorSettingData) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not get maximum definition of Msvm_ProcessorSettingData for host %s"), + _("Could not get maximum definition of Msvm_ProcessorSettingData for host %1$s"), conn->uri->server); return -1; } @@ -1943,7 +1943,7 @@ hypervNodeGetInfo(virConnectPtr conn, virNodeInfoPtr info) /* Fill struct */ if (virStrcpyStatic(info->model, processorList->data->Name) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("CPU model %s too long for destination"), + _("CPU model %1$s too long for destination"), processorList->data->Name); return -1; } @@ -2059,7 +2059,7 @@ hypervDomainLookupByName(virConnectPtr conn, const char *name) if (computerSystem->next) { virReportError(VIR_ERR_MULTIPLE_DOMAINS, - _("Multiple domains exist with the name '%s': repeat the request using a UUID"), + _("Multiple domains exist with the name '%1$s': repeat the request using a UUID"), name); return NULL; } @@ -2127,7 +2127,7 @@ hypervDomainShutdownFlags(virDomainPtr domain, unsigned int flags) if (hypervGetWmiClass(Msvm_ShutdownComponent, &shutdown) < 0 || !shutdown) { virReportError(VIR_ERR_OPERATION_FAILED, - _("Could not get Msvm_ShutdownComponent for domain with UUID '%s'"), + _("Could not get Msvm_ShutdownComponent for domain with UUID '%1$s'"), uuid); return -1; } @@ -2464,7 +2464,7 @@ hypervDomainScreenshot(virDomainPtr domain, temporaryDirectory = "/tmp"; temporaryFile = g_strdup_printf("%s/libvirt.hyperv.screendump.XXXXXX", temporaryDirectory); if ((fd = g_mkstemp_full(temporaryFile, O_RDWR | O_CLOEXEC, S_IRUSR | S_IWUSR)) == -1) { - virReportSystemError(errno, _("g_mkstemp(\"%s\") failed"), temporaryFile); + virReportSystemError(errno, _("g_mkstemp(\"%1$s\") failed"), temporaryFile); goto cleanup; } unlinkTemporaryFile = true; @@ -2705,7 +2705,7 @@ hypervDomainGetXMLDesc(virDomainPtr domain, unsigned int flags) if (virUUIDParse(computerSystem->data->Name, def->uuid) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not parse UUID from string '%s'"), + _("Could not parse UUID from string '%1$s'"), computerSystem->data->Name); return NULL; } @@ -2928,7 +2928,7 @@ hypervDomainDefineXML(virConnectPtr conn, const char *xml) if ((domain = hypervDomainLookupByUUID(conn, def->uuid))) { char uuid_string[VIR_UUID_STRING_BUFLEN]; virUUIDFormat(domain->uuid, uuid_string); - virReportError(VIR_ERR_DOM_EXIST, _("Domain already exists with UUID '%s'"), uuid_string); + virReportError(VIR_ERR_DOM_EXIST, _("Domain already exists with UUID '%1$s'"), uuid_string); // Don't use the 'exit' label, since we don't want to delete the existing domain. virObjectUnref(domain); @@ -2978,7 +2978,7 @@ hypervDomainDefineXML(virConnectPtr conn, const char *xml) /* Attach serials */ for (i = 0; i < def->nserials; i++) { if (hypervDomainAttachSerial(domain, def->serials[i]) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, _("Could not attach serial port %zu"), i); + virReportError(VIR_ERR_INTERNAL_ERROR, _("Could not attach serial port %1$zu"), i); goto error; } } @@ -2986,7 +2986,7 @@ hypervDomainDefineXML(virConnectPtr conn, const char *xml) /* Attach networks */ for (i = 0; i < def->nnets; i++) { if (hypervDomainAttachSyntheticEthernetAdapter(domain, def->nets[i], hostname) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, _("Could not attach network %zu"), i); + virReportError(VIR_ERR_INTERNAL_ERROR, _("Could not attach network %1$zu"), i); goto error; } } @@ -3133,7 +3133,7 @@ hypervDomainAttachDeviceFlags(virDomainPtr domain, const char *xml, unsigned int case VIR_DOMAIN_DEVICE_AUDIO: case VIR_DOMAIN_DEVICE_CRYPTO: virReportError(VIR_ERR_INTERNAL_ERROR, - _("Attaching devices of type %d is not implemented"), dev->type); + _("Attaching devices of type %1$d is not implemented"), dev->type); return -1; } @@ -3290,7 +3290,7 @@ hypervNodeGetFreeMemory(virConnectPtr conn) if (!operatingSystem) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not get free memory for host %s"), + _("Could not get free memory for host %1$s"), conn->uri->server); return 0; } @@ -3732,7 +3732,7 @@ hypervDebugHandler(const char *message, debug_level_e level, case DEBUG_LEVEL_ERROR: case DEBUG_LEVEL_CRITICAL: case DEBUG_LEVEL_ALWAYS: - VIR_ERROR(_("openwsman: %s"), message); + VIR_ERROR(_("openwsman: %1$s"), message); break; case DEBUG_LEVEL_WARNING: diff --git a/src/hyperv/hyperv_network_driver.c b/src/hyperv/hyperv_network_driver.c index a794a681b5..eefcaf05f6 100644 --- a/src/hyperv/hyperv_network_driver.c +++ b/src/hyperv/hyperv_network_driver.c @@ -40,7 +40,7 @@ hypervMsvmVirtualSwitchToNetwork(virConnectPtr conn, Msvm_VirtualEthernetSwitch if (virUUIDParse(virtualSwitch->data->Name, uuid) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not parse UUID from string '%s'"), + _("Could not parse UUID from string '%1$s'"), virtualSwitch->data->Name); return NULL; } @@ -64,7 +64,7 @@ hypervNetworkLookup(virConnectPtr conn, const char *property, const char *value) if (!virtualSwitch) { virReportError(VIR_ERR_NO_NETWORK, - _("No network found with property '%s' = '%s'"), property, value); + _("No network found with property '%1$s' = '%2$s'"), property, value); return NULL; } diff --git a/src/hyperv/hyperv_util.c b/src/hyperv/hyperv_util.c index fe71e47285..37a1b1a249 100644 --- a/src/hyperv/hyperv_util.c +++ b/src/hyperv/hyperv_util.c @@ -55,8 +55,7 @@ hypervParseUri(hypervParsedUri **parsedUri, virURI *uri) if (STRNEQ((*parsedUri)->transport, "http") && STRNEQ((*parsedUri)->transport, "https")) { virReportError(VIR_ERR_INVALID_ARG, - _("Query parameter 'transport' has unexpected value " - "'%s' (should be http|https)"), + _("Query parameter 'transport' has unexpected value '%1$s' (should be http|https)"), (*parsedUri)->transport); goto cleanup; } diff --git a/src/hyperv/hyperv_wmi.c b/src/hyperv/hyperv_wmi.c index 7dac5c46d1..8bc376e22f 100644 --- a/src/hyperv/hyperv_wmi.c +++ b/src/hyperv/hyperv_wmi.c @@ -70,7 +70,7 @@ hypervVerifyResponse(WsManClient *client, WsXmlDocH response, if (lastError != WS_LASTERR_OK) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Transport error during %s: %s (%d)"), + _("Transport error during %1$s: %2$s (%3$d)"), detail, wsman_transport_get_last_error_string(lastError), lastError); return -1; @@ -80,14 +80,14 @@ hypervVerifyResponse(WsManClient *client, WsXmlDocH response, * 400 (Bad Request) or 500 (Internal Server Error) */ if (responseCode != 200 && responseCode != 400 && responseCode != 500) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unexpected HTTP response during %s: %d"), + _("Unexpected HTTP response during %1$s: %2$d"), detail, responseCode); return -1; } if (response == NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Empty response during %s"), detail); + _("Empty response during %1$s"), detail); return -1; } @@ -98,8 +98,7 @@ hypervVerifyResponse(WsManClient *client, WsXmlDocH response, wsmc_get_fault_data(response, fault); virReportError(VIR_ERR_INTERNAL_ERROR, - _("SOAP fault during %s: code '%s', subcode '%s', " - "reason '%s', detail '%s'"), + _("SOAP fault during %1$s: code '%2$s', subcode '%3$s', reason '%4$s', detail '%5$s'"), detail, NULLSTR(fault->code), NULLSTR(fault->subcode), NULLSTR(fault->reason), NULLSTR(fault->fault_detail)); @@ -556,7 +555,7 @@ hypervSerializeEmbeddedParam(hypervParam *p, const char *resourceUri, if (!(xmlNodeParam = ws_xml_add_child(*methodNode, resourceUri, p->embedded.name, NULL))) { - virReportError(VIR_ERR_INTERNAL_ERROR, _("Could not add child node %s"), + virReportError(VIR_ERR_INTERNAL_ERROR, _("Could not add child node %1$s"), p->embedded.name); return -1; } @@ -780,11 +779,11 @@ hypervInvokeMethod(hypervPrivate *priv, if (faultReason) virReportError(VIR_ERR_INTERNAL_ERROR, - _("WS-Management fault during %s invocation: %s"), + _("WS-Management fault during %1$s invocation: %2$s"), params->method, faultReason); else virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not get return value for %s invocation"), + _("Could not get return value for %1$s invocation"), params->method); return -1; @@ -801,7 +800,7 @@ hypervInvokeMethod(hypervPrivate *priv, instanceID = ws_xml_get_xpath_value(response, jobcode_instance_xpath); if (!instanceID) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not get instance ID for %s invocation"), + _("Could not get instance ID for %1$s invocation"), params->method); return -1; } @@ -854,11 +853,11 @@ hypervInvokeMethod(hypervPrivate *priv, } if (!completed && timeout < 0) { virReportError(VIR_ERR_OPERATION_TIMEOUT, - _("Timeout waiting for %s invocation"), params->method); + _("Timeout waiting for %1$s invocation"), params->method); return -1; } } else if (returnCode != CIM_RETURNCODE_COMPLETED_WITH_NO_ERROR) { - virReportError(VIR_ERR_INTERNAL_ERROR, _("Invocation of %s returned an error: %s (%d)"), + virReportError(VIR_ERR_INTERNAL_ERROR, _("Invocation of %1$s returned an error: %2$s (%3$d)"), params->method, hypervReturnCodeToString(returnCode), returnCode); return -1; @@ -1155,14 +1154,14 @@ hypervInvokeMsvmComputerSystemRequestStateChange(virDomainPtr domain, if (returnValue == NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not lookup %s for %s invocation"), + _("Could not lookup %1$s for %2$s invocation"), "ReturnValue", "RequestStateChange"); return -1; } if (virStrToLong_i(returnValue, NULL, 10, &returnCode) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not parse return code from '%s'"), returnValue); + _("Could not parse return code from '%1$s'"), returnValue); return -1; } @@ -1172,7 +1171,7 @@ hypervInvokeMsvmComputerSystemRequestStateChange(virDomainPtr domain, if (instanceID == NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not lookup %s for %s invocation"), + _("Could not lookup %1$s for %2$s invocation"), "InstanceID", "RequestStateChange"); return -1; } @@ -1189,7 +1188,7 @@ hypervInvokeMsvmComputerSystemRequestStateChange(virDomainPtr domain, if (concreteJob == NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not lookup %s for %s invocation"), + _("Could not lookup %1$s for %2$s invocation"), "Msvm_ConcreteJob", "RequestStateChange"); return -1; } @@ -1214,20 +1213,20 @@ hypervInvokeMsvmComputerSystemRequestStateChange(virDomainPtr domain, case MSVM_CONCRETEJOB_JOBSTATE_EXCEPTION: case MSVM_CONCRETEJOB_JOBSTATE_SERVICE: virReportError(VIR_ERR_INTERNAL_ERROR, - _("Concrete job for %s invocation is in error state"), + _("Concrete job for %1$s invocation is in error state"), "RequestStateChange"); return -1; default: virReportError(VIR_ERR_INTERNAL_ERROR, - _("Concrete job for %s invocation is in unknown state"), + _("Concrete job for %1$s invocation is in unknown state"), "RequestStateChange"); return -1; } } } else if (returnCode != CIM_RETURNCODE_COMPLETED_WITH_NO_ERROR) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Invocation of %s returned an error: %s (%d)"), + _("Invocation of %1$s returned an error: %2$s (%3$d)"), "RequestStateChange", hypervReturnCodeToString(returnCode), returnCode); return -1; @@ -1330,7 +1329,7 @@ hypervMsvmComputerSystemToDomain(virConnectPtr conn, if (virUUIDParse(computerSystem->data->Name, uuid) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not parse UUID from string '%s'"), + _("Could not parse UUID from string '%1$s'"), computerSystem->data->Name); return -1; } @@ -1364,7 +1363,7 @@ hypervMsvmComputerSystemFromUUID(hypervPrivate *priv, const char *uuid, return -1; if (!*computerSystem) { - virReportError(VIR_ERR_NO_DOMAIN, _("No domain with UUID %s"), uuid); + virReportError(VIR_ERR_NO_DOMAIN, _("No domain with UUID %1$s"), uuid); return -1; } @@ -1429,7 +1428,7 @@ hypervGetResourceAllocationSD(hypervPrivate *priv, if (!*data) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not look up resource allocation setting data with virtual system instance ID '%s'"), + _("Could not look up resource allocation setting data with virtual system instance ID '%1$s'"), id); return -1; } @@ -1447,7 +1446,7 @@ hypervGetProcessorSD(hypervPrivate *priv, if (!*data) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not look up processor setting data with virtual system instance ID '%s'"), + _("Could not look up processor setting data with virtual system instance ID '%1$s'"), id); return -1; } -- 2.39.2

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com&gt; --- src/interface/interface_backend_netcf.c | 50 ++++++------ src/interface/interface_backend_udev.c | 100 ++++++++++++------------ 2 files changed, 76 insertions(+), 74 deletions(-) diff --git a/src/interface/interface_backend_netcf.c b/src/interface/interface_backend_netcf.c index 7bd3e7e1e2..d4a11157cc 100644 --- a/src/interface/interface_backend_netcf.c +++ b/src/interface/interface_backend_netcf.c @@ -117,7 +117,7 @@ netcfStateInitialize(bool privileged, } if (g_mkdir_with_parents(driver->stateDir, S_IRWXU) < 0) { - virReportSystemError(errno, _("cannot create state directory '%s'"), + virReportSystemError(errno, _("cannot create state directory '%1$s'"), driver->stateDir); goto error; } @@ -299,12 +299,12 @@ static struct netcf_if *interfaceDriverGetNetcfIF(struct netcf *ncf, virInterfac int errcode = ncf_error(ncf, &errmsg, &details); if (errcode != NETCF_NOERROR) { virReportError(netcf_to_vir_err(errcode), - _("couldn't find interface named '%s': %s%s%s"), + _("couldn't find interface named '%1$s': %2$s%3$s%4$s"), ifinfo->name, errmsg, details ? " - " : "", NULLSTR_EMPTY(details)); } else { virReportError(VIR_ERR_NO_INTERFACE, - _("couldn't find interface named '%s'"), + _("couldn't find interface named '%1$s'"), ifinfo->name); } } @@ -323,7 +323,7 @@ netcfInterfaceObjIsActive(struct netcf_if *iface, const char *errmsg, *details; int errcode = ncf_error(driver->netcf, &errmsg, &details); virReportError(netcf_to_vir_err(errcode), - _("failed to get status of interface %s: %s%s%s"), + _("failed to get status of interface %1$s: %2$s%3$s%4$s"), ncf_if_name(iface), errmsg, details ? " - " : "", NULLSTR_EMPTY(details)); goto cleanup; @@ -355,7 +355,7 @@ static int netcfConnectNumOfInterfacesImpl(virConnectPtr conn, const char *errmsg, *details; int errcode = ncf_error(driver->netcf, &errmsg, &details); virReportError(netcf_to_vir_err(errcode), - _("failed to get number of host interfaces: %s%s%s"), + _("failed to get number of host interfaces: %1$s%2$s%3$s"), errmsg, details ? " - " : "", NULLSTR_EMPTY(details)); goto cleanup; @@ -372,7 +372,7 @@ static int netcfConnectNumOfInterfacesImpl(virConnectPtr conn, const char *errmsg, *details; int errcode = ncf_error(driver->netcf, &errmsg, &details); virReportError(netcf_to_vir_err(errcode), - _("failed to list host interfaces: %s%s%s"), + _("failed to list host interfaces: %1$s%2$s%3$s"), errmsg, details ? " - " : "", NULLSTR_EMPTY(details)); goto cleanup; @@ -388,7 +388,7 @@ static int netcfConnectNumOfInterfacesImpl(virConnectPtr conn, int errcode = ncf_error(driver->netcf, &errmsg, &details); if (errcode != NETCF_NOERROR) { virReportError(netcf_to_vir_err(errcode), - _("couldn't find interface named '%s': %s%s%s"), + _("couldn't find interface named '%1$s': %2$s%3$s%4$s"), names[i], errmsg, details ? " - " : "", NULLSTR_EMPTY(details)); goto cleanup; @@ -441,7 +441,7 @@ static int netcfConnectListInterfacesImpl(virConnectPtr conn, const char *errmsg, *details; int errcode = ncf_error(driver->netcf, &errmsg, &details); virReportError(netcf_to_vir_err(errcode), - _("failed to get number of host interfaces: %s%s%s"), + _("failed to get number of host interfaces: %1$s%2$s%3$s"), errmsg, details ? " - " : "", NULLSTR_EMPTY(details)); goto cleanup; @@ -458,7 +458,7 @@ static int netcfConnectListInterfacesImpl(virConnectPtr conn, const char *errmsg, *details; int errcode = ncf_error(driver->netcf, &errmsg, &details); virReportError(netcf_to_vir_err(errcode), - _("failed to list host interfaces: %s%s%s"), + _("failed to list host interfaces: %1$s%2$s%3$s"), errmsg, details ? " - " : "", NULLSTR_EMPTY(details)); goto cleanup; @@ -479,7 +479,7 @@ static int netcfConnectListInterfacesImpl(virConnectPtr conn, int errcode = ncf_error(driver->netcf, &errmsg, &details); if (errcode != NETCF_NOERROR) { virReportError(netcf_to_vir_err(errcode), - _("couldn't find interface named '%s': %s%s%s"), + _("couldn't find interface named '%1$s': %2$s%3$s%4$s"), allnames[i], errmsg, details ? " - " : "", NULLSTR_EMPTY(details)); goto cleanup; @@ -624,7 +624,7 @@ netcfConnectListAllInterfaces(virConnectPtr conn, int errcode = ncf_error(driver->netcf, &errmsg, &details); virReportError(netcf_to_vir_err(errcode), - _("failed to get number of host interfaces: %s%s%s"), + _("failed to get number of host interfaces: %1$s%2$s%3$s"), errmsg, details ? " - " : "", NULLSTR_EMPTY(details)); goto cleanup; @@ -643,7 +643,7 @@ netcfConnectListAllInterfaces(virConnectPtr conn, int errcode = ncf_error(driver->netcf, &errmsg, &details); virReportError(netcf_to_vir_err(errcode), - _("failed to list host interfaces: %s%s%s"), + _("failed to list host interfaces: %1$s%2$s%3$s"), errmsg, details ? " - " : "", NULLSTR_EMPTY(details)); goto cleanup; @@ -661,7 +661,7 @@ netcfConnectListAllInterfaces(virConnectPtr conn, int errcode = ncf_error(driver->netcf, &errmsg, &details); if (errcode != NETCF_NOERROR) { virReportError(netcf_to_vir_err(errcode), - _("couldn't find interface named '%s': %s%s%s"), + _("couldn't find interface named '%1$s': %2$s%3$s%4$s"), names[i], errmsg, details ? " - " : "", NULLSTR_EMPTY(details)); goto cleanup; @@ -735,12 +735,12 @@ static virInterfacePtr netcfInterfaceLookupByName(virConnectPtr conn, int errcode = ncf_error(driver->netcf, &errmsg, &details); if (errcode != NETCF_NOERROR) { virReportError(netcf_to_vir_err(errcode), - _("couldn't find interface named '%s': %s%s%s"), + _("couldn't find interface named '%1$s': %2$s%3$s%4$s"), name, errmsg, details ? " - " : "", NULLSTR_EMPTY(details)); } else { virReportError(VIR_ERR_NO_INTERFACE, - _("couldn't find interface named '%s'"), name); + _("couldn't find interface named '%1$s'"), name); } goto cleanup; } @@ -773,14 +773,14 @@ static virInterfacePtr netcfInterfaceLookupByMACString(virConnectPtr conn, const char *errmsg, *details; int errcode = ncf_error(driver->netcf, &errmsg, &details); virReportError(netcf_to_vir_err(errcode), - _("couldn't find interface with MAC address '%s': %s%s%s"), + _("couldn't find interface with MAC address '%1$s': %2$s%3$s%4$s"), macstr, errmsg, details ? " - " : "", NULLSTR_EMPTY(details)); goto cleanup; } if (niface == 0) { virReportError(VIR_ERR_NO_INTERFACE, - _("couldn't find interface with MAC address '%s'"), + _("couldn't find interface with MAC address '%1$s'"), macstr); goto cleanup; } @@ -834,7 +834,7 @@ static char *netcfInterfaceGetXMLDesc(virInterfacePtr ifinfo, const char *errmsg, *details; int errcode = ncf_error(driver->netcf, &errmsg, &details); virReportError(netcf_to_vir_err(errcode), - _("could not get interface XML description: %s%s%s"), + _("could not get interface XML description: %1$s%2$s%3$s"), errmsg, details ? " - " : "", NULLSTR_EMPTY(details)); goto cleanup; @@ -893,7 +893,7 @@ static virInterfacePtr netcfInterfaceDefineXML(virConnectPtr conn, const char *errmsg, *details; int errcode = ncf_error(driver->netcf, &errmsg, &details); virReportError(netcf_to_vir_err(errcode), - _("could not get interface XML description: %s%s%s"), + _("could not get interface XML description: %1$s%2$s%3$s"), errmsg, details ? " - " : "", NULLSTR_EMPTY(details)); goto cleanup; @@ -932,7 +932,7 @@ static int netcfInterfaceUndefine(virInterfacePtr ifinfo) const char *errmsg, *details; int errcode = ncf_error(driver->netcf, &errmsg, &details); virReportError(netcf_to_vir_err(errcode), - _("failed to undefine interface %s: %s%s%s"), + _("failed to undefine interface %1$s: %2$s%3$s%4$s"), ifinfo->name, errmsg, details ? " - " : "", NULLSTR_EMPTY(details)); goto cleanup; @@ -981,7 +981,7 @@ static int netcfInterfaceCreate(virInterfacePtr ifinfo, const char *errmsg, *details; int errcode = ncf_error(driver->netcf, &errmsg, &details); virReportError(netcf_to_vir_err(errcode), - _("failed to create (start) interface %s: %s%s%s"), + _("failed to create (start) interface %1$s: %2$s%3$s%4$s"), ifinfo->name, errmsg, details ? " - " : "", NULLSTR_EMPTY(details)); goto cleanup; @@ -1030,7 +1030,7 @@ static int netcfInterfaceDestroy(virInterfacePtr ifinfo, const char *errmsg, *details; int errcode = ncf_error(driver->netcf, &errmsg, &details); virReportError(netcf_to_vir_err(errcode), - _("failed to destroy (stop) interface %s: %s%s%s"), + _("failed to destroy (stop) interface %1$s: %2$s%3$s%4$s"), ifinfo->name, errmsg, details ? " - " : "", NULLSTR_EMPTY(details)); goto cleanup; @@ -1086,7 +1086,7 @@ static int netcfInterfaceChangeBegin(virConnectPtr conn, unsigned int flags) const char *errmsg, *details; int errcode = ncf_error(driver->netcf, &errmsg, &details); virReportError(netcf_to_vir_err(errcode), - _("failed to begin transaction: %s%s%s"), + _("failed to begin transaction: %1$s%2$s%3$s"), errmsg, details ? " - " : "", NULLSTR_EMPTY(details)); } @@ -1110,7 +1110,7 @@ static int netcfInterfaceChangeCommit(virConnectPtr conn, unsigned int flags) const char *errmsg, *details; int errcode = ncf_error(driver->netcf, &errmsg, &details); virReportError(netcf_to_vir_err(errcode), - _("failed to commit transaction: %s%s%s"), + _("failed to commit transaction: %1$s%2$s%3$s"), errmsg, details ? " - " : "", NULLSTR_EMPTY(details)); } @@ -1134,7 +1134,7 @@ static int netcfInterfaceChangeRollback(virConnectPtr conn, unsigned int flags) const char *errmsg, *details; int errcode = ncf_error(driver->netcf, &errmsg, &details); virReportError(netcf_to_vir_err(errcode), - _("failed to rollback transaction: %s%s%s"), + _("failed to rollback transaction: %1$s%2$s%3$s"), errmsg, details ? " - " : "", NULLSTR_EMPTY(details)); } diff --git a/src/interface/interface_backend_udev.c b/src/interface/interface_backend_udev.c index cba14f91f8..a0485ddd21 100644 --- a/src/interface/interface_backend_udev.c +++ b/src/interface/interface_backend_udev.c @@ -148,7 +148,7 @@ udevNumOfInterfacesByStatus(virConnectPtr conn, virUdevStatus status, if (!enumerate) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("failed to get number of %s interfaces on host"), + _("failed to get number of %1$s interfaces on host"), virUdevStatusString(status)); count = -1; goto cleanup; @@ -200,7 +200,7 @@ udevListInterfacesByStatus(virConnectPtr conn, if (!enumerate) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("failed to get list of %s interfaces on host"), + _("failed to get list of %1$s interfaces on host"), virUdevStatusString(status)); udev_unref(udev); return -1; @@ -314,7 +314,7 @@ udevConnectListAllInterfaces(virConnectPtr conn, if (!enumerate) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("failed to get list of %s interfaces on host"), + _("failed to get list of %1$s interfaces on host"), virUdevStatusString(status)); goto cleanup; } @@ -414,7 +414,7 @@ udevInterfaceLookupByName(virConnectPtr conn, const char *name) dev = udev_device_new_from_subsystem_sysname(udev, "net", name); if (!dev) { virReportError(VIR_ERR_NO_INTERFACE, - _("couldn't find interface named '%s'"), + _("couldn't find interface named '%1$s'"), name); goto cleanup; } @@ -448,7 +448,7 @@ udevInterfaceLookupByMACString(virConnectPtr conn, const char *macstr) if (!enumerate) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("failed to lookup interface with MAC address '%s'"), + _("failed to lookup interface with MAC address '%1$s'"), macstr); goto cleanup; } @@ -465,7 +465,7 @@ udevInterfaceLookupByMACString(virConnectPtr conn, const char *macstr) /* Check that we got something back */ if (!dev_entry) { virReportError(VIR_ERR_NO_INTERFACE, - _("couldn't find interface with MAC address '%s'"), + _("couldn't find interface with MAC address '%1$s'"), macstr); goto cleanup; } @@ -473,7 +473,7 @@ udevInterfaceLookupByMACString(virConnectPtr conn, const char *macstr) /* Check that we didn't get multiple items back */ if (udev_list_entry_get_next(dev_entry)) { virReportError(VIR_ERR_MULTIPLE_INTERFACES, - _("the MAC address '%s' matches multiple interfaces"), + _("the MAC address '%1$s' matches multiple interfaces"), macstr); goto cleanup; } @@ -568,12 +568,12 @@ udevGetIfaceDefBond(struct udev *udev, tmp_str = udev_device_get_sysattr_value(dev, "bonding/downdelay"); if (!tmp_str) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not retrieve 'bonding/downdelay' for '%s'"), name); + _("Could not retrieve 'bonding/downdelay' for '%1$s'"), name); goto error; } if (virStrToLong_i(tmp_str, NULL, 10, &tmp_int) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not parse 'bonding/downdelay' '%s' for '%s'"), + _("Could not parse 'bonding/downdelay' '%1$s' for '%2$s'"), tmp_str, name); goto error; } @@ -582,12 +582,12 @@ udevGetIfaceDefBond(struct udev *udev, tmp_str = udev_device_get_sysattr_value(dev, "bonding/updelay"); if (!tmp_str) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not retrieve 'bonding/updelay' for '%s'"), name); + _("Could not retrieve 'bonding/updelay' for '%1$s'"), name); goto error; } if (virStrToLong_i(tmp_str, NULL, 10, &tmp_int) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not parse 'bonding/updelay' '%s' for '%s'"), + _("Could not parse 'bonding/updelay' '%1$s' for '%2$s'"), tmp_str, name); goto error; } @@ -596,12 +596,12 @@ udevGetIfaceDefBond(struct udev *udev, tmp_str = udev_device_get_sysattr_value(dev, "bonding/miimon"); if (!tmp_str) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not retrieve 'bonding/miimon' for '%s'"), name); + _("Could not retrieve 'bonding/miimon' for '%1$s'"), name); goto error; } if (virStrToLong_i(tmp_str, NULL, 10, &tmp_int) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not parse 'bonding/miimon' '%s' for '%s'"), + _("Could not parse 'bonding/miimon' '%1$s' for '%2$s'"), tmp_str, name); goto error; } @@ -610,12 +610,12 @@ udevGetIfaceDefBond(struct udev *udev, tmp_str = udev_device_get_sysattr_value(dev, "bonding/arp_interval"); if (!tmp_str) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not retrieve 'bonding/arp_interval' for '%s'"), name); + _("Could not retrieve 'bonding/arp_interval' for '%1$s'"), name); goto error; } if (virStrToLong_i(tmp_str, NULL, 10, &tmp_int) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not parse 'bonding/arp_interval' '%s' for '%s'"), + _("Could not parse 'bonding/arp_interval' '%1$s' for '%2$s'"), tmp_str, name); goto error; } @@ -629,24 +629,24 @@ udevGetIfaceDefBond(struct udev *udev, tmp_str = udev_device_get_sysattr_value(dev, "bonding/mode"); if (!tmp_str) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not retrieve 'bonding/mode' for '%s'"), name); + _("Could not retrieve 'bonding/mode' for '%1$s'"), name); goto error; } tmp_str = strchr(tmp_str, ' '); if (!tmp_str) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Invalid format for 'bonding/mode' for '%s'"), name); + _("Invalid format for 'bonding/mode' for '%1$s'"), name); goto error; } if (strlen(tmp_str) < 2) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to find correct value in 'bonding/mode' for '%s'"), + _("Unable to find correct value in 'bonding/mode' for '%1$s'"), name); goto error; } if (virStrToLong_i(tmp_str + 1, NULL, 10, &tmp_int) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not parse 'bonding/mode' '%s' for '%s'"), + _("Could not parse 'bonding/mode' '%1$s' for '%2$s'"), tmp_str, name); goto error; } @@ -659,24 +659,24 @@ udevGetIfaceDefBond(struct udev *udev, tmp_str = udev_device_get_sysattr_value(dev, "bonding/arp_validate"); if (!tmp_str) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not retrieve 'bonding/arp_validate' for '%s'"), name); + _("Could not retrieve 'bonding/arp_validate' for '%1$s'"), name); goto error; } tmp_str = strchr(tmp_str, ' '); if (!tmp_str) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Invalid format for 'bonding/arp_validate' for '%s'"), name); + _("Invalid format for 'bonding/arp_validate' for '%1$s'"), name); goto error; } if (strlen(tmp_str) < 2) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to find correct value in 'bonding/arp_validate' " - "for '%s'"), name); + _("Unable to find correct value in 'bonding/arp_validate' for '%1$s'"), + name); goto error; } if (virStrToLong_i(tmp_str + 1, NULL, 10, &tmp_int) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not parse 'bonding/arp_validate' '%s' for '%s'"), + _("Could not parse 'bonding/arp_validate' '%1$s' for '%2$s'"), tmp_str, name); goto error; } @@ -686,12 +686,12 @@ udevGetIfaceDefBond(struct udev *udev, tmp_str = udev_device_get_sysattr_value(dev, "bonding/use_carrier"); if (!tmp_str) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not retrieve 'bonding/use_carrier' for '%s'"), name); + _("Could not retrieve 'bonding/use_carrier' for '%1$s'"), name); goto error; } if (virStrToLong_i(tmp_str, NULL, 10, &tmp_int) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not parse 'bonding/use_carrier' '%s' for '%s'"), + _("Could not parse 'bonding/use_carrier' '%1$s' for '%2$s'"), tmp_str, name); goto error; } @@ -711,7 +711,7 @@ udevGetIfaceDefBond(struct udev *udev, tmp_str = udev_device_get_sysattr_value(dev, "bonding/arp_ip_target"); if (!tmp_str) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not retrieve 'bonding/arp_ip_target' for '%s'"), name); + _("Could not retrieve 'bonding/arp_ip_target' for '%1$s'"), name); goto error; } ifacedef->data.bond.target = g_strdup(tmp_str); @@ -723,7 +723,7 @@ udevGetIfaceDefBond(struct udev *udev, if (slave_count < 0) { virReportSystemError(errno, - _("Could not get slaves of bond '%s'"), name); + _("Could not get slaves of bond '%1$s'"), name); goto error; } @@ -739,8 +739,8 @@ udevGetIfaceDefBond(struct udev *udev, tmp_str = strchr(slave_list[i]->d_name, '_'); if (!tmp_str || strlen(tmp_str) < 2) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Invalid enslaved interface name '%s' seen for " - "bond '%s'"), slave_list[i]->d_name, name); + _("Invalid enslaved interface name '%1$s' seen for bond '%2$s'"), + slave_list[i]->d_name, name); goto error; } /* go past the _ */ @@ -750,8 +750,8 @@ udevGetIfaceDefBond(struct udev *udev, udevGetIfaceDef(udev, tmp_str); if (!ifacedef->data.bond.itf[i]) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not get interface information for '%s', which is " - "a enslaved in bond '%s'"), slave_list[i]->d_name, name); + _("Could not get interface information for '%1$s', which is a enslaved in bond '%2$s'"), + slave_list[i]->d_name, name); goto error; } VIR_FREE(slave_list[i]); @@ -791,7 +791,8 @@ udevGetIfaceDefBridge(struct udev *udev, tmp_str = udev_device_get_sysattr_value(dev, "bridge/forward_delay"); if (!tmp_str) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not retrieve 'bridge/forward_delay' for '%s'"), name); + _("Could not retrieve 'bridge/forward_delay' for '%1$s'"), + name); goto error; } @@ -801,14 +802,15 @@ udevGetIfaceDefBridge(struct udev *udev, tmp_str = udev_device_get_sysattr_value(dev, "bridge/stp_state"); if (!tmp_str) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not retrieve 'bridge/stp_state' for '%s'"), name); + _("Could not retrieve 'bridge/stp_state' for '%1$s'"), + name); goto error; } if (virStrToLong_i(tmp_str, NULL, 10, &stp) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not parse 'bridge/stp_state' '%s' for '%s'"), - tmp_str, name); + _("Could not parse 'bridge/stp_state' '%1$s' for '%2$s'"), + tmp_str, name); goto error; } @@ -820,8 +822,8 @@ udevGetIfaceDefBridge(struct udev *udev, break; default: virReportError(VIR_ERR_INTERNAL_ERROR, - _("Invalid STP state value %d received for '%s'. Must be " - "-1, 0, or 1."), stp, name); + _("Invalid STP state value %1$d received for '%2$s'. Must be -1, 0, or 1."), + stp, name); goto error; } @@ -837,7 +839,7 @@ udevGetIfaceDefBridge(struct udev *udev, if (member_count < 0) { virReportSystemError(errno, - _("Could not get members of bridge '%s'"), + _("Could not get members of bridge '%1$s'"), name); goto error; } @@ -852,8 +854,8 @@ udevGetIfaceDefBridge(struct udev *udev, udevGetIfaceDef(udev, member_list[i]->d_name); if (!ifacedef->data.bridge.itf[i]) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not get interface information for '%s', which is " - "a member of bridge '%s'"), member_list[i]->d_name, name); + _("Could not get interface information for '%1$s', which is a member of bridge '%2$s'"), + member_list[i]->d_name, name); goto error; } VIR_FREE(member_list[i]); @@ -893,7 +895,7 @@ udevGetIfaceDefVlan(struct udev *udev G_GNUC_UNUSED, if ((vid_pos = strstr(buf, vid_prefix)) == NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("failed to find the VID for the VLAN device '%s'"), + _("failed to find the VID for the VLAN device '%1$s'"), name); return -1; } @@ -902,14 +904,14 @@ udevGetIfaceDefVlan(struct udev *udev G_GNUC_UNUSED, if ((vid_len = strspn(vid_pos, "0123456789")) == 0 || !g_ascii_isspace(vid_pos[vid_len])) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("failed to find the VID for the VLAN device '%s'"), + _("failed to find the VID for the VLAN device '%1$s'"), name); return -1; } if ((dev_pos = strstr(vid_pos + vid_len, dev_prefix)) == NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("failed to find the real device for the VLAN device '%s'"), + _("failed to find the real device for the VLAN device '%1$s'"), name); return -1; } @@ -917,7 +919,7 @@ udevGetIfaceDefVlan(struct udev *udev G_GNUC_UNUSED, if ((dev_len = strcspn(dev_pos, "\n")) == 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("failed to find the real device for the VLAN device '%s'"), + _("failed to find the real device for the VLAN device '%1$s'"), name); return -1; } @@ -949,7 +951,7 @@ udevGetIfaceDef(struct udev *udev, const char *name) dev = udev_device_new_from_subsystem_sysname(udev, "net", name); if (!dev) { virReportError(VIR_ERR_NO_INTERFACE, - _("couldn't find interface named '%s'"), name); + _("couldn't find interface named '%1$s'"), name); goto error; } @@ -964,7 +966,7 @@ udevGetIfaceDef(struct udev *udev, const char *name) mtu_str = udev_device_get_sysattr_value(dev, "mtu"); if (virStrToLong_ui(mtu_str, NULL, 10, &mtu) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not parse MTU value '%s'"), mtu_str); + _("Could not parse MTU value '%1$s'"), mtu_str); goto error; } ifacedef->mtu = mtu; @@ -1075,7 +1077,7 @@ udevInterfaceIsActive(virInterfacePtr ifinfo) ifinfo->name); if (!dev) { virReportError(VIR_ERR_NO_INTERFACE, - _("couldn't find interface named '%s'"), + _("couldn't find interface named '%1$s'"), ifinfo->name); goto cleanup; } @@ -1130,7 +1132,7 @@ udevStateInitialize(bool privileged, } if (g_mkdir_with_parents(driver->stateDir, S_IRWXU) < 0) { - virReportSystemError(errno, _("cannot create state directory '%s'"), + virReportSystemError(errno, _("cannot create state directory '%1$s'"), driver->stateDir); goto cleanup; } -- 2.39.2

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com&gt; --- src/locking/lock_daemon.c | 26 ++++----- src/locking/lock_daemon_dispatch.c | 10 ++-- src/locking/lock_driver_lockd.c | 12 ++-- src/locking/lock_driver_sanlock.c | 94 +++++++++++++++--------------- src/locking/lock_manager.c | 8 +-- src/locking/sanlock_helper.c | 6 +- 6 files changed, 77 insertions(+), 79 deletions(-) diff --git a/src/locking/lock_daemon.c b/src/locking/lock_daemon.c index 6b0a8220e5..ba52ce7d77 100644 --- a/src/locking/lock_daemon.c +++ b/src/locking/lock_daemon.c @@ -187,7 +187,7 @@ virLockDaemonNewServerPostExecRestart(virNetDaemon *dmn G_GNUC_UNUSED, dmn); } else { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unexpected server name '%s' during restart"), + _("Unexpected server name '%1$s' during restart"), name); return NULL; } @@ -461,14 +461,14 @@ virLockDaemonClientNew(virNetServerClient *client, if (!privileged) { if (geteuid() != clientuid) { - virReportRestrictedError(_("Disallowing client %llu with uid %llu"), + virReportRestrictedError(_("Disallowing client %1$llu with uid %2$llu"), (unsigned long long)priv->clientPid, (unsigned long long)clientuid); goto error; } } else { if (clientuid != 0) { - virReportRestrictedError(_("Disallowing client %llu with uid %llu"), + virReportRestrictedError(_("Disallowing client %1$llu with uid %2$llu"), (unsigned long long)priv->clientPid, (unsigned long long)clientuid); goto error; @@ -716,7 +716,7 @@ virLockDaemonPreExecRestart(const char *state_file, if (virFileWriteStr(state_file, state, 0700) < 0) { virReportSystemError(errno, - _("Unable to save state file %s"), state_file); + _("Unable to save state file %1$s"), state_file); return -1; } @@ -738,7 +738,7 @@ virLockDaemonUsage(const char *argv0, bool privileged) fprintf(stderr, _("\n" "Usage:\n" - " %s [options]\n" + " %1$s [options]\n" "\n" "Options:\n" " -h | --help Display program help:\n" @@ -757,13 +757,13 @@ virLockDaemonUsage(const char *argv0, bool privileged) " Default paths:\n" "\n" " Configuration file (unless overridden by -f):\n" - " %s/libvirt/virtlockd.conf\n" + " %1$s/libvirt/virtlockd.conf\n" "\n" " Sockets:\n" - " %s/libvirt/virtlockd-sock\n" + " %2$s/libvirt/virtlockd-sock\n" "\n" " PID file (unless overridden by -p):\n" - " %s/virtlockd.pid\n" + " %3$s/virtlockd.pid\n" "\n"), SYSCONFDIR, RUNSTATEDIR, @@ -823,7 +823,7 @@ int main(int argc, char **argv) { if (virGettextInitialize() < 0 || virErrorInitialize() < 0) { - fprintf(stderr, _("%s: initialization failed\n"), argv[0]); + fprintf(stderr, _("%1$s: initialization failed\n"), argv[0]); exit(EXIT_FAILURE); } @@ -903,7 +903,7 @@ int main(int argc, char **argv) { /* Read the config file if it exists */ if (remote_config_file && virLockDaemonConfigLoadFile(config, remote_config_file, implicit_conf) < 0) { - VIR_ERROR(_("Can't load config file: %s: %s"), + VIR_ERROR(_("Can't load config file: %1$s: %2$s"), virGetLastErrorMessage(), remote_config_file); exit(EXIT_FAILURE); } @@ -963,7 +963,7 @@ int main(int argc, char **argv) { old_umask = umask(077); VIR_DEBUG("Ensuring run dir '%s' exists", run_dir); if (g_mkdir_with_parents(run_dir, 0777) < 0) { - VIR_ERROR(_("unable to create rundir %s: %s"), run_dir, + VIR_ERROR(_("unable to create rundir %1$s: %2$s"), run_dir, g_strerror(errno)); ret = VIR_DAEMON_ERR_RUNDIR; umask(old_umask); @@ -987,13 +987,13 @@ int main(int argc, char **argv) { if (godaemon) { if (chdir("/") < 0) { - VIR_ERROR(_("cannot change to root directory: %s"), + VIR_ERROR(_("cannot change to root directory: %1$s"), g_strerror(errno)); goto cleanup; } if ((statuswrite = virDaemonForkIntoBackground(argv[0])) < 0) { - VIR_ERROR(_("Failed to fork as daemon: %s"), + VIR_ERROR(_("Failed to fork as daemon: %1$s"), g_strerror(errno)); goto cleanup; } diff --git a/src/locking/lock_daemon_dispatch.c b/src/locking/lock_daemon_dispatch.c index e65a2b340f..22c450acd9 100644 --- a/src/locking/lock_daemon_dispatch.c +++ b/src/locking/lock_daemon_dispatch.c @@ -67,7 +67,7 @@ virLockSpaceProtocolDispatchAcquireResource(virNetServer *server G_GNUC_UNUSED, if (!(lockspace = virLockDaemonFindLockSpace(lockDaemon, args->path))) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Lockspace for path %s does not exist"), + _("Lockspace for path %1$s does not exist"), args->path); goto cleanup; } @@ -125,7 +125,7 @@ virLockSpaceProtocolDispatchCreateResource(virNetServer *server G_GNUC_UNUSED, if (!(lockspace = virLockDaemonFindLockSpace(lockDaemon, args->path))) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Lockspace for path %s does not exist"), + _("Lockspace for path %1$s does not exist"), args->path); goto cleanup; } @@ -174,7 +174,7 @@ virLockSpaceProtocolDispatchDeleteResource(virNetServer *server G_GNUC_UNUSED, if (!(lockspace = virLockDaemonFindLockSpace(lockDaemon, args->path))) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Lockspace for path %s does not exist"), + _("Lockspace for path %1$s does not exist"), args->path); goto cleanup; } @@ -229,7 +229,7 @@ virLockSpaceProtocolDispatchNew(virNetServer *server G_GNUC_UNUSED, if (virLockDaemonFindLockSpace(lockDaemon, args->path) != NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Lockspace for path %s already exists"), + _("Lockspace for path %1$s already exists"), args->path); goto cleanup; } @@ -324,7 +324,7 @@ virLockSpaceProtocolDispatchReleaseResource(virNetServer *server G_GNUC_UNUSED, if (!(lockspace = virLockDaemonFindLockSpace(lockDaemon, args->path))) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Lockspace for path %s does not exist"), + _("Lockspace for path %1$s does not exist"), args->path); goto cleanup; } diff --git a/src/locking/lock_driver_lockd.c b/src/locking/lock_driver_lockd.c index 4df12e0105..6b294e2954 100644 --- a/src/locking/lock_driver_lockd.c +++ b/src/locking/lock_driver_lockd.c @@ -85,7 +85,7 @@ static int virLockManagerLockDaemonLoadConfig(const char *configFile) if (access(configFile, R_OK) == -1) { if (errno != ENOENT) { virReportSystemError(errno, - _("Unable to access config file %s"), + _("Unable to access config file %1$s"), configFile); return -1; } @@ -400,7 +400,7 @@ static int virLockManagerLockDaemonNew(virLockManager *lock, /* ignored */ } else { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unexpected parameter %s for object"), + _("Unexpected parameter %1$s for object"), params[i].key); goto cleanup; } @@ -426,7 +426,7 @@ static int virLockManagerLockDaemonNew(virLockManager *lock, default: virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unknown lock manager object type %d"), + _("Unknown lock manager object type %1$d"), type); goto cleanup; } @@ -498,7 +498,7 @@ static int virLockManagerGetLVMKey(const char *path, char **key G_GNUC_UNUSED) { - virReportSystemError(ENOSYS, _("Unable to get LVM key for %s"), path); + virReportSystemError(ENOSYS, _("Unable to get LVM key for %1$s"), path); return -1; } #endif @@ -601,7 +601,7 @@ static int virLockManagerLockDaemonAddResource(virLockManager *lock, path = params[i].value.str; } else { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unexpected parameter %s for lease resource"), + _("Unexpected parameter %1$s for lease resource"), params[i].key); return -1; } @@ -617,7 +617,7 @@ static int virLockManagerLockDaemonAddResource(virLockManager *lock, } break; default: virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unknown lock manager object type %d"), + _("Unknown lock manager object type %1$d"), type); return -1; } diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sanlock.c index 438779f926..dc24862a6f 100644 --- a/src/locking/lock_driver_sanlock.c +++ b/src/locking/lock_driver_sanlock.c @@ -101,7 +101,7 @@ virLockManagerSanlockError(int err, #if WITH_SANLOCK_STRERROR *message = g_strdup(sanlock_strerror(err)); #else - *message = g_strdup_printf(_("sanlock error %d"), err); + *message = g_strdup_printf(_("sanlock error %1$d"), err); #endif return true; } else { @@ -124,7 +124,7 @@ virLockManagerSanlockLoadConfig(virLockManagerSanlockDriver *driver, if (access(configFile, R_OK) == -1) { if (errno != ENOENT) { virReportSystemError(errno, - _("Unable to access config file %s"), + _("Unable to access config file %1$s"), configFile); return -1; } @@ -196,7 +196,7 @@ virLockManagerSanlockSetupLockspace(virLockManagerSanlockDriver *driver) if (virStrcpyStatic(ls.name, VIR_LOCK_MANAGER_SANLOCK_AUTO_DISK_LOCKSPACE) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Lockspace path '%s' exceeded %d characters"), + _("Lockspace path '%1$s' exceeded %2$d characters"), VIR_LOCK_MANAGER_SANLOCK_AUTO_DISK_LOCKSPACE, SANLK_PATH_LEN); goto error; @@ -205,7 +205,7 @@ virLockManagerSanlockSetupLockspace(virLockManagerSanlockDriver *driver) ls.flags = 0; if (virStrcpy(ls.host_id_disk.path, path, SANLK_PATH_LEN) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Lockspace path '%s' exceeded %d characters"), + _("Lockspace path '%1$s' exceeded %2$d characters"), path, SANLK_PATH_LEN); goto error; } @@ -221,8 +221,7 @@ virLockManagerSanlockSetupLockspace(virLockManagerSanlockDriver *driver) dir = g_path_get_dirname(path); if (stat(dir, &st) < 0 || !S_ISDIR(st.st_mode)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to create lockspace %s: parent directory" - " does not exist or is not a directory"), + _("Unable to create lockspace %1$s: parent directory does not exist or is not a directory"), path); goto error; } @@ -233,7 +232,7 @@ virLockManagerSanlockSetupLockspace(virLockManagerSanlockDriver *driver) if ((fd = open(path, O_WRONLY|O_CREAT|O_EXCL, perms)) < 0) { if (errno != EEXIST) { virReportSystemError(errno, - _("Unable to create lockspace %s"), + _("Unable to create lockspace %1$s"), path); goto error; } @@ -243,7 +242,7 @@ virLockManagerSanlockSetupLockspace(virLockManagerSanlockDriver *driver) if ((driver->user != (uid_t) -1 || driver->group != (gid_t) -1) && (fchown(fd, driver->user, driver->group) < 0)) { virReportSystemError(errno, - _("cannot chown '%s' to (%u, %u)"), + _("cannot chown '%1$s' to (%2$u, %3$u)"), path, (unsigned int) driver->user, (unsigned int) driver->group); @@ -254,12 +253,12 @@ virLockManagerSanlockSetupLockspace(virLockManagerSanlockDriver *driver) char *err = NULL; if (virLockManagerSanlockError(rv, &err)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to query sector size %s: %s"), + _("Unable to query sector size %1$s: %2$s"), path, NULLSTR(err)); VIR_FREE(err); } else { virReportSystemError(-rv, - _("Unable to query sector size %s"), + _("Unable to query sector size %1$s"), path); } goto error_unlink; @@ -270,14 +269,14 @@ virLockManagerSanlockSetupLockspace(virLockManagerSanlockDriver *driver) */ if (safezero(fd, 0, rv) < 0) { virReportSystemError(errno, - _("Unable to allocate lockspace %s"), + _("Unable to allocate lockspace %1$s"), path); goto error_unlink; } if (VIR_CLOSE(fd) < 0) { virReportSystemError(errno, - _("Unable to save lockspace %s"), + _("Unable to save lockspace %1$s"), path); goto error_unlink; } @@ -286,12 +285,12 @@ virLockManagerSanlockSetupLockspace(virLockManagerSanlockDriver *driver) char *err = NULL; if (virLockManagerSanlockError(rv, &err)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to initialize lockspace %s: %s"), + _("Unable to initialize lockspace %1$s: %2$s"), path, NULLSTR(err)); VIR_FREE(err); } else { virReportSystemError(-rv, - _("Unable to initialize lockspace %s"), + _("Unable to initialize lockspace %1$s"), path); } goto error_unlink; @@ -304,7 +303,7 @@ virLockManagerSanlockSetupLockspace(virLockManagerSanlockDriver *driver) (driver->group != (gid_t) -1 && driver->group != st.st_gid)) && (chown(path, driver->user, driver->group) < 0)) { virReportSystemError(errno, - _("cannot chown '%s' to (%u, %u)"), + _("cannot chown '%1$s' to (%2$u, %3$u)"), path, (unsigned int) driver->user, (unsigned int) driver->group); @@ -314,7 +313,7 @@ virLockManagerSanlockSetupLockspace(virLockManagerSanlockDriver *driver) if ((driver->group != (gid_t) -1 && (st.st_mode & 0060) != 0060) && chmod(path, 0660) < 0) { virReportSystemError(errno, - _("cannot chmod '%s' to 0660"), + _("cannot chmod '%1$s' to 0660"), path); goto error; } @@ -344,12 +343,12 @@ virLockManagerSanlockSetupLockspace(virLockManagerSanlockDriver *driver) char *err = NULL; if (virLockManagerSanlockError(rv, &err)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to add lockspace %s: %s"), + _("Unable to add lockspace %1$s: %2$s"), path, NULLSTR(err)); VIR_FREE(err); } else { virReportSystemError(-rv, - _("Unable to add lockspace %s"), + _("Unable to add lockspace %1$s"), path); } goto error; @@ -454,7 +453,7 @@ static int virLockManagerSanlockNew(virLockManager *lock, if (type != VIR_LOCK_MANAGER_OBJECT_TYPE_DOMAIN) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unsupported object type %d"), type); + _("Unsupported object type %1$d"), type); return -1; } @@ -528,7 +527,7 @@ static int virLockManagerSanlockAddLease(virLockManager *lock, res->num_disks = 1; if (virStrcpy(res->name, name, SANLK_NAME_LEN) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Resource name '%s' exceeds %d characters"), + _("Resource name '%1$s' exceeds %2$d characters"), name, SANLK_NAME_LEN); return -1; } @@ -537,7 +536,7 @@ static int virLockManagerSanlockAddLease(virLockManager *lock, if (STREQ(params[i].key, "path")) { if (virStrcpy(res->disks[0].path, params[i].value.str, SANLK_PATH_LEN) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Lease path '%s' exceeds %d characters"), + _("Lease path '%1$s' exceeds %2$d characters"), params[i].value.str, SANLK_PATH_LEN); return -1; } @@ -546,7 +545,7 @@ static int virLockManagerSanlockAddLease(virLockManager *lock, } else if (STREQ(params[i].key, "lockspace")) { if (virStrcpy(res->lockspace_name, params[i].value.str, SANLK_NAME_LEN) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Resource lockspace '%s' exceeds %d characters"), + _("Resource lockspace '%1$s' exceeds %2$d characters"), params[i].value.str, SANLK_NAME_LEN); return -1; } @@ -589,7 +588,7 @@ virLockManagerSanlockAddDisk(virLockManagerSanlockDriver *driver, return -1; if (virStrcpy(res->name, hash, SANLK_NAME_LEN) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("MD5 hash '%s' unexpectedly larger than %d characters"), + _("MD5 hash '%1$s' unexpectedly larger than %2$d characters"), hash, (SANLK_NAME_LEN - 1)); return -1; } @@ -597,7 +596,7 @@ virLockManagerSanlockAddDisk(virLockManagerSanlockDriver *driver, path = g_strdup_printf("%s/%s", driver->autoDiskLeasePath, res->name); if (virStrcpy(res->disks[0].path, path, SANLK_PATH_LEN) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Lease path '%s' exceeds %d characters"), + _("Lease path '%1$s' exceeds %2$d characters"), path, SANLK_PATH_LEN); return -1; } @@ -606,7 +605,7 @@ virLockManagerSanlockAddDisk(virLockManagerSanlockDriver *driver, VIR_LOCK_MANAGER_SANLOCK_AUTO_DISK_LOCKSPACE, SANLK_NAME_LEN) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Resource lockspace '%s' exceeds %d characters"), + _("Resource lockspace '%1$s' exceeds %2$d characters"), VIR_LOCK_MANAGER_SANLOCK_AUTO_DISK_LOCKSPACE, SANLK_NAME_LEN); return -1; } @@ -631,7 +630,7 @@ virLockManagerSanlockCreateLease(virLockManagerSanlockDriver *driver, if ((fd = open(res->disks[0].path, O_WRONLY|O_CREAT|O_EXCL, 0600)) < 0) { if (errno != EEXIST) { virReportSystemError(errno, - _("Unable to create lockspace %s"), + _("Unable to create lockspace %1$s"), res->disks[0].path); return -1; } @@ -641,7 +640,7 @@ virLockManagerSanlockCreateLease(virLockManagerSanlockDriver *driver, if ((driver->user != (uid_t) -1 || driver->group != (gid_t) -1) && (fchown(fd, driver->user, driver->group) < 0)) { virReportSystemError(errno, - _("cannot chown '%s' to (%u, %u)"), + _("cannot chown '%1$s' to (%2$u, %3$u)"), res->disks[0].path, (unsigned int) driver->user, (unsigned int) driver->group); @@ -652,12 +651,12 @@ virLockManagerSanlockCreateLease(virLockManagerSanlockDriver *driver, char *err = NULL; if (virLockManagerSanlockError(rv, &err)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to query sector size %s: %s"), + _("Unable to query sector size %1$s: %2$s"), res->disks[0].path, NULLSTR(err)); VIR_FREE(err); } else { virReportSystemError(-rv, - _("Unable to query sector size %s"), + _("Unable to query sector size %1$s"), res->disks[0].path); } goto error_unlink; @@ -668,14 +667,14 @@ virLockManagerSanlockCreateLease(virLockManagerSanlockDriver *driver, */ if (safezero(fd, 0, rv) < 0) { virReportSystemError(errno, - _("Unable to allocate lease %s"), + _("Unable to allocate lease %1$s"), res->disks[0].path); goto error_unlink; } if (VIR_CLOSE(fd) < 0) { virReportSystemError(errno, - _("Unable to save lease %s"), + _("Unable to save lease %1$s"), res->disks[0].path); goto error_unlink; } @@ -684,12 +683,12 @@ virLockManagerSanlockCreateLease(virLockManagerSanlockDriver *driver, char *err = NULL; if (virLockManagerSanlockError(rv, &err)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to initialize lease %s: %s"), + _("Unable to initialize lease %1$s: %2$s"), res->disks[0].path, NULLSTR(err)); VIR_FREE(err); } else { virReportSystemError(-rv, - _("Unable to initialize lease %s"), + _("Unable to initialize lease %1$s"), res->disks[0].path); } goto error_unlink; @@ -722,7 +721,7 @@ static int virLockManagerSanlockAddResource(virLockManager *lock, if (priv->res_count == SANLK_MAX_RESOURCES) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Too many resources %d for object"), + _("Too many resources %1$d for object"), SANLK_MAX_RESOURCES); return -1; } @@ -757,7 +756,7 @@ static int virLockManagerSanlockAddResource(virLockManager *lock, default: virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unknown lock manager object type %d for domain lock object"), + _("Unknown lock manager object type %1$d for domain lock object"), type); return -1; } @@ -788,7 +787,7 @@ virLockManagerSanlockRegisterKillscript(int sock, case VIR_DOMAIN_LOCK_FAILURE_IGNORE: case VIR_DOMAIN_LOCK_FAILURE_LAST: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Failure action %s is not supported by sanlock"), + _("Failure action %1$s is not supported by sanlock"), virDomainLockFailureTypeToString(action)); return -1; } @@ -812,14 +811,13 @@ virLockManagerSanlockRegisterKillscript(int sock, /* sanlock_killpath() would just crop the strings */ if (strlen(path) >= SANLK_HELPER_PATH_LEN) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Sanlock helper path is longer than %d: '%s'"), + _("Sanlock helper path is longer than %1$d: '%2$s'"), SANLK_HELPER_PATH_LEN - 1, path); return -1; } if (strlen(args) >= SANLK_HELPER_ARGS_LEN) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Sanlock helper arguments are longer than %d:" - " '%s'"), + _("Sanlock helper arguments are longer than %1$d: '%2$s'"), SANLK_HELPER_ARGS_LEN - 1, args); return -1; } @@ -828,7 +826,7 @@ virLockManagerSanlockRegisterKillscript(int sock, char *err = NULL; if (virLockManagerSanlockError(rv, &err)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to register lock failure action: %s"), + _("Failed to register lock failure action: %1$s"), NULLSTR(err)); VIR_FREE(err); } else { @@ -881,7 +879,7 @@ static int virLockManagerSanlockAcquire(virLockManager *lock, char *err = NULL; if (virLockManagerSanlockError(sock, &err)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to open socket to sanlock daemon: %s"), + _("Failed to open socket to sanlock daemon: %1$s"), NULLSTR(err)); VIR_FREE(err); } else { @@ -919,12 +917,12 @@ static int virLockManagerSanlockAcquire(virLockManager *lock, char *err = NULL; if (virLockManagerSanlockError(rv, &err)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to parse lock state %s: %s"), + _("Unable to parse lock state %1$s: %2$s"), state, NULLSTR(err)); VIR_FREE(err); } else { virReportSystemError(-rv, - _("Unable to parse lock state %s"), + _("Unable to parse lock state %1$s"), state); } goto error; @@ -943,7 +941,7 @@ static int virLockManagerSanlockAcquire(virLockManager *lock, char *err = NULL; if (virLockManagerSanlockError(rv, &err)) { virReportError(VIR_ERR_RESOURCE_BUSY, - _("Failed to acquire lock: %s"), + _("Failed to acquire lock: %1$s"), NULLSTR(err)); VIR_FREE(err); } else { @@ -971,7 +969,7 @@ static int virLockManagerSanlockAcquire(virLockManager *lock, char *err = NULL; if (virLockManagerSanlockError(rv, &err)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to restrict process: %s"), +