Preserving the order of format strings (%s, ...) when translating messages may be very hard or even impossible depending on the target language. On the other hand, reordering them requires understanding the C-format strings which is not something we should expect from translators. And even if someone reorders format strings in the right way (by addressing arguments directly using N$), someone else may use a translation tool that requires format strings in msgid and msgstr to match exactly and forces these correct formats to be reverted. As a result of this, we had several reported crashes in some locales because integers were formatted as strings. So to make such crashes less likely to happen and to make translating our messages easier, we now require all messages that are marked for translation to use format strings that always refer to the same argument no matter where they appear in a message (e.g., %1$s, %5$llu). Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com&gt; --- docs/coding-style.rst | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/docs/coding-style.rst b/docs/coding-style.rst index 02d99330bf..92f6099d82 100644 --- a/docs/coding-style.rst +++ b/docs/coding-style.rst @@ -918,24 +918,28 @@ Error messages visible to the user should be short and descriptive. All error messages are translated using gettext and thus must be wrapped in ``_()`` macro. To simplify the translation work, the error message must not be concatenated from various -parts. To simplify searching for the error message in the code the -strings should not be broken even if they result into a line -longer than 80 columns and any formatting modifier should be -enclosed by quotes or other obvious separator. If a string used -with ``%s`` can be NULL the NULLSTR macro must be used. +parts and all format strings must be permutable by directly +addressing each argument using ``%N$...`` syntax. For example, +``%1$s``, ``%2$llu`` or ``%4$s`` to format the first argument as +string, the second argument as unsigned long long, and the fourth +argument as string, respectively. To simplify searching for the error +message in the code the strings should not be broken even if they +result into a line longer than 80 columns and any formatting modifier +should be enclosed by quotes or other obvious separator. If a string +used with ``%N$s`` can be NULL the NULLSTR macro must be used. :: GOOD: virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to connect to remote host '%s'"), hostname) + _("Failed to connect to remote host '%1$s'"), hostname) BAD: virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to %s to remote host '%s'"), + _("Failed to %1$s to remote host '%2$s'"), "connect", hostname); BAD: virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to connect " - "to remote host '%s'), + "to remote host '%1$s'), hostname); Use of goto -- 2.39.2

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com&gt; --- src/admin/admin_server_dispatch.c | 10 +++++----- src/admin/libvirt-admin.c | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/admin/admin_server_dispatch.c b/src/admin/admin_server_dispatch.c index b3e7be8965..ae8a8d4fa6 100644 --- a/src/admin/admin_server_dispatch.c +++ b/src/admin/admin_server_dispatch.c @@ -78,7 +78,7 @@ remoteAdmClientNew(virNetServerClient *client G_GNUC_UNUSED, (long long)clientuid); if (geteuid() != clientuid) { - virReportRestrictedError(_("Disallowing client %lld with uid %lld"), + virReportRestrictedError(_("Disallowing client %1$lld with uid %2$lld"), (long long)clientpid, (long long)clientuid); return NULL; @@ -258,7 +258,7 @@ adminDispatchServerSetThreadpoolParameters(virNetServer *server G_GNUC_UNUSED, if (!(srv = virNetDaemonGetServer(priv->dmn, args->srv.name))) { virReportError(VIR_ERR_NO_SERVER, - _("no server with matching name '%s' found"), + _("no server with matching name '%1$s' found"), args->srv.name); goto cleanup; } @@ -303,14 +303,14 @@ adminDispatchClientGetInfo(virNetServer *server G_GNUC_UNUSED, if (!(srv = virNetDaemonGetServer(priv->dmn, args->clnt.srv.name))) { virReportError(VIR_ERR_NO_SERVER, - _("no server with matching name '%s' found"), + _("no server with matching name '%1$s' found"), args->clnt.srv.name); goto cleanup; } if (!(clnt = virNetServerGetClient(srv, args->clnt.id))) { virReportError(VIR_ERR_NO_CLIENT, - _("no client with matching id '%llu' found"), + _("no client with matching id '%1$llu' found"), (unsigned long long) args->clnt.id); goto cleanup; } @@ -390,7 +390,7 @@ adminDispatchServerSetClientLimits(virNetServer *server G_GNUC_UNUSED, if (!(srv = virNetDaemonGetServer(priv->dmn, args->srv.name))) { virReportError(VIR_ERR_NO_SERVER, - _("no server with matching name '%s' found"), + _("no server with matching name '%1$s' found"), args->srv.name); goto cleanup; } diff --git a/src/admin/libvirt-admin.c b/src/admin/libvirt-admin.c index 1786a283e5..3c756eb376 100644 --- a/src/admin/libvirt-admin.c +++ b/src/admin/libvirt-admin.c @@ -116,7 +116,7 @@ getSocketPath(virURI *uri) sock_path = g_strdup(param->value); } else { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Unknown URI parameter '%s'"), param->name); + _("Unknown URI parameter '%1$s'"), param->name); return NULL; } } @@ -134,7 +134,7 @@ getSocketPath(virURI *uri) legacy = true; } else if (!STRPREFIX(uri->scheme, "virt")) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Unsupported URI scheme '%s'"), + _("Unsupported URI scheme '%1$s'"), uri->scheme); return NULL; } @@ -151,7 +151,7 @@ getSocketPath(virURI *uri) sock_path = g_strdup_printf("%s/%s", rundir, sockbase); } else { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Invalid URI path '%s', try '/system'"), + _("Invalid URI path '%1$s', try '/system'"), NULLSTR_EMPTY(uri->path)); return NULL; } -- 2.39.2

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com&gt; --- src/ch/ch_conf.c | 2 +- src/ch/ch_domain.c | 4 ++-- src/ch/ch_driver.c | 20 ++++++++++---------- src/ch/ch_monitor.c | 27 ++++++++++++++------------- src/ch/ch_process.c | 6 +++--- 5 files changed, 30 insertions(+), 29 deletions(-) diff --git a/src/ch/ch_conf.c b/src/ch/ch_conf.c index 0d07fa270c..2bb2eaf820 100644 --- a/src/ch/ch_conf.c +++ b/src/ch/ch_conf.c @@ -202,7 +202,7 @@ chExtractVersion(virCHDriver *driver) if (virStringParseVersion(&version, tmp, true) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to parse cloud-hypervisor version: %s"), tmp); + _("Unable to parse cloud-hypervisor version: %1$s"), tmp); return -1; } diff --git a/src/ch/ch_domain.c b/src/ch/ch_domain.c index cf98654479..35e3471cba 100644 --- a/src/ch/ch_domain.c +++ b/src/ch/ch_domain.c @@ -176,7 +176,7 @@ chValidateDomainDeviceDef(const virDomainDeviceDef *dev, case VIR_DOMAIN_DEVICE_AUDIO: case VIR_DOMAIN_DEVICE_CRYPTO: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Cloud-Hypervisor doesn't support '%s' device"), + _("Cloud-Hypervisor doesn't support '%1$s' device"), virDomainDeviceTypeToString(dev->type)); return -1; @@ -340,7 +340,7 @@ virCHDomainObjFromDomain(virDomainPtr domain) if (!vm) { virUUIDFormat(domain->uuid, uuidstr); virReportError(VIR_ERR_NO_DOMAIN, - _("no domain with matching uuid '%s' (%s)"), + _("no domain with matching uuid '%1$s' (%2$s)"), uuidstr, domain->name); return NULL; } diff --git a/src/ch/ch_driver.c b/src/ch/ch_driver.c index 12fbe31c24..72fe3198b2 100644 --- a/src/ch/ch_driver.c +++ b/src/ch/ch_driver.c @@ -631,7 +631,7 @@ static virDomainPtr chDomainLookupByID(virConnectPtr 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; } @@ -656,7 +656,7 @@ static virDomainPtr chDomainLookupByName(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; } @@ -683,7 +683,7 @@ static virDomainPtr chDomainLookupByUUID(virConnectPtr conn, char uuidstr[VIR_UUID_STRING_BUFLEN]; virUUIDFormat(uuid, uuidstr); virReportError(VIR_ERR_NO_DOMAIN, - _("no domain with matching uuid '%s'"), uuidstr); + _("no domain with matching uuid '%1$s'"), uuidstr); goto cleanup; } @@ -817,14 +817,14 @@ chDomainOpenConsole(virDomainPtr dom, } if (!chr) { - virReportError(VIR_ERR_INTERNAL_ERROR, _("cannot find character device %s"), + virReportError(VIR_ERR_INTERNAL_ERROR, _("cannot find character device %1$s"), NULLSTR(dev_name)); goto cleanup; } if (chr->source->type != VIR_DOMAIN_CHR_TYPE_PTY) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("character device %s is not using a PTY"), + _("character device %1$s is not using a PTY"), dev_name ? dev_name : NULLSTR(chr->info.alias)); goto cleanup; } @@ -930,7 +930,7 @@ chConnectSupportsFeature(virConnectPtr conn, case VIR_DRV_FEATURE_NETWORK_UPDATE_HAS_CORRECT_ORDER: case VIR_DRV_FEATURE_FD_PASSING: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Global feature %d should have already been handled"), + _("Global feature %1$d should have already been handled"), feature); return -1; case VIR_DRV_FEATURE_MIGRATION_V2: @@ -1158,7 +1158,7 @@ chDomainPinVcpuLive(virDomainObj *vm, if (!(vcpuinfo = virDomainDefGetVcpu(def, vcpu))) { virReportError(VIR_ERR_INVALID_ARG, - _("vcpu %d is out of range of live cpu count %d"), + _("vcpu %1$d is out of range of live cpu count %2$d"), vcpu, virDomainDefGetVcpusMax(def)); return -1; } @@ -1228,7 +1228,7 @@ chDomainPinVcpuFlags(virDomainPtr dom, if (persistentDef && !(vcpuinfo = virDomainDefGetVcpu(persistentDef, vcpu))) { virReportError(VIR_ERR_INVALID_ARG, - _("vcpu %d is out of range of persistent cpu count %d"), + _("vcpu %1$d is out of range of persistent cpu count %2$d"), vcpu, virDomainDefGetVcpus(persistentDef)); goto endjob; } @@ -1609,7 +1609,7 @@ chDomainSetNumaParameters(virDomainPtr dom, if (mode < 0 || mode >= VIR_DOMAIN_NUMATUNE_MEM_LAST) { virReportError(VIR_ERR_INVALID_ARG, - _("unsupported numatune mode: '%d'"), mode); + _("unsupported numatune mode: '%1$d'"), mode); goto cleanup; } @@ -1620,7 +1620,7 @@ chDomainSetNumaParameters(virDomainPtr dom, if (virBitmapIsAllClear(nodeset)) { virReportError(VIR_ERR_OPERATION_INVALID, - _("Invalid nodeset of 'numatune': %s"), + _("Invalid nodeset of 'numatune': %1$s"), param->value.s); goto cleanup; } diff --git a/src/ch/ch_monitor.c b/src/ch/ch_monitor.c index 7b8f0a8077..d902bc6959 100644 --- a/src/ch/ch_monitor.c +++ b/src/ch/ch_monitor.c @@ -176,7 +176,8 @@ virCHMonitorBuildDiskJson(virJSONValue *disks, virDomainDiskDef *diskdef) } if (diskdef->bus != VIR_DOMAIN_DISK_BUS_VIRTIO) { virReportError(VIR_ERR_INVALID_ARG, - _("Only virtio bus types are supported for '%s'"), diskdef->src->path); + _("Only virtio bus types are supported for '%1$s'"), + diskdef->src->path); return -1; } if (virJSONValueObjectAppendString(disk, "path", diskdef->src->path) < 0) @@ -253,7 +254,7 @@ virCHMonitorBuildNetJson(virJSONValue *nets, if (virSocketAddrPrefixToNetmask(ip->prefix, &netmask, AF_INET) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to translate net prefix %d to netmask"), + _("Failed to translate net prefix %1$d to netmask"), ip->prefix); return -1; } @@ -331,7 +332,7 @@ virCHMonitorBuildNetJson(virJSONValue *nets, if (netdef->driver.virtio.rx_queue_size || netdef->driver.virtio.tx_queue_size) { if (netdef->driver.virtio.rx_queue_size != netdef->driver.virtio.tx_queue_size) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("virtio rx_queue_size option %d is not same with tx_queue_size %d"), + _("virtio rx_queue_size option %1$d is not same with tx_queue_size %2$d"), netdef->driver.virtio.rx_queue_size, netdef->driver.virtio.tx_queue_size); return -1; @@ -388,7 +389,7 @@ virCHMonitorBuildDeviceJson(virJSONValue *devices, path = g_strdup_printf("/sys/bus/pci/devices/%s/", name); if (!virFileExists(path)) { virReportError(VIR_ERR_DEVICE_MISSING, - _("host pci device %s not found"), path); + _("host pci device %1$s not found"), path); return -1; } if (virJSONValueObjectAppendString(device, "path", path) < 0) @@ -481,28 +482,28 @@ chMonitorCreateSocket(const char *socket_path) addr.sun_family = AF_UNIX; if (virStrcpyStatic(addr.sun_path, socket_path) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("UNIX socket path '%s' too long"), + _("UNIX socket path '%1$s' too long"), socket_path); goto error; } if (unlink(socket_path) < 0 && errno != ENOENT) { virReportSystemError(errno, - _("Unable to unlink %s"), + _("Unable to unlink %1$s"), socket_path); goto error; } if (bind(fd, (struct sockaddr *)&addr, addrlen) < 0) { virReportSystemError(errno, - _("Unable to bind to UNIX socket path '%s'"), + _("Unable to bind to UNIX socket path '%1$s'"), socket_path); goto error; } if (listen(fd, 1) < 0) { virReportSystemError(errno, - _("Unable to listen to UNIX socket path '%s'"), + _("Unable to listen to UNIX socket path '%1$s'"), socket_path); goto error; } @@ -543,7 +544,7 @@ virCHMonitorNew(virDomainObj *vm, const char *socketdir) mon->socketpath = g_strdup_printf("%s/%s-socket", socketdir, vm->def->name); if (g_mkdir_with_parents(socketdir, 0777) < 0) { virReportSystemError(errno, - _("Cannot create socket directory '%s'"), + _("Cannot create socket directory '%1$s'"), socketdir); return NULL; } @@ -553,7 +554,7 @@ virCHMonitorNew(virDomainObj *vm, const char *socketdir) socket_fd = chMonitorCreateSocket(mon->socketpath); if (socket_fd < 0) { virReportSystemError(errno, - _("Cannot create socket '%s'"), + _("Cannot create socket '%1$s'"), mon->socketpath); return NULL; } @@ -619,7 +620,7 @@ virCHMonitorCurlPerform(CURL *handle) if (errorCode != CURLE_OK) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("curl_easy_perform() returned an error: %s (%d)"), + _("curl_easy_perform() returned an error: %1$s (%2$d)"), curl_easy_strerror(errorCode), errorCode); return -1; } @@ -629,8 +630,8 @@ virCHMonitorCurlPerform(CURL *handle) if (errorCode != CURLE_OK) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("curl_easy_getinfo(CURLINFO_RESPONSE_CODE) returned an " - "error: %s (%d)"), curl_easy_strerror(errorCode), + _("curl_easy_getinfo(CURLINFO_RESPONSE_CODE) returned an error: %1$s (%2$d)"), + curl_easy_strerror(errorCode), errorCode); return -1; } diff --git a/src/ch/ch_process.c b/src/ch/ch_process.c index 77f55e777b..c145a78496 100644 --- a/src/ch/ch_process.c +++ b/src/ch/ch_process.c @@ -67,7 +67,7 @@ virCHProcessUpdateConsoleDevice(virDomainObj *vm, dev = virJSONValueObjectGet(config, device); if (!dev) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("missing '%s' in 'config' from cloud-hypervisor"), + _("missing '%1$s' in 'config' from cloud-hypervisor"), device); return; } @@ -75,7 +75,7 @@ virCHProcessUpdateConsoleDevice(virDomainObj *vm, file = virJSONValueObjectGet(dev, "file"); if (!file) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("missing 'file' in '%s' from cloud-hypervisor"), + _("missing 'file' in '%1$s' from cloud-hypervisor"), device); return; } @@ -83,7 +83,7 @@ virCHProcessUpdateConsoleDevice(virDomainObj *vm, path = virJSONValueGetString(file); if (!path) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unable to parse contents of 'file' field in '%s' from cloud-hypervisor"), + _("unable to parse contents of 'file' field in '%1$s' from cloud-hypervisor"), device); return; } -- 2.39.2

On Fri, Mar 10, 2023 at 05:09:22PM +0100, Jiri Denemark wrote: This is an unusal case The current msgid was completely broken as xgettext does not cope with macro expansion, thus libvirt.pot merely contains "Target device PCI address " !! At the end of the series though there are still some places which are using this format which are translatable: $ git grep VIR_PCI_DEVICE_ADDRESS_FMT src/libxl/libxl_driver.c: _("target pci device " VIR_PCI_DEVICE_ADDRESS_FMT src/libxl/libxl_driver.c: VIR_PCI_DEVICE_ADDRESS_FMT), src/libxl/libxl_driver.c: _("host pci device " VIR_PCI_DEVICE_ADDRESS_FMT src/libxl/libxl_driver.c: VIR_PCI_DEVICE_ADDRESS_FMT), src/libxl/libxl_driver.c: VIR_PCI_DEVICE_ADDRESS_FMT), src/qemu/qemu_command.c: g_autofree char *host = g_strdup_printf(VIR_PCI_DEVICE_ADDRESS_FMT, src/qemu/qemu_hotplug.c: _("host pci device " VIR_PCI_DEVICE_ADDRESS_FMT src/util/virpci.c: return g_strdup_printf(VIR_PCI_DEVICE_ADDRESS_FMT, addr->domain, src/util/virpci.c: pcidir = g_strdup_printf("/sys/bus/pci/devices/" VIR_PCI_DEVICE_ADDRESS_FMT, src/util/virpci.c: groupPath = g_strdup_printf(PCI_SYSFS "devices/" VIR_PCI_DEVICE_ADDRESS_FMT "/iommu_group/devices", src/util/virpci.c: VIR_DEBUG("PF for VF device '%s': " VIR_PCI_DEVICE_ADDRESS_FMT, src/util/virpci.c: *pci_sysfs_device_link = g_strdup_printf(PCI_SYSFS "devices/" VIR_PCI_DEVICE_ADDRESS_FMT, addr->domain, src/util/virpci.h:#define VIR_PCI_DEVICE_ADDRESS_FMT "%04x:%02x:%02x.%d" the virpci.c hits are safe as they're for filenames. The qemu_hotplug.c and libxl_driver.c files need changing though. I think ideally we would make VIR_PCI_DEVICE_ADDRESS_FMT private to virpci.c, and add a helper to virpci.c that can be used from qemu_command.c, so we avoid introducing more usage of this in translations. eg virPCIAddressFormat(....) Likewise add a helper for VIR_CCW_DEVICE_ADDRESS_FMT, which fortunately is not (yet) used in any translations. I think this ought to all be done in a commit at the start of this series, so this patch is merely adding format positions. With regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com&gt; --- src/conf/network_conf.c | 367 +++++++++++++++++----------------------- 1 file changed, 152 insertions(+), 215 deletions(-) diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 5d1f0e5203..73011cb7a2 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -459,7 +459,7 @@ virNetworkDHCPRangeDefParseXML(const char *networkName, if (!(start = virXMLPropString(node, "start"))) { virReportError(VIR_ERR_XML_ERROR, - _("Missing 'start' attribute in dhcp range for network '%s'"), + _("Missing 'start' attribute in dhcp range for network '%1$s'"), networkName); return -1; } @@ -468,7 +468,7 @@ virNetworkDHCPRangeDefParseXML(const char *networkName, if (!(end = virXMLPropString(node, "end"))) { virReportError(VIR_ERR_XML_ERROR, - _("Missing 'end' attribute in dhcp range for network '%s'"), + _("Missing 'end' attribute in dhcp range for network '%1$s'"), networkName); return -1; } @@ -507,21 +507,19 @@ virNetworkDHCPHostDefParseXML(const char *networkName, if (mac != NULL) { if (VIR_SOCKET_ADDR_IS_FAMILY(&def->address, AF_INET6)) { virReportError(VIR_ERR_XML_ERROR, - _("Invalid to specify MAC address '%s' " - "in network '%s' IPv6 static host definition"), + _("Invalid to specify MAC address '%1$s' in network '%2$s' IPv6 static host definition"), mac, networkName); return -1; } if (virMacAddrParse(mac, &addr) < 0) { virReportError(VIR_ERR_XML_ERROR, - _("Cannot parse MAC address '%s' in network '%s'"), + _("Cannot parse MAC address '%1$s' in network '%2$s'"), mac, networkName); return -1; } if (virMacAddrIsMulticast(&addr)) { virReportError(VIR_ERR_XML_ERROR, - _("expected unicast mac address, found " - "multicast '%s' in network '%s'"), + _("expected unicast mac address, found multicast '%1$s' in network '%2$s'"), (const char *)mac, networkName); return -1; } @@ -532,7 +530,7 @@ virNetworkDHCPHostDefParseXML(const char *networkName, char *cp = id + strspn(id, "0123456789abcdefABCDEF:"); if (*cp) { virReportError(VIR_ERR_XML_ERROR, - _("Invalid character '%c' in id '%s' of network '%s'"), + _("Invalid character '%1$c' in id '%2$s' of network '%3$s'"), *cp, id, networkName); return -1; } @@ -541,7 +539,7 @@ virNetworkDHCPHostDefParseXML(const char *networkName, name = virXMLPropString(node, "name"); if (name && !(g_ascii_isalpha(name[0]) || g_ascii_isdigit(name[0]))) { virReportError(VIR_ERR_XML_ERROR, - _("Cannot use host name '%s' in network '%s'"), + _("Cannot use host name '%1$s' in network '%2$s'"), name, networkName); return -1; } @@ -549,8 +547,7 @@ virNetworkDHCPHostDefParseXML(const char *networkName, ip = virXMLPropString(node, "ip"); if (ip && (virSocketAddrParse(&inaddr, ip, AF_UNSPEC) < 0)) { virReportError(VIR_ERR_XML_ERROR, - _("Invalid IP address in static host definition " - "for network '%s'"), + _("Invalid IP address in static host definition for network '%1$s'"), networkName); return -1; } @@ -559,9 +556,7 @@ virNetworkDHCPHostDefParseXML(const char *networkName, /* for search/match, you just need one of the three */ if (!(mac || name || ip)) { virReportError(VIR_ERR_XML_ERROR, - _("At least one of name, mac, or ip attribute " - "must be specified for static host definition " - "in network '%s' "), + _("At least one of name, mac, or ip attribute must be specified for static host definition in network '%1$s'"), networkName); return -1; } @@ -572,22 +567,19 @@ virNetworkDHCPHostDefParseXML(const char *networkName, if (VIR_SOCKET_ADDR_IS_FAMILY(&def->address, AF_INET6)) { if (!(id || name)) { virReportError(VIR_ERR_XML_ERROR, - _("Static host definition in IPv6 network '%s' " - "must have id or name attribute"), + _("Static host definition in IPv6 network '%1$s' must have id or name attribute"), networkName); return -1; } } else if (!(mac || name)) { virReportError(VIR_ERR_XML_ERROR, - _("Static host definition in IPv4 network '%s' " - "must have mac or name attribute"), + _("Static host definition in IPv4 network '%1$s' must have mac or name attribute"), networkName); return -1; } if (!ip) { virReportError(VIR_ERR_XML_ERROR, - _("Missing IP address in static host definition " - "for network '%s'"), + _("Missing IP address in static host definition for network '%1$s'"), networkName); return -1; } @@ -681,14 +673,14 @@ virNetworkDNSHostDefParseXML(const char *networkName, if (!(ip = virXMLPropString(node, "ip")) && !partialOkay) { virReportError(VIR_ERR_XML_DETAIL, - _("Missing IP address in network '%s' DNS HOST record"), + _("Missing IP address in network '%1$s' DNS HOST record"), networkName); goto error; } if (ip && (virSocketAddrParse(&def->ip, ip, AF_UNSPEC) < 0)) { virReportError(VIR_ERR_XML_DETAIL, - _("Invalid IP address in network '%s' DNS HOST record"), + _("Invalid IP address in network '%1$s' DNS HOST record"), networkName); goto error; } @@ -705,7 +697,7 @@ virNetworkDNSHostDefParseXML(const char *networkName, if (!name[0]) { virReportError(VIR_ERR_XML_DETAIL, - _("Missing hostname in network '%s' DNS HOST record"), + _("Missing hostname in network '%1$s' DNS HOST record"), networkName); goto error; } @@ -716,14 +708,14 @@ virNetworkDNSHostDefParseXML(const char *networkName, } if (def->nnames == 0 && !partialOkay) { virReportError(VIR_ERR_XML_DETAIL, - _("Missing hostname in network '%s' DNS HOST record"), + _("Missing hostname in network '%1$s' DNS HOST record"), networkName); goto error; } if (!VIR_SOCKET_ADDR_VALID(&def->ip) && def->nnames == 0) { virReportError(VIR_ERR_XML_DETAIL, - _("Missing ip and hostname in network '%s' DNS HOST record"), + _("Missing ip and hostname in network '%1$s' DNS HOST record"), networkName); goto error; } @@ -765,22 +757,20 @@ virNetworkDNSSrvDefParseXML(const char *networkName, if (!(def->service = virXMLPropString(node, "service")) && !partialOkay) { virReportError(VIR_ERR_XML_DETAIL, - _("missing required service attribute in DNS SRV record " - "of network '%s'"), networkName); + _("missing required service attribute in DNS SRV record of network '%1$s'"), + networkName); goto error; } if (def->service) { if (strlen(def->service) > DNS_RECORD_LENGTH_SRV) { virReportError(VIR_ERR_XML_DETAIL, - _("service attribute '%s' in network '%s' is too long, " - "limit is %d bytes"), + _("service attribute '%1$s' in network '%2$s' is too long, limit is %3$d bytes"), def->service, networkName, DNS_RECORD_LENGTH_SRV); goto error; } if (strspn(def->service, SERVICE_CHARS) < strlen(def->service)) { virReportError(VIR_ERR_XML_DETAIL, - _("invalid character in service attribute '%s' " - "in DNS SRV record of network '%s'"), + _("invalid character in service attribute '%1$s' in DNS SRV record of network '%2$s'"), def->service, networkName); goto error; } @@ -788,16 +778,14 @@ virNetworkDNSSrvDefParseXML(const char *networkName, if (!(def->protocol = virXMLPropString(node, "protocol")) && !partialOkay) { virReportError(VIR_ERR_XML_DETAIL, - _("missing required protocol attribute " - "in DNS SRV record '%s' of network '%s'"), + _("missing required protocol attribute in DNS SRV record '%1$s' of network '%2$s'"), def->service, networkName); goto error; } if (def->protocol && strspn(def->protocol, PROTOCOL_CHARS) < strlen(def->protocol)) { virReportError(VIR_ERR_XML_DETAIL, - _("invalid character in protocol attribute '%s' " - "in DNS SRV record of network '%s'"), + _("invalid character in protocol attribute '%1$s' in DNS SRV record of network '%2$s'"), def->protocol, networkName); goto error; } @@ -809,15 +797,13 @@ virNetworkDNSSrvDefParseXML(const char *networkName, ret = virXPathUInt("string(./@port)", ctxt, &def->port); if (ret >= 0 && !def->target) { virReportError(VIR_ERR_XML_DETAIL, - _("DNS SRV port attribute not permitted without " - "target for service '%s' in network '%s'"), + _("DNS SRV port attribute not permitted without target for service '%1$s' in network '%2$s'"), def->service, networkName); goto error; } if (ret == -2 || (ret >= 0 && (def->port < 1 || def->port > 65535))) { virReportError(VIR_ERR_XML_DETAIL, - _("invalid DNS SRV port attribute " - "for service '%s' in network '%s'"), + _("invalid DNS SRV port attribute for service '%1$s' in network '%2$s'"), def->service, networkName); goto error; } @@ -825,15 +811,13 @@ virNetworkDNSSrvDefParseXML(const char *networkName, ret = virXPathUInt("string(./@priority)", ctxt, &def->priority); if (ret >= 0 && !def->target) { virReportError(VIR_ERR_XML_DETAIL, - _("DNS SRV priority attribute not permitted without " - "target for service '%s' in network '%s'"), + _("DNS SRV priority attribute not permitted without target for service '%1$s' in network '%2$s'"), def->service, networkName); goto error; } if (ret == -2 || (ret >= 0 && def->priority > 65535)) { virReportError(VIR_ERR_XML_DETAIL, - _("Invalid DNS SRV priority attribute " - "for service '%s' in network '%s'"), + _("Invalid DNS SRV priority attribute for service '%1$s' in network '%2$s'"), def->service, networkName); goto error; } @@ -841,15 +825,13 @@ virNetworkDNSSrvDefParseXML(const char *networkName, ret = virXPathUInt("string(./@weight)", ctxt, &def->weight); if (ret >= 0 && !def->target) { virReportError(VIR_ERR_XML_DETAIL, - _("DNS SRV weight attribute not permitted without " - "target for service '%s' in network '%s'"), + _("DNS SRV weight attribute not permitted without target for service '%1$s' in network '%2$s'"), def->service, networkName); goto error; } if (ret == -2 || (ret >= 0 && def->weight > 65535)) { virReportError(VIR_ERR_XML_DETAIL, - _("invalid DNS SRV weight attribute " - "for service '%s' in network '%s'"), + _("invalid DNS SRV weight attribute for service '%1$s' in network '%2$s'"), def->service, networkName); goto error; } @@ -872,27 +854,27 @@ virNetworkDNSTxtDefParseXML(const char *networkName, if (!(def->name = virXMLPropString(node, "name"))) { virReportError(VIR_ERR_XML_DETAIL, - _("missing required name attribute in DNS TXT record " - "of network %s"), networkName); + _("missing required name attribute in DNS TXT record of network %1$s"), + networkName); goto error; } if (strcspn(def->name, bad) != strlen(def->name)) { virReportError(VIR_ERR_XML_DETAIL, - _("prohibited character in DNS TXT record " - "name '%s' of network %s"), def->name, networkName); + _("prohibited character in DNS TXT record name '%1$s' of network %2$s"), + def->name, networkName); goto error; } if (!(def->value = virXMLPropString(node, "value")) && !partialOkay) { virReportError(VIR_ERR_XML_DETAIL, - _("missing required value attribute in DNS TXT record " - "named '%s' of network %s"), def->name, networkName); + _("missing required value attribute in DNS TXT record named '%1$s' of network %2$s"), + def->name, networkName); goto error; } if (!(def->name || def->value)) { virReportError(VIR_ERR_XML_DETAIL, - _("Missing required name or value " - "in DNS TXT record of network %s"), networkName); + _("Missing required name or value in DNS TXT record of network %1$s"), + networkName); goto error; } return 0; @@ -932,7 +914,7 @@ virNetworkDNSDefParseXML(const char *networkName, nfwds = virXPathNodeSet("./forwarder", ctxt, &fwdNodes); if (nfwds < 0) { virReportError(VIR_ERR_XML_ERROR, - _("invalid <forwarder> element found in <dns> of network %s"), + _("invalid <forwarder> element found in <dns> of network %1$s"), networkName); return -1; } @@ -945,8 +927,7 @@ virNetworkDNSDefParseXML(const char *networkName, if (addr && virSocketAddrParse(&def->forwarders[i].addr, addr, AF_UNSPEC) < 0) { virReportError(VIR_ERR_XML_ERROR, - _("Invalid forwarder IP address '%s' " - "in network '%s'"), + _("Invalid forwarder IP address '%1$s' in network '%2$s'"), addr, networkName); return -1; } @@ -964,7 +945,7 @@ virNetworkDNSDefParseXML(const char *networkName, nhosts = virXPathNodeSet("./host", ctxt, &hostNodes); if (nhosts < 0) { virReportError(VIR_ERR_XML_ERROR, - _("invalid <host> element found in <dns> of network %s"), + _("invalid <host> element found in <dns> of network %1$s"), networkName); return -1; } @@ -983,7 +964,7 @@ virNetworkDNSDefParseXML(const char *networkName, nsrvs = virXPathNodeSet("./srv", ctxt, &srvNodes); if (nsrvs < 0) { virReportError(VIR_ERR_XML_ERROR, - _("invalid <srv> element found in <dns> of network %s"), + _("invalid <srv> element found in <dns> of network %1$s"), networkName); return -1; } @@ -1002,7 +983,7 @@ virNetworkDNSDefParseXML(const char *networkName, ntxts = virXPathNodeSet("./txt", ctxt, &txtNodes); if (ntxts < 0) { virReportError(VIR_ERR_XML_ERROR, - _("invalid <txt> element found in <dns> of network %s"), + _("invalid <txt> element found in <dns> of network %1$s"), networkName); return -1; } @@ -1021,7 +1002,7 @@ virNetworkDNSDefParseXML(const char *networkName, if (def->enable == VIR_TRISTATE_BOOL_NO && (nfwds || nhosts || nsrvs || ntxts)) { virReportError(VIR_ERR_XML_ERROR, - _("Extra data in disabled network '%s'"), + _("Extra data in disabled network '%1$s'"), networkName); return -1; } @@ -1055,13 +1036,13 @@ virNetworkIPDefParseXML(const char *networkName, address = virXPathString("string(./@address)", ctxt); if (!address) { virReportError(VIR_ERR_XML_ERROR, - _("Missing required address attribute in network '%s'"), + _("Missing required address attribute in network '%1$s'"), networkName); goto cleanup; } if (virSocketAddrParse(&def->address, address, AF_UNSPEC) < 0) { virReportError(VIR_ERR_XML_ERROR, - _("Invalid address '%s' in network '%s'"), + _("Invalid address '%1$s' in network '%2$s'"), address, networkName); goto cleanup; } @@ -1070,7 +1051,7 @@ virNetworkIPDefParseXML(const char *networkName, if (netmask && (virSocketAddrParse(&def->netmask, netmask, AF_UNSPEC) < 0)) { virReportError(VIR_ERR_XML_ERROR, - _("Invalid netmask '%s' in network '%s'"), + _("Invalid netmask '%1$s' in network '%2$s'"), netmask, networkName); goto cleanup; } @@ -1088,52 +1069,51 @@ virNetworkIPDefParseXML(const char *networkName, if (!(VIR_SOCKET_ADDR_IS_FAMILY(&def->address, AF_INET) || VIR_SOCKET_ADDR_IS_FAMILY(&def->address, AF_UNSPEC))) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("%s family specified for non-IPv4 address '%s' in network '%s'"), + _("%1$s family specified for non-IPv4 address '%2$s' in network '%3$s'"), def->family == NULL? "no" : "ipv4", address, networkName); goto cleanup; } if (netmask) { if (!VIR_SOCKET_ADDR_IS_FAMILY(&def->netmask, AF_INET)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Invalid netmask '%s' for address '%s' " - "in network '%s' (both must be IPv4)"), + _("Invalid netmask '%1$s' for address '%2$s' in network '%3$s' (both must be IPv4)"), netmask, address, networkName); goto cleanup; } if (def->prefix > 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Network '%s' IP address cannot have " - "both a prefix and a netmask"), networkName); + _("Network '%1$s' IP address cannot have both a prefix and a netmask"), + networkName); goto cleanup; } } else if (def->prefix > 32) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Invalid IPv4 prefix '%u' in network '%s'"), + _("Invalid IPv4 prefix '%1$u' in network '%2$s'"), def->prefix, networkName); goto cleanup; } } else if (STREQ(def->family, "ipv6")) { if (!VIR_SOCKET_ADDR_IS_FAMILY(&def->address, AF_INET6)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Family 'ipv6' specified for non-IPv6 address '%s' in network '%s'"), + _("Family 'ipv6' specified for non-IPv6 address '%1$s' in network '%2$s'"), address, networkName); goto cleanup; } if (netmask) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("netmask not allowed for IPv6 address '%s' in network '%s'"), + _("netmask not allowed for IPv6 address '%1$s' in network '%2$s'"), address, networkName); goto cleanup; } if (def->prefix > 128) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Invalid IPv6 prefix '%u' in network '%s'"), + _("Invalid IPv6 prefix '%1$u' in network '%2$s'"), def->prefix, networkName); goto cleanup; } } else { virReportError(VIR_ERR_XML_ERROR, - _("Unrecognized family '%s' in network '%s'"), + _("Unrecognized family '%1$s' in network '%2$s'"), def->family, networkName); goto cleanup; } @@ -1145,8 +1125,7 @@ virNetworkIPDefParseXML(const char *networkName, if (virXPathNode("./tftp[1]", ctxt)) { if (!VIR_SOCKET_ADDR_IS_FAMILY(&def->address, AF_INET)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Unsupported <tftp> element in an IPv6 element " - "in network '%s'"), + _("Unsupported <tftp> element in an IPv6 element in network '%1$s'"), networkName); goto cleanup; } @@ -1253,7 +1232,7 @@ virNetworkForwardNatDefParseXML(const char *networkName, if (def->type != VIR_NETWORK_FORWARD_NAT) { virReportError(VIR_ERR_XML_ERROR, - _("The <nat> element can only be used when <forward> 'mode' is 'nat' in network %s"), + _("The <nat> element can only be used when <forward> 'mode' is 'nat' in network %1$s"), networkName); return -1; } @@ -1266,42 +1245,42 @@ virNetworkForwardNatDefParseXML(const char *networkName, nNatAddrs = virXPathNodeSet("./address", ctxt, &natAddrNodes); if (nNatAddrs < 0) { virReportError(VIR_ERR_XML_ERROR, - _("invalid <address> element found in <forward> of " - "network %s"), networkName); + _("invalid <address> element found in <forward> of network %1$s"), + networkName); return -1; } else if (nNatAddrs > 1) { virReportError(VIR_ERR_XML_ERROR, - _("Only one <address> element is allowed in <nat> in " - "<forward> in network %s"), networkName); + _("Only one <address> element is allowed in <nat> in <forward> in network %1$s"), + networkName); return -1; } else if (nNatAddrs == 1) { addrStart = virXMLPropString(*natAddrNodes, "start"); if (addrStart == NULL) { virReportError(VIR_ERR_XML_ERROR, - _("missing 'start' attribute in <address> element in <nat> in " - "<forward> in network %s"), networkName); + _("missing 'start' attribute in <address> element in <nat> in <forward> in network %1$s"), + networkName); return -1; } addrEnd = virXMLPropString(*natAddrNodes, "end"); if (addrEnd == NULL) { virReportError(VIR_ERR_XML_ERROR, - _("missing 'end' attribute in <address> element in <nat> in " - "<forward> in network %s"), networkName); + _("missing 'end' attribute in <address> element in <nat> in <forward> in network %1$s"), + networkName); return -1; } } if (addrStart && virSocketAddrParse(&def->addr.start, addrStart, AF_INET) < 0) { virReportError(VIR_ERR_XML_ERROR, - _("Bad ipv4 start address '%s' in <nat> in <forward> in " - "network '%s'"), addrStart, networkName); + _("Bad ipv4 start address '%1$s' in <nat> in <forward> in network '%2$s'"), + addrStart, networkName); return -1; } if (addrEnd && virSocketAddrParse(&def->addr.end, addrEnd, AF_INET) < 0) { virReportError(VIR_ERR_XML_ERROR, - _("Bad ipv4 end address '%s' in <nat> in <forward> in " - "network '%s'"), addrEnd, networkName); + _("Bad ipv4 end address '%1$s' in <nat> in <forward> in network '%2$s'"), + addrEnd, networkName); return -1; } @@ -1312,15 +1291,13 @@ virNetworkForwardNatDefParseXML(const char *networkName, } else { if (addrStart) { virReportError(VIR_ERR_XML_ERROR, - _("Only start address '%s' specified in <nat> in " - "<forward> in network '%s'"), + _("Only start address '%1$s' specified in <nat> in <forward> in network '%2$s'"), addrStart, networkName); return -1; } if (addrEnd) { virReportError(VIR_ERR_XML_ERROR, - _("Only end address '%s' specified in <nat> in " - "<forward> in network '%s'"), + _("Only end address '%1$s' specified in <nat> in <forward> in network '%2$s'"), addrEnd, networkName); return -1; } @@ -1330,29 +1307,28 @@ virNetworkForwardNatDefParseXML(const char *networkName, nNatPorts = virXPathNodeSet("./port", ctxt, &natPortNodes); if (nNatPorts < 0) { virReportError(VIR_ERR_XML_ERROR, - _("invalid <port> element found in <forward> of " - "network %s"), networkName); + _("invalid <port> element found in <forward> of network %1$s"), + networkName); return -1; } else if (nNatPorts > 1) { virReportError(VIR_ERR_XML_ERROR, - _("Only one <port> element is allowed in <nat> in " - "<forward> in network %s"), networkName); + _("Only one <port> element is allowed in <nat> in <forward> in network %1$s"), + networkName); return -1; } else if (nNatPorts == 1) { if (virXPathUInt("string(./port[1]/@start)", ctxt, &def->port.start) < 0 || def->port.start > 65535) { virReportError(VIR_ERR_XML_DETAIL, - _("Missing or invalid 'start' attribute in <port> " - "in <nat> in <forward> in network %s"), - networkName); + _("Missing or invalid 'start' attribute in <port> in <nat> in <forward> in network %1$s"), + networkName); return -1; } if (virXPathUInt("string(./port[1]/@end)", ctxt, &def->port.end) < 0 || def->port.end > 65535 || def->port.end < def->port.start) { virReportError(VIR_ERR_XML_DETAIL, - _("Missing or invalid 'end' attribute in <port> in " - "<nat> in <forward> in network %s"), networkName); + _("Missing or invalid 'end' attribute in <port> in <nat> in <forward> in network %1$s"), + networkName); return -1; } } @@ -1385,7 +1361,7 @@ virNetworkForwardDefParseXML(const char *networkName, } else { if ((def->type = virNetworkForwardTypeFromString(type)) < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown forwarding type '%s'"), type); + _("unknown forwarding type '%1$s'"), type); return -1; } } @@ -1403,8 +1379,7 @@ virNetworkForwardDefParseXML(const char *networkName, if (driverName <= 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Unknown forward <driver name='%s'/> " - "in network %s"), + _("Unknown forward <driver name='%1$s'/> in network %2$s"), forwardDriverName, networkName); return -1; } @@ -1415,7 +1390,7 @@ virNetworkForwardDefParseXML(const char *networkName, nForwardIfs = virXPathNodeSet("./interface", ctxt, &forwardIfNodes); if (nForwardIfs < 0) { virReportError(VIR_ERR_XML_ERROR, - _("invalid <interface> element found in <forward> of network %s"), + _("invalid <interface> element found in <forward> of network %1$s"), networkName); return -1; } @@ -1423,7 +1398,7 @@ virNetworkForwardDefParseXML(const char *networkName, nForwardAddrs = virXPathNodeSet("./address", ctxt, &forwardAddrNodes); if (nForwardAddrs < 0) { virReportError(VIR_ERR_XML_ERROR, - _("invalid <address> element found in <forward> of network %s"), + _("invalid <address> element found in <forward> of network %1$s"), networkName); return -1; } @@ -1431,7 +1406,7 @@ virNetworkForwardDefParseXML(const char *networkName, nForwardPfs = virXPathNodeSet("./pf", ctxt, &forwardPfNodes); if (nForwardPfs < 0) { virReportError(VIR_ERR_XML_ERROR, - _("invalid <pf> element found in <forward> of network %s"), + _("invalid <pf> element found in <forward> of network %1$s"), networkName); return -1; } @@ -1439,12 +1414,12 @@ virNetworkForwardDefParseXML(const char *networkName, nForwardNats = virXPathNodeSet("./nat", ctxt, &forwardNatNodes); if (nForwardNats < 0) { virReportError(VIR_ERR_XML_ERROR, - _("invalid <nat> element found in <forward> of network %s"), + _("invalid <nat> element found in <forward> of network %1$s"), networkName); return -1; } else if (nForwardNats > 1) { virReportError(VIR_ERR_XML_ERROR, - _("Only one <nat> element is allowed in <forward> of network %s"), + _("Only one <nat> element is allowed in <forward> of network %1$s"), networkName); return -1; } else if (nForwardNats == 1) { @@ -1457,9 +1432,7 @@ virNetworkForwardDefParseXML(const char *networkName, forwardDev = virXPathString("string(./@dev)", ctxt); if (forwardDev && (nForwardAddrs > 0 || nForwardPfs > 0)) { virReportError(VIR_ERR_XML_ERROR, "%s", - _("the <forward> 'dev' attribute cannot be used when " - "<address> or <pf> sub-elements are present " - "in network %s")); + _("the <forward> 'dev' attribute cannot be used when <address> or <pf> sub-elements are present in network %1$s")); return -1; } @@ -1478,8 +1451,7 @@ virNetworkForwardDefParseXML(const char *networkName, if (!forwardDevi) { virReportError(VIR_ERR_XML_ERROR, - _("Missing required dev attribute in " - "<forward> <interface> element of network %s"), + _("Missing required dev attribute in <forward> <interface> element of network %1$s"), networkName); return -1; } @@ -1490,8 +1462,7 @@ virNetworkForwardDefParseXML(const char *networkName, */ if (STRNEQ(forwardDevi, def->ifs[0].device.dev)) { virReportError(VIR_ERR_XML_ERROR, - _("<forward dev='%s'> must match first " - "<interface dev='%s'/> in network %s"), + _("<forward dev='%1$s'> must match first <interface dev='%2$s'/> in network %3$s"), def->ifs[0].device.dev, forwardDevi, networkName); return -1; @@ -1502,8 +1473,7 @@ virNetworkForwardDefParseXML(const char *networkName, for (j = 0; j < i; j++) { if (STREQ_NULLABLE(def->ifs[j].device.dev, forwardDevi)) { virReportError(VIR_ERR_XML_ERROR, - _("interface '%s' can only be " - "listed once in network %s"), + _("interface '%1$s' can only be listed once in network %2$s"), forwardDevi, networkName); return -1; } @@ -1522,14 +1492,14 @@ virNetworkForwardDefParseXML(const char *networkName, if (!(addrType = virXMLPropString(forwardAddrNodes[i], "type"))) { virReportError(VIR_ERR_XML_ERROR, - _("missing address type in network %s"), + _("missing address type in network %1$s"), networkName); return -1; } if ((def->ifs[i].type = virNetworkForwardHostdevDeviceTypeFromString(addrType)) < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown address type '%s' in network %s"), + _("unknown address type '%1$s' in network %2$s"), addrType, networkName); return -1; } @@ -1545,8 +1515,7 @@ virNetworkForwardDefParseXML(const char *networkName, for (j = 0; j < i; j++) { if (virPCIDeviceAddressEqual(addr, &def->ifs[j].device.pci)) { virReportError(VIR_ERR_XML_ERROR, - _("PCI device '%04x:%02x:%02x.%x' can " - "only be listed once in network %s"), + _("PCI device '%1$04x:%2$02x:%3$02x.%4$x' can only be listed once in network %5$s"), addr->domain, addr->bus, addr->slot, addr->function, networkName); @@ -1559,7 +1528,7 @@ virNetworkForwardDefParseXML(const char *networkName, default: virReportError(VIR_ERR_XML_ERROR, - _("unsupported address type '%s' in network %s"), + _("unsupported address type '%1$s' in network %2$s"), addrType, networkName); return -1; } @@ -1568,7 +1537,7 @@ virNetworkForwardDefParseXML(const char *networkName, } else if (nForwardPfs > 1) { virReportError(VIR_ERR_XML_ERROR, - _("Only one <pf> element is allowed in <forward> of network %s"), + _("Only one <pf> element is allowed in <forward> of network %1$s"), networkName); return -1; } else if (nForwardPfs == 1) { @@ -1577,8 +1546,7 @@ virNetworkForwardDefParseXML(const char *networkName, forwardDev = virXMLPropString(*forwardPfNodes, "dev"); if (!forwardDev) { virReportError(VIR_ERR_XML_ERROR, - _("Missing required dev attribute " - "in <pf> element of network '%s'"), + _("Missing required dev attribute in <pf> element of network '%1$s'"), networkName); return -1; } @@ -1652,7 +1620,7 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt, if (ipv6nogwStr) { if (virStringParseYesNo(ipv6nogwStr, &def->ipv6nogw) < 0) { virReportError(VIR_ERR_XML_ERROR, - _("Invalid ipv6 setting '%s' in network '%s'"), + _("Invalid ipv6 setting '%1$s' in network '%2$s'"), ipv6nogwStr, def->name); return NULL; } @@ -1692,7 +1660,7 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt, if (stpDelay) { if (virStrToLong_ulp(stpDelay, NULL, 10, &def->delay) < 0) { virReportError(VIR_ERR_XML_ERROR, - _("Invalid delay value in network '%s'"), + _("Invalid delay value in network '%1$s'"), def->name); return NULL; } @@ -1703,8 +1671,8 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt, if ((def->macTableManager = virNetworkBridgeMACTableManagerTypeFromString(macTableManager)) <= 0) { virReportError(VIR_ERR_XML_ERROR, - _("Invalid macTableManager setting '%s' " - "in network '%s'"), macTableManager, def->name); + _("Invalid macTableManager setting '%1$s' in network '%2$s'"), + macTableManager, def->name); return NULL; } } @@ -1713,13 +1681,13 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt, if (macAddr) { if (virMacAddrParse(macAddr, &def->mac) < 0) { virReportError(VIR_ERR_XML_ERROR, - _("Invalid bridge mac address '%s' in network '%s'"), + _("Invalid bridge mac address '%1$s' in network '%2$s'"), macAddr, def->name); return NULL; } if (virMacAddrIsMulticast(&def->mac)) { virReportError(VIR_ERR_XML_ERROR, - _("Invalid multicast bridge mac address '%s' in network '%s'"), + _("Invalid multicast bridge mac address '%1$s' in network '%2$s'"), macAddr, def->name); return NULL; } @@ -1730,7 +1698,7 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt, if (mtuSize) { if (virStrToLong_ui(mtuSize, NULL, 10, &def->mtu) < 0) { virReportError(VIR_ERR_XML_ERROR, - _("Invalid mtu size '%s' in network '%s'"), + _("Invalid mtu size '%1$s' in network '%2$s'"), mtuSize, def->name); return NULL; } @@ -1843,7 +1811,7 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt, if (!addrMatch) { g_autofree char *gw = virSocketAddrFormat(gateway); virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unreachable static route gateway '%s' specified for network '%s'"), + _("unreachable static route gateway '%1$s' specified for network '%2$s'"), gw, def->name); return NULL; } @@ -1871,16 +1839,14 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt, */ if (def->nips == 0) { virReportError(VIR_ERR_XML_ERROR, - _("%s forwarding requested, " - "but no IP address provided for network '%s'"), + _("%1$s forwarding requested, but no IP address provided for network '%2$s'"), virNetworkForwardTypeToString(def->forward.type), def->name); return NULL; } if (def->forward.nifs > 1) { virReportError(VIR_ERR_XML_ERROR, - _("multiple forwarding interfaces specified " - "for network '%s', only one is supported"), + _("multiple forwarding interfaces specified for network '%1$s', only one is supported"), def->name); return NULL; } @@ -1891,8 +1857,7 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt, * a forwarding device is nonsensical. */ virReportError(VIR_ERR_XML_ERROR, - _("forward dev not allowed for " - "network '%s' with forward mode='%s'"), + _("forward dev not allowed for network '%1$s' with forward mode='%2$s'"), def->name, virNetworkForwardTypeToString(def->forward.type)); return NULL; @@ -1905,22 +1870,21 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt, case VIR_NETWORK_FORWARD_HOSTDEV: if (def->bridge) { virReportError(VIR_ERR_XML_ERROR, - _("bridge name not allowed in %s mode (network '%s')"), + _("bridge name not allowed in %1$s mode (network '%2$s')"), virNetworkForwardTypeToString(def->forward.type), def->name); return NULL; } if (def->bridgeZone) { virReportError(VIR_ERR_XML_ERROR, - _("bridge zone not allowed in %s mode (network '%s')"), + _("bridge zone not allowed in %1$s mode (network '%2$s')"), virNetworkForwardTypeToString(def->forward.type), def->name); return NULL; } if (def->macTableManager) { virReportError(VIR_ERR_XML_ERROR, - _("bridge macTableManager setting not allowed " - "in %s mode (network '%s')"), + _("bridge macTableManager setting not allowed in %1$s mode (network '%2$s')"), virNetworkForwardTypeToString(def->forward.type), def->name); return NULL; @@ -1930,18 +1894,14 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt, case VIR_NETWORK_FORWARD_BRIDGE: if (def->delay || stp || def->bridgeZone) { virReportError(VIR_ERR_XML_ERROR, - _("bridge delay/stp/zone options only allowed in " - "route, nat, and isolated mode, not in %s " - "(network '%s')"), + _("bridge delay/stp/zone options only allowed in route, nat, and isolated mode, not in %1$s (network '%2$s')"), virNetworkForwardTypeToString(def->forward.type), def->name); return NULL; } if (def->bridge && (def->forward.nifs || def->forward.npfs)) { virReportError(VIR_ERR_XML_ERROR, - _("A network with forward mode='%s' can specify " - "a bridge name or a forward dev, but not " - "both (network '%s')"), + _("A network with forward mode='%1$s' can specify a bridge name or a forward dev, but not both (network '%2$s')"), virNetworkForwardTypeToString(def->forward.type), def->name); return NULL; @@ -1968,8 +1928,7 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt, case VIR_NETWORK_FORWARD_PASSTHROUGH: case VIR_NETWORK_FORWARD_HOSTDEV: virReportError(VIR_ERR_XML_ERROR, - _("mtu size only allowed in open, route, nat, " - "and isolated mode, not in %s (network '%s')"), + _("mtu size only allowed in open, route, nat, and isolated mode, not in %1$s (network '%2$s')"), virNetworkForwardTypeToString(def->forward.type), def->name); return NULL; @@ -2037,7 +1996,7 @@ virNetworkDNSDefFormat(virBuffer *buf, if (!fwd) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unknown enable type %d in network"), + _("Unknown enable type %1$d in network"), def->enable); return -1; } @@ -2048,7 +2007,7 @@ virNetworkDNSDefFormat(virBuffer *buf, if (!fwd) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unknown forwardPlainNames type %d in network"), + _("Unknown forwardPlainNames type %1$d in network"), def->forwardPlainNames); return -1; } @@ -2378,7 +2337,7 @@ virNetworkDefFormatBuf(virBuffer *buf, if (!mode) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unknown forward type %d in network '%s'"), + _("Unknown forward type %1$d in network '%2$s'"), def->forward.type, def->name); return -1; } @@ -2408,7 +2367,7 @@ virNetworkDefFormatBuf(virBuffer *buf, = virNetworkForwardDriverNameTypeToString(def->forward.driverName); if (!driverName) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unexpected hostdev driver name type %d "), + _("unexpected hostdev driver name type %1$d "), def->forward.driverName); return -1; } @@ -2503,7 +2462,7 @@ virNetworkDefFormatBuf(virBuffer *buf, if (!local) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unknown localOnly type %d in network"), + _("Unknown localOnly type %1$d in network"), def->domainLocalOnly); return -1; } @@ -2606,7 +2565,7 @@ virNetworkSaveXML(const char *configDir, if (g_mkdir_with_parents(configDir, 0777) < 0) { virReportSystemError(errno, - _("cannot create config directory '%s'"), + _("cannot create config directory '%1$s'"), configDir); return -1; } @@ -2663,7 +2622,7 @@ static void virNetworkDefUpdateNoSupport(virNetworkDef *def, const char *section) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, - _("can't update '%s' section of network '%s'"), + _("can't update '%1$s' section of network '%2$s'"), section, def->name); } @@ -2672,7 +2631,7 @@ static void virNetworkDefUpdateUnknownCommand(unsigned int command) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, - _("unrecognized network update command code %d"), command); + _("unrecognized network update command code %1$d"), command); } @@ -2683,8 +2642,7 @@ virNetworkDefUpdateCheckElementName(virNetworkDef *def, { if (!virXMLNodeNameEqual(node, section)) { virReportError(VIR_ERR_XML_ERROR, - _("unexpected element <%s>, expecting <%s>, " - "while updating network '%s'"), + _("unexpected element <%1$s>, expecting <%2$s>, while updating network '%3$s'"), node->name, section, def->name); return -1; } @@ -2742,8 +2700,7 @@ virNetworkIPDefByIndex(virNetworkDef *def, int parentIndex) ipdef = virNetworkDefGetIPByIndex(def, AF_UNSPEC, parentIndex); if (!(ipdef)) { virReportError(VIR_ERR_OPERATION_INVALID, - _("couldn't update dhcp host entry - no <ip> " - "element found at index %d in network '%s'"), + _("couldn't update dhcp host entry - no <ip> element found at index %1$d in network '%2$s'"), parentIndex, def->name); } return ipdef; @@ -2765,8 +2722,8 @@ virNetworkIPDefByIndex(virNetworkDef *def, int parentIndex) } if (!ipdef) { virReportError(VIR_ERR_OPERATION_INVALID, - _("couldn't update dhcp host entry - no <ip> " - "element found in network '%s'"), def->name); + _("couldn't update dhcp host entry - no <ip> element found in network '%1$s'"), + def->name); } return ipdef; } @@ -2784,8 +2741,7 @@ virNetworkDefUpdateCheckMultiDHCP(virNetworkDef *def, if (ip != ipdef) { if (ip->nranges || ip->nhosts) { virReportError(VIR_ERR_OPERATION_INVALID, - _("dhcp is supported only for a " - "single %s address on each network"), + _("dhcp is supported only for a single %1$s address on each network"), (family == AF_INET) ? "IPv4" : "IPv6"); return -1; } @@ -2849,9 +2805,7 @@ virNetworkDefUpdateIPDHCPHost(virNetworkDef *def, if (i == ipdef->nhosts) { g_autofree char *ip = virSocketAddrFormat(&host.ip); virReportError(VIR_ERR_OPERATION_INVALID, - _("couldn't locate an existing dhcp host entry with " - "\"mac='%s'\" \"name='%s'\" \"ip='%s'\" in" - " network '%s'"), + _("couldn't locate an existing dhcp host entry with \"mac='%1$s'\" \"name='%2$s'\" \"ip='%3$s'\" in network '%4$s'"), host.mac ? host.mac : _("unknown"), host.name, ip ? ip : _("unknown"), def->name); goto cleanup; @@ -2882,9 +2836,7 @@ virNetworkDefUpdateIPDHCPHost(virNetworkDef *def, g_autofree char *ip = virSocketAddrFormat(&host.ip); virReportError(VIR_ERR_OPERATION_INVALID, - _("there is an existing dhcp host entry in " - "network '%s' that matches " - "\"<host mac='%s' name='%s' ip='%s'/>\""), + _("there is an existing dhcp host entry in network '%1$s' that matches \"<host mac='%2$s' name='%3$s' ip='%4$s'/>\""), def->name, host.mac ? host.mac : _("unknown"), host.name, ip ? ip : _("unknown")); goto cleanup; @@ -2912,8 +2864,8 @@ virNetworkDefUpdateIPDHCPHost(virNetworkDef *def, } if (i == ipdef->nhosts) { virReportError(VIR_ERR_OPERATION_INVALID, - _("couldn't locate a matching dhcp host entry " - "in network '%s'"), def->name); + _("couldn't locate a matching dhcp host entry in network '%1$s'"), + def->name); goto cleanup; } @@ -2994,9 +2946,7 @@ virNetworkDefUpdateIPDHCPRange(virNetworkDef *def, g_autofree char *endip = virSocketAddrFormat(&range.addr.end); virReportError(VIR_ERR_OPERATION_INVALID, - _("there is an existing dhcp range entry in " - "network '%s' that matches " - "\"<range start='%s' end='%s'/>\""), + _("there is an existing dhcp range entry in network '%1$s' that matches \"<range start='%2$s' end='%3$s'/>\""), def->name, startip ? startip : "unknown", endip ? endip : "unknown"); @@ -3013,8 +2963,8 @@ virNetworkDefUpdateIPDHCPRange(virNetworkDef *def, if (i == ipdef->nranges) { virReportError(VIR_ERR_OPERATION_INVALID, - _("couldn't locate a matching dhcp range entry " - "in network '%s'"), def->name); + _("couldn't locate a matching dhcp range entry in network '%1$s'"), + def->name); return -1; } @@ -3089,9 +3039,7 @@ virNetworkDefUpdateForwardInterface(virNetworkDef *def, if (i < def->forward.nifs) { virReportError(VIR_ERR_OPERATION_INVALID, - _("there is an existing interface entry " - "in network '%s' that matches " - "\"<interface dev='%s'>\""), + _("there is an existing interface entry in network '%1$s' that matches \"<interface dev='%2$s'>\""), def->name, iface.device.dev); goto cleanup; } @@ -3106,8 +3054,7 @@ virNetworkDefUpdateForwardInterface(virNetworkDef *def, if (i == def->forward.nifs) { virReportError(VIR_ERR_OPERATION_INVALID, - _("couldn't find an interface entry " - "in network '%s' matching <interface dev='%s'>"), + _("couldn't find an interface entry in network '%1$s' matching <interface dev='%2$s'>"), def->name, iface.device.dev); goto cleanup; } @@ -3115,9 +3062,7 @@ virNetworkDefUpdateForwardInterface(virNetworkDef *def, /* fail if the interface is being used */ if (def->forward.ifs[i].connections > 0) { virReportError(VIR_ERR_OPERATION_INVALID, - _("unable to delete interface '%s' " - "in network '%s'. It is currently being used " - " by %d domains."), + _("unable to delete interface '%1$s' in network '%2$s'. It is currently being used by %3$d domains."), iface.device.dev, def->name, def->forward.ifs[i].connections); goto cleanup; @@ -3184,17 +3129,14 @@ virNetworkDefUpdatePortGroup(virNetworkDef *def, ((command == VIR_NETWORK_UPDATE_COMMAND_MODIFY) || (command == VIR_NETWORK_UPDATE_COMMAND_DELETE))) { virReportError(VIR_ERR_OPERATION_INVALID, - _("couldn't find a portgroup entry " - "in network '%s' matching <portgroup name='%s'>"), + _("couldn't find a portgroup entry in network '%1$s' matching <portgroup name='%2$s'>"), def->name, portgroup.name); goto cleanup; } else if (foundName >= 0 && ((command == VIR_NETWORK_UPDATE_COMMAND_ADD_FIRST) || (command == VIR_NETWORK_UPDATE_COMMAND_ADD_LAST))) { virReportError(VIR_ERR_OPERATION_INVALID, - _("there is an existing portgroup entry in " - "network '%s' that matches " - "\"<portgroup name='%s'>\""), + _("there is an existing portgroup entry in network '%1$s' that matches \"<portgroup name='%2$s'>\""), def->name, portgroup.name); goto cleanup; } @@ -3206,9 +3148,7 @@ virNetworkDefUpdatePortGroup(virNetworkDef *def, portgroup.isDefault && foundDefault >= 0 && foundDefault != foundName) { virReportError(VIR_ERR_OPERATION_INVALID, - _("a different portgroup entry in " - "network '%s' is already set as the default. " - "Only one default is allowed."), + _("a different portgroup entry in network '%1$s' is already set as the default. Only one default is allowed."), def->name); goto cleanup; } @@ -3305,8 +3245,7 @@ virNetworkDefUpdateDNSHost(virNetworkDef *def, if (foundCt > 0) { virReportError(VIR_ERR_OPERATION_INVALID, - _("there is already at least one DNS HOST " - "record with a matching field in network %s"), + _("there is already at least one DNS HOST record with a matching field in network %1$s"), def->name); goto cleanup; } @@ -3320,14 +3259,14 @@ virNetworkDefUpdateDNSHost(virNetworkDef *def, if (foundCt == 0) { virReportError(VIR_ERR_OPERATION_INVALID, - _("couldn't locate a matching DNS HOST " - "record in network %s"), def->name); + _("couldn't locate a matching DNS HOST record in network %1$s"), + def->name); goto cleanup; } if (foundCt > 1) { virReportError(VIR_ERR_OPERATION_INVALID, - _("multiple matching DNS HOST records were " - "found in network %s"), def->name); + _("multiple matching DNS HOST records were found in network %1$s"), + def->name); goto cleanup; } @@ -3392,8 +3331,7 @@ virNetworkDefUpdateDNSSrv(virNetworkDef *def, if (foundCt > 0) { virReportError(VIR_ERR_OPERATION_INVALID, - _("there is already at least one DNS SRV " - "record matching all specified fields in network %s"), + _("there is already at least one DNS SRV record matching all specified fields in network %1$s"), def->name); goto cleanup; } @@ -3407,14 +3345,14 @@ virNetworkDefUpdateDNSSrv(virNetworkDef *def, if (foundCt == 0) { virReportError(VIR_ERR_OPERATION_INVALID, - _("couldn't locate a matching DNS SRV " - "record in network %s"), def->name); + _("couldn't locate a matching DNS SRV record in network %1$s"), + def->name); goto cleanup; } if (foundCt > 1) { virReportError(VIR_ERR_OPERATION_INVALID, - _("multiple DNS SRV records matching all specified " - "fields were found in network %s"), def->name); + _("multiple DNS SRV records matching all specified fields were found in network %1$s"), + def->name); goto cleanup; } @@ -3472,8 +3410,7 @@ virNetworkDefUpdateDNSTxt(virNetworkDef *def, if (foundIdx < dns->ntxts) { virReportError(VIR_ERR_OPERATION_INVALID, - _("there is already a DNS TXT record " - "with name '%s' in network %s"), + _("there is already a DNS TXT record with name '%1$s' in network %2$s"), txt.name, def->name); goto cleanup; } @@ -3487,8 +3424,8 @@ virNetworkDefUpdateDNSTxt(virNetworkDef *def, if (foundIdx == dns->ntxts) { virReportError(VIR_ERR_OPERATION_INVALID, - _("couldn't locate a matching DNS TXT " - "record in network %s"), def->name); + _("couldn't locate a matching DNS TXT record in network %1$s"), + def->name); goto cleanup; } -- 2.39.2

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com&gt; --- src/conf/backup_conf.c | 16 +++--- src/conf/capabilities.c | 21 ++++---- src/conf/checkpoint_conf.c | 8 +-- src/conf/cpu_conf.c | 46 ++++++++-------- src/conf/device_conf.c | 2 +- src/conf/domain_addr.c | 79 ++++++++++++---------------- src/conf/domain_capabilities.c | 3 +- src/conf/domain_event.c | 4 +- src/conf/domain_postparse.c | 30 +++++------ src/conf/interface_conf.c | 17 +++--- src/conf/netdev_bandwidth_conf.c | 10 ++-- src/conf/netdev_vlan_conf.c | 10 ++-- src/conf/netdev_vport_profile_conf.c | 2 +- src/conf/networkcommon_conf.c | 64 +++++++--------------- src/conf/node_device_util.c | 6 +-- src/conf/numa_conf.c | 67 ++++++++++------------- src/conf/nwfilter_conf.c | 23 ++++---- src/conf/nwfilter_params.c | 25 +++++---- src/conf/object_event.c | 10 ++-- src/conf/secret_conf.c | 8 +-- src/conf/snapshot_conf.c | 45 +++++++--------- src/conf/storage_adapter_conf.c | 6 +-- src/conf/storage_conf.c | 26 ++++----- src/conf/storage_encryption_conf.c | 4 +- src/conf/storage_source_conf.c | 15 +++--- src/conf/virchrdev.c | 13 ++--- src/conf/virdomainjob.c | 25 +++------ src/conf/virdomainmomentobjlist.c | 8 +-- src/conf/virdomainobjlist.c | 18 +++---- src/conf/virnetworkobj.c | 24 ++++----- src/conf/virnetworkportdef.c | 14 ++--- src/conf/virnodedeviceobj.c | 9 ++-- src/conf/virnwfilterbindingdef.c | 4 +- src/conf/virnwfilterbindingobj.c | 4 +- src/conf/virnwfilterbindingobjlist.c | 8 +-- src/conf/virnwfilterobj.c | 12 ++--- src/conf/virsecretobj.c | 22 ++++---- src/conf/virstorageobj.c | 22 ++++---- 38 files changed, 323 insertions(+), 407 deletions(-) diff --git a/src/conf/backup_conf.c b/src/conf/backup_conf.c index ad5633388d..4a8c05dca9 100644 --- a/src/conf/backup_conf.c +++ b/src/conf/backup_conf.c @@ -159,7 +159,7 @@ virDomainBackupDiskDefParseXML(xmlNodePtr node, if (def->store->type != VIR_STORAGE_TYPE_FILE && def->store->type != VIR_STORAGE_TYPE_BLOCK) { virReportError(VIR_ERR_XML_ERROR, - _("unsupported disk backup type '%s'"), type); + _("unsupported disk backup type '%1$s'"), type); return -1; } @@ -210,7 +210,7 @@ virDomainBackupDefParseXML(xmlXPathContextPtr ctxt, if ((mode = virXMLPropString(ctxt->node, "mode"))) { if ((def->type = virDomainBackupTypeFromString(mode)) <= 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown backup mode '%s'"), mode); + _("unknown backup mode '%1$s'"), mode); return NULL; } } @@ -240,7 +240,7 @@ virDomainBackupDefParseXML(xmlXPathContextPtr ctxt, if (def->server->transport == VIR_STORAGE_NET_HOST_TRANS_UNIX && !g_path_is_absolute(def->server->socket)) { virReportError(VIR_ERR_XML_ERROR, - _("backup socket path '%s' must be absolute"), + _("backup socket path '%1$s' must be absolute"), def->server->socket); return NULL; } @@ -419,7 +419,7 @@ virDomainBackupDefAssignStore(virDomainBackupDiskDef *disk, if (virStorageSourceIsEmpty(src)) { if (disk->store) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("disk '%s' has no media"), disk->name); + _("disk '%1$s' has no media"), disk->name); return -1; } } else if (!disk->store) { @@ -429,7 +429,7 @@ virDomainBackupDefAssignStore(virDomainBackupDiskDef *disk, disk->store->path = g_strdup_printf("%s.%s", src->path, suffix); } else { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("refusing to generate file name for disk '%s'"), + _("refusing to generate file name for disk '%1$s'"), disk->name); return -1; } @@ -463,13 +463,13 @@ virDomainBackupAlignDisks(virDomainBackupDef *def, if (!(domdisk = virDomainDiskByTarget(dom, backupdisk->name))) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("no disk named '%s'"), backupdisk->name); + _("no disk named '%1$s'"), backupdisk->name); return -1; } if (virHashAddEntry(disks, backupdisk->name, NULL) < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("disk '%s' specified twice"), + _("disk '%1$s' specified twice"), backupdisk->name); return -1; } @@ -478,7 +478,7 @@ virDomainBackupAlignDisks(virDomainBackupDef *def, !backupdisk->incremental && !def->incremental) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("'incremental' backup mode of disk '%s' requires setting 'incremental' field for disk or backup"), + _("'incremental' backup mode of disk '%1$s' requires setting 'incremental' field for disk or backup"), backupdisk->name); return -1; } diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c index 34770fc416..a3588abcc0 100644 --- a/src/conf/capabilities.c +++ b/src/conf/capabilities.c @@ -713,7 +713,7 @@ virCapabilitiesDomainDataLookupInternal(virCaps *caps, virBufferAsprintf(&buf, "%s", _("any configuration")); virReportError(VIR_ERR_INVALID_ARG, - _("could not find capabilities for %s"), + _("could not find capabilities for %1$s"), virBufferCurrentContent(&buf)); return ret; } @@ -1398,8 +1398,7 @@ virCapabilitiesHostNUMAGetCellCpus(virCapsHostNUMA *caps, for (cpu = 0; cell && cpu < cell->ncpus; cpu++) { if (virBitmapSetBit(cpumask, cell->cpus[cpu].id) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Cpu '%u' in node '%zu' is out of range " - "of the provided bitmap"), + _("Cpu '%1$u' in node '%2$zu' is out of range of the provided bitmap"), cell->cpus[cpu].id, node); return -1; } @@ -1560,7 +1559,7 @@ virCapabilitiesGetNodeCacheReadFileUint(const char *prefix, if (rv < 0) { if (rv == -2) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("File '%s' does not exist"), + _("File '%1$s' does not exist"), path); } return -1; @@ -1582,7 +1581,7 @@ virCapabilitiesGetNodeCacheReadFileUllong(const char *prefix, if (rv < 0) { if (rv == -2) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("File '%s' does not exist"), + _("File '%1$s' does not exist"), path); } return -1; @@ -1629,7 +1628,7 @@ virCapabilitiesGetNodeCache(int node, if (virStrToLong_ui(dname, NULL, 10, &cache.level) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unable to parse %s"), + _("unable to parse %1$s"), entry->d_name); return -1; } @@ -1655,7 +1654,7 @@ virCapabilitiesGetNodeCache(int node, case 2: cache.associativity = VIR_NUMA_CACHE_ASSOCIATIVITY_NONE; break; default: virReportError(VIR_ERR_INTERNAL_ERROR, - _("unknown indexing value '%u'"), + _("unknown indexing value '%1$u'"), indexing); return -1; } @@ -1671,7 +1670,7 @@ virCapabilitiesGetNodeCache(int node, case 2: cache.policy = VIR_NUMA_CACHE_POLICY_NONE; break; default: virReportError(VIR_ERR_INTERNAL_ERROR, - _("unknown write_policy value '%u'"), + _("unknown write_policy value '%1$u'"), write_policy); return -1; } @@ -1851,7 +1850,7 @@ virCapabilitiesHostNUMAInitInterconnectsNode(GArray *interconnects, if (virStrToLong_ui(dname, NULL, 10, &initNode) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unable to parse %s"), + _("unable to parse %1$s"), entry->d_name); return -1; } @@ -1915,7 +1914,7 @@ virCapabilitiesHostNUMAInitInterconnects(virCapsHostNUMA *caps) if (virStrToLong_ui(dname, NULL, 10, &node) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unable to parse %s"), + _("unable to parse %1$s"), entry->d_name); return -1; } @@ -2260,7 +2259,7 @@ virCapabilitiesInitCaches(virCaps *caps) kernel_type = virCacheKernelTypeFromString(type); if (kernel_type < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unknown cache type '%s'"), type); + _("Unknown cache type '%1$s'"), type); return -1; } diff --git a/src/conf/checkpoint_conf.c b/src/conf/checkpoint_conf.c index 6656089457..89f8675235 100644 --- a/src/conf/checkpoint_conf.c +++ b/src/conf/checkpoint_conf.c @@ -283,13 +283,13 @@ virDomainCheckpointAlignDisks(virDomainCheckpointDef *chkdef) if (!domdisk) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("no disk named '%s'"), chkdisk->name); + _("no disk named '%1$s'"), chkdisk->name); return -1; } if (virHashHasEntry(map, domdisk->dst)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("disk '%s' specified twice"), + _("disk '%1$s' specified twice"), chkdisk->name); return -1; } @@ -301,7 +301,7 @@ virDomainCheckpointAlignDisks(virDomainCheckpointDef *chkdef) domdisk->src->readonly) && chkdisk->type != VIR_DOMAIN_CHECKPOINT_TYPE_NONE) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("disk '%s' is empty or readonly"), + _("disk '%1$s' is empty or readonly"), chkdisk->name); return -1; } @@ -471,7 +471,7 @@ virDomainCheckpointRedefinePrep(virDomainObj *vm, char uuidstr[VIR_UUID_STRING_BUFLEN]; virUUIDFormat(vm->def->uuid, uuidstr); virReportError(VIR_ERR_INVALID_ARG, - _("definition for checkpoint %s must use uuid %s"), + _("definition for checkpoint %1$s must use uuid %2$s"), def->parent.name, uuidstr); return -1; } diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c index ba7428bc93..2b361d2c68 100644 --- a/src/conf/cpu_conf.c +++ b/src/conf/cpu_conf.c @@ -416,7 +416,7 @@ virCPUDefParseXML(xmlXPathContextPtr ctxt, if (def->mode < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Invalid mode attribute '%s'"), + _("Invalid mode attribute '%1$s'"), cpuMode); return -1; } @@ -465,7 +465,7 @@ virCPUDefParseXML(xmlXPathContextPtr ctxt, } if ((def->arch = virArchFromString(arch)) == VIR_ARCH_NONE) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Unknown architecture %s"), arch); + _("Unknown architecture %1$s"), arch); return -1; } @@ -537,7 +537,7 @@ virCPUDefParseXML(xmlXPathContextPtr ctxt, ctxt))) { if (strlen(vendor_id) != VIR_CPU_VENDOR_ID_LENGTH) { virReportError(VIR_ERR_XML_ERROR, - _("vendor_id must be exactly %d characters long"), + _("vendor_id must be exactly %1$d characters long"), VIR_CPU_VENDOR_ID_LENGTH); return -1; } @@ -634,7 +634,7 @@ virCPUDefParseXML(xmlXPathContextPtr ctxt, for (j = 0; j < i; j++) { if (STREQ(name, def->features[j].name)) { virReportError(VIR_ERR_XML_ERROR, - _("CPU feature '%s' specified more than once"), + _("CPU feature '%1$s' specified more than once"), name); return -1; } @@ -707,7 +707,7 @@ virCPUDefFormatBufFull(virBuffer *buf, if (!(tmp = virCPUModeTypeToString(def->mode))) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unexpected CPU mode %d"), def->mode); + _("Unexpected CPU mode %1$d"), def->mode); return -1; } virBufferAsprintf(&attributeBuf, " mode='%s'", tmp); @@ -715,7 +715,7 @@ virCPUDefFormatBufFull(virBuffer *buf, if (def->mode == VIR_CPU_MODE_CUSTOM) { if (!(tmp = virCPUMatchTypeToString(def->match))) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unexpected CPU match policy %d"), + _("Unexpected CPU match policy %1$d"), def->match); return -1; } @@ -778,7 +778,7 @@ virCPUDefFormatBuf(virBuffer *buf, fallback = virCPUFallbackTypeToString(def->fallback); if (!fallback) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unexpected CPU fallback value: %d"), + _("Unexpected CPU fallback value: %1$d"), def->fallback); return -1; } @@ -861,7 +861,7 @@ virCPUDefFormatBuf(virBuffer *buf, policy = virCPUFeaturePolicyTypeToString(feature->policy); if (!policy) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unexpected CPU feature policy %d"), + _("Unexpected CPU feature policy %1$d"), feature->policy); return -1; } @@ -906,7 +906,7 @@ virCPUDefAddFeatureInternal(virCPUDef *def, case VIR_CPU_ADD_FEATURE_MODE_EXCLUSIVE: default: virReportError(VIR_ERR_INTERNAL_ERROR, - _("CPU feature '%s' specified more than once"), + _("CPU feature '%1$s' specified more than once"), name); return -1; } @@ -1039,71 +1039,71 @@ virCPUDefIsEqual(virCPUDef *src, } if (src->type != dst->type) { - MISMATCH(_("Target CPU type %s does not match source %s"), + MISMATCH(_("Target CPU type %1$s does not match source %2$s"), virCPUTypeToString(dst->type), virCPUTypeToString(src->type)); return false; } if (src->mode != dst->mode) { - MISMATCH(_("Target CPU mode %s does not match source %s"), + MISMATCH(_("Target CPU mode %1$s does not match source %2$s"), virCPUModeTypeToString(dst->mode), virCPUModeTypeToString(src->mode)); return false; } if (src->check != dst->check) { - MISMATCH(_("Target CPU check %s does not match source %s"), + MISMATCH(_("Target CPU check %1$s does not match source %2$s"), virCPUCheckTypeToString(dst->check), virCPUCheckTypeToString(src->check)); return false; } if (src->arch != dst->arch) { - MISMATCH(_("Target CPU arch %s does not match source %s"), + MISMATCH(_("Target CPU arch %1$s does not match source %2$s"), virArchToString(dst->arch), virArchToString(src->arch)); return false; } if (STRNEQ_NULLABLE(src->model, dst->model)) { - MISMATCH(_("Target CPU model %s does not match source %s"), + MISMATCH(_("Target CPU model %1$s does not match source %2$s"), NULLSTR(dst->model), NULLSTR(src->model)); return false; } if (STRNEQ_NULLABLE(src->vendor, dst->vendor)) { - MISMATCH(_("Target CPU vendor %s does not match source %s"), + MISMATCH(_("Target CPU vendor %1$s does not match source %2$s"), NULLSTR(dst->vendor), NULLSTR(src->vendor)); return false; } if (STRNEQ_NULLABLE(src->vendor_id, dst->vendor_id)) { - MISMATCH(_("Target CPU vendor id %s does not match source %s"), + MISMATCH(_("Target CPU vendor id %1$s does not match source %2$s"), NULLSTR(dst->vendor_id), NULLSTR(src->vendor_id)); return false; } if (src->sockets != dst->sockets) { - MISMATCH(_("Target CPU sockets %d does not match source %d"), + MISMATCH(_("Target CPU sockets %1$d does not match source %2$d"), dst->sockets, src->sockets); return false; } if (src->dies != dst->dies) { - MISMATCH(_("Target CPU dies %d does not match source %d"), + MISMATCH(_("Target CPU dies %1$d does not match source %2$d"), dst->dies, src->dies); return false; } if (src->cores != dst->cores) { - MISMATCH(_("Target CPU cores %d does not match source %d"), + MISMATCH(_("Target CPU cores %1$d does not match source %2$d"), dst->cores, src->cores); return false; } if (src->threads != dst->threads) { - MISMATCH(_("Target CPU threads %d does not match source %d"), + MISMATCH(_("Target CPU threads %1$d does not match source %2$d"), dst->threads, src->threads); return false; } @@ -1118,20 +1118,20 @@ virCPUDefIsEqual(virCPUDef *src, } if (src->nfeatures != dst->nfeatures) { - MISMATCH(_("Target CPU feature count %zu does not match source %zu"), + MISMATCH(_("Target CPU feature count %1$zu does not match source %2$zu"), dst->nfeatures, src->nfeatures); return false; } for (i = 0; i < src->nfeatures; i++) { if (STRNEQ(src->features[i].name, dst->features[i].name)) { - MISMATCH(_("Target CPU feature %s does not match source %s"), + MISMATCH(_("Target CPU feature %1$s does not match source %2$s"), dst->features[i].name, src->features[i].name); return false; } if (src->features[i].policy != dst->features[i].policy) { - MISMATCH(_("Target CPU feature policy %s does not match source %s"), + MISMATCH(_("Target CPU feature policy %1$s does not match source %2$s"), virCPUFeaturePolicyTypeToString(dst->features[i].policy), virCPUFeaturePolicyTypeToString(src->features[i].policy)); return false; diff --git a/src/conf/device_conf.c b/src/conf/device_conf.c index a116e39c75..aa0cc8945c 100644 --- a/src/conf/device_conf.c +++ b/src/conf/device_conf.c @@ -272,7 +272,7 @@ virCCWDeviceAddressParseXML(xmlNodePtr node, if (!virCCWDeviceAddressIsValid(addr)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Invalid specification for virtio ccw address: cssid='0x%x' ssid='0x%x' devno='0x%04x'"), + _("Invalid specification for virtio ccw address: cssid='0x%1$x' ssid='0x%2$x' devno='0x%3$04x'"), addr->cssid, addr->ssid, addr->devno); return -1; } diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c index b6534f502c..27ce4a61ca 100644 --- a/src/conf/domain_addr.c +++ b/src/conf/domain_addr.c @@ -38,14 +38,14 @@ virDomainZPCIAddressReserveId(GHashTable *set, if (!id->isSet) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("No zPCI %s to reserve"), + _("No zPCI %1$s to reserve"), name); return -1; } if (g_hash_table_lookup(set, &id->value)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("zPCI %s %o is already reserved"), + _("zPCI %1$s %2$o is already reserved"), name, id->value); return -1; } @@ -88,7 +88,7 @@ virDomainZPCIAddressAssignId(GHashTable *set, while (g_hash_table_lookup(set, &min)) { if (min == max) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("There is no more free %s."), + _("There is no more free %1$s."), name); return -1; } @@ -314,8 +314,7 @@ virDomainPCIAddressFlagsCompatible(virPCIDeviceAddress *addr, } else { if (reportError) { virReportError(errType, - _("The device at PCI address %s needs to be " - "an integrated device (bus=0)"), + _("The device at PCI address %1$s needs to be an integrated device (bus=0)"), addrStr); } return false; @@ -341,9 +340,7 @@ virDomainPCIAddressFlagsCompatible(virPCIDeviceAddress *addr, !(busFlags & VIR_PCI_CONNECT_AUTOASSIGN)) { if (reportError) { virReportError(errType, - _("The device at PCI address %s was auto-assigned " - "this address, but the PCI controller " - "with index='%d' doesn't allow auto-assignment"), + _("The device at PCI address %1$s was auto-assigned this address, but the PCI controller with index='%2$d' doesn't allow auto-assignment"), addrStr, addr->bus); } return false; @@ -353,9 +350,7 @@ virDomainPCIAddressFlagsCompatible(virPCIDeviceAddress *addr, !(busFlags & VIR_PCI_CONNECT_HOTPLUGGABLE)) { if (reportError) { virReportError(errType, - _("The device at PCI address %s requires " - "hotplug capability, but the PCI controller " - "with index='%d' doesn't support hotplug"), + _("The device at PCI address %1$s requires hotplug capability, but the PCI controller with index='%2$d' doesn't support hotplug"), addrStr, addr->bus); } return false; @@ -396,15 +391,12 @@ virDomainPCIAddressFlagsCompatible(virPCIDeviceAddress *addr, * bug in the code that sets the flag bits for devices. */ virReportError(errType, - _("The device at PCI address %s has " - "unrecognized connection type flags 0x%.2x"), + _("The device at PCI address %1$s has unrecognized connection type flags 0x%2$.2x"), addrStr, devFlags & VIR_PCI_CONNECT_TYPES_MASK); return false; } virReportError(errType, - _("The device at PCI address %s cannot be " - "plugged into the PCI controller with index='%d'. " - "It requires a controller that accepts a %s."), + _("The device at PCI address %1$s cannot be plugged into the PCI controller with index='%2$d'. It requires a controller that accepts a %3$s."), addrStr, addr->bus, connectStr); return false; } @@ -433,15 +425,13 @@ virDomainPCIAddressValidate(virDomainPCIAddressSet *addrs, } if (addr->domain != 0) { virReportError(errType, - _("Invalid PCI address %s. " - "Only PCI domain 0 is available"), + _("Invalid PCI address %1$s. Only PCI domain 0 is available"), addrStr); return false; } if (addr->bus >= addrs->nbuses) { virReportError(errType, - _("Invalid PCI address %s. " - "Only PCI buses up to %zu are available"), + _("Invalid PCI address %1$s. Only PCI buses up to %2$zu are available"), addrStr, addrs->nbuses - 1); return false; } @@ -458,19 +448,19 @@ virDomainPCIAddressValidate(virDomainPCIAddressSet *addrs, /* some "buses" are really just a single port */ if (bus->minSlot && addr->slot < bus->minSlot) { virReportError(errType, - _("Invalid PCI address %s. slot must be >= %zu"), + _("Invalid PCI address %1$s. slot must be >= %2$zu"), addrStr, bus->minSlot); return false; } if (addr->slot > bus->maxSlot) { virReportError(errType, - _("Invalid PCI address %s. slot must be <= %zu"), + _("Invalid PCI address %1$s. slot must be <= %2$zu"), addrStr, bus->maxSlot); return false; } if (addr->function > VIR_PCI_ADDRESS_FUNCTION_LAST) { virReportError(errType, - _("Invalid PCI address %s. function must be <= %u"), + _("Invalid PCI address %1$s. function must be <= %2$u"), addrStr, VIR_PCI_ADDRESS_FUNCTION_LAST); return false; } @@ -733,14 +723,12 @@ virDomainPCIAddressSetGrow(virDomainPCIAddressSet *addrs, if (existingContModel >= 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("a PCI slot is needed to connect a PCI controller " - "model='%s', but none is available, and it " - "cannot be automatically added"), + _("a PCI slot is needed to connect a PCI controller model='%1$s', but none is available, and it cannot be automatically added"), virDomainControllerModelPCITypeToString(existingContModel)); } else { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Cannot automatically add a new PCI bus for a " - "device with connect flags %.2x"), flags); + _("Cannot automatically add a new PCI bus for a device with connect flags %1$.2x"), + flags); } return -1; } @@ -838,7 +826,7 @@ virDomainPCIAddressReserveAddrInternal(virDomainPCIAddressSet *addrs, if (bus->slot[addr->slot].functions & (1 << addr->function)) { virReportError(errType, - _("Attempted double use of PCI Address %s"), addrStr); + _("Attempted double use of PCI Address %1$s"), addrStr); return -1; } @@ -1321,7 +1309,7 @@ virDomainCCWAddressAssign(virDomainDeviceInfo *dev, if (virHashLookup(addrs->defined, addr)) { virReportError(VIR_ERR_XML_ERROR, - _("The CCW devno '%s' is in use already"), + _("The CCW devno '%1$s' is in use already"), addr); return -1; } @@ -1457,8 +1445,7 @@ virDomainVirtioSerialAddrPlaceController(virDomainVirtioSerialAddrSet *addrs, for (i = 0; i < addrs->ncontrollers; i++) { if (addrs->controllers[i]->idx == cont->idx) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("virtio serial controller with index %u already exists" - " in the address set"), + _("virtio serial controller with index %1$u already exists in the address set"), cont->idx); return -2; } @@ -1583,7 +1570,7 @@ virDomainVirtioSerialAddrReserve(virDomainDef *def G_GNUC_UNUSED, i = virDomainVirtioSerialAddrFindController(addrs, info->addr.vioserial.controller); if (i < 0) { virReportError(VIR_ERR_XML_ERROR, - _("virtio serial controller %u is missing"), + _("virtio serial controller %1$u is missing"), info->addr.vioserial.controller); return -1; } @@ -1591,7 +1578,7 @@ virDomainVirtioSerialAddrReserve(virDomainDef *def G_GNUC_UNUSED, map = addrs->controllers[i]->ports; if (virBitmapGetBit(map, info->addr.vioserial.port, &b) < 0) { virReportError(VIR_ERR_XML_ERROR, - _("virtio serial controller %u does not have port %u"), + _("virtio serial controller %1$u does not have port %2$u"), info->addr.vioserial.controller, info->addr.vioserial.port); return -1; @@ -1599,7 +1586,7 @@ virDomainVirtioSerialAddrReserve(virDomainDef *def G_GNUC_UNUSED, if (b) { virReportError(VIR_ERR_XML_ERROR, - _("virtio serial port %u on controller %u is already occupied"), + _("virtio serial port %1$u on controller %2$u is already occupied"), info->addr.vioserial.port, info->addr.vioserial.controller); return -1; @@ -1726,7 +1713,7 @@ virDomainVirtioSerialAddrNextFromController(virDomainVirtioSerialAddrSet *addrs, i = virDomainVirtioSerialAddrFindController(addrs, addr->controller); if (i < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("virtio-serial controller %u not available"), + _("virtio-serial controller %1$u not available"), addr->controller); return -1; } @@ -1734,7 +1721,7 @@ virDomainVirtioSerialAddrNextFromController(virDomainVirtioSerialAddrSet *addrs, map = addrs->controllers[i]->ports; if ((port = virBitmapNextClearBit(map, 0)) <= 0) { virReportError(VIR_ERR_XML_ERROR, - _("Unable to find a free port on virtio-serial controller %u"), + _("Unable to find a free port on virtio-serial controller %1$u"), addr->controller); return -1; } @@ -1977,7 +1964,7 @@ virDomainUSBAddressSetAddController(virDomainUSBAddressSet *addrs, VIR_EXPAND_N(addrs->buses, addrs->nbuses, cont->idx - addrs->nbuses + 1); } else if (addrs->buses[cont->idx]) { virReportError(VIR_ERR_XML_ERROR, - _("Duplicate USB controllers with index %u"), + _("Duplicate USB controllers with index %1$u"), cont->idx); goto cleanup; } @@ -2021,7 +2008,7 @@ virDomainUSBAddressFindPort(virDomainUSBAddressSet *addrs, if (info->addr.usb.bus >= addrs->nbuses || !addrs->buses[info->addr.usb.bus]) { - virReportError(VIR_ERR_XML_ERROR, _("Missing USB bus %u"), + virReportError(VIR_ERR_XML_ERROR, _("Missing USB bus %1$u"), info->addr.usb.bus); return NULL; } @@ -2035,7 +2022,7 @@ virDomainUSBAddressFindPort(virDomainUSBAddressSet *addrs, if (hub->nports <= portIdx) { virReportError(VIR_ERR_XML_ERROR, - _("port %u out of range in USB address bus: %u port: %s"), + _("port %1$u out of range in USB address bus: %2$u port: %3$s"), info->addr.usb.port[i], info->addr.usb.bus, portStr); @@ -2044,7 +2031,7 @@ virDomainUSBAddressFindPort(virDomainUSBAddressSet *addrs, hub = hub->ports[portIdx]; if (!hub) { virReportError(VIR_ERR_XML_ERROR, - _("there is no hub at port %u in USB address bus: %u port: %s"), + _("there is no hub at port %1$u in USB address bus: %2$u port: %3$s"), info->addr.usb.port[i], info->addr.usb.bus, portStr); @@ -2055,7 +2042,7 @@ virDomainUSBAddressFindPort(virDomainUSBAddressSet *addrs, targetPort = info->addr.usb.port[lastIdx] - 1; if (targetPort >= virBitmapSize(hub->portmap)) { virReportError(VIR_ERR_XML_ERROR, - _("requested USB port %s not present on USB bus %u"), + _("requested USB port %1$s not present on USB bus %2$u"), portStr, info->addr.usb.bus); return NULL; } @@ -2096,7 +2083,7 @@ virDomainUSBAddressSetAddHub(virDomainUSBAddressSet *addrs, if (targetHub->ports[targetPort]) { virReportError(VIR_ERR_XML_ERROR, - _("Duplicate USB hub on bus %u port %s"), + _("Duplicate USB hub on bus %1$u port %2$s"), hub->info.addr.usb.bus, portStr); goto cleanup; } @@ -2248,8 +2235,8 @@ virDomainUSBAddressAssign(virDomainUSBAddressSet *addrs, if (info->addr.usb.bus >= addrs->nbuses || !addrs->buses[info->addr.usb.bus]) { virReportError(VIR_ERR_XML_ERROR, - _("USB bus %u requested but no controller " - "with that index is present"), info->addr.usb.bus); + _("USB bus %1$u requested but no controller with that index is present"), + info->addr.usb.bus); return -1; } rc = virDomainUSBAddressAssignFromBus(addrs, info, info->addr.usb.bus); @@ -2307,7 +2294,7 @@ virDomainUSBAddressReserve(virDomainDeviceInfo *info, if (virBitmapIsBitSet(targetHub->portmap, targetPort)) { virReportError(VIR_ERR_XML_ERROR, - _("Duplicate USB address bus %u port %s"), + _("Duplicate USB address bus %1$u port %2$s"), info->addr.usb.bus, portStr); return -1; } diff --git a/src/conf/domain_capabilities.c b/src/conf/domain_capabilities.c index d8915bd2d2..c076af7808 100644 --- a/src/conf/domain_capabilities.c +++ b/src/conf/domain_capabilities.c @@ -244,8 +244,7 @@ virDomainCapsEnumSet(virDomainCapsEnum *capsEnum, if (!val) { /* Integer overflow */ virReportError(VIR_ERR_INTERNAL_ERROR, - _("integer overflow on %s. Please contact the " - "libvirt development team at libvir-list(a)redhat.com&quot;), + _("integer overflow on %1$s. Please contact the libvirt development team at libvir-list(a)redhat.com&quot;), capsEnumName); return -1; } diff --git a/src/conf/domain_event.c b/src/conf/domain_event.c index 7e9bd08381..94b7335e56 100644 --- a/src/conf/domain_event.c +++ b/src/conf/domain_event.c @@ -575,7 +575,7 @@ virDomainEventNew(virClass *klass, if (!virClassIsDerivedFrom(klass, virDomainEventClass)) { virReportInvalidArg(klass, - _("Class %s must derive from virDomainEvent"), + _("Class %1$s must derive from virDomainEvent"), virClassName(klass)); return NULL; } @@ -2395,7 +2395,7 @@ virDomainQemuMonitorEventStateRegisterID(virConnectPtr conn, data->regex = g_regex_new(event, cflags, 0, &err); if (!data->regex) { virReportError(VIR_ERR_INVALID_ARG, - _("failed to compile regex '%s': %s"), + _("failed to compile regex '%1$s': %2$s"), event, err->message); VIR_FREE(data); return -1; diff --git a/src/conf/domain_postparse.c b/src/conf/domain_postparse.c index 22eb603b3b..56759ae613 100644 --- a/src/conf/domain_postparse.c +++ b/src/conf/domain_postparse.c @@ -160,7 +160,7 @@ virDomainDefPostParseTimer(virDomainDef *def) timer->name == VIR_DOMAIN_TIMER_NAME_HYPERVCLOCK) { if (timer->tickpolicy) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("timer %s doesn't support setting of timer tickpolicy"), + _("timer %1$s doesn't support setting of timer tickpolicy"), virDomainTimerNameTypeToString(timer->name)); return -1; } @@ -178,14 +178,14 @@ virDomainDefPostParseTimer(virDomainDef *def) if (timer->name != VIR_DOMAIN_TIMER_NAME_TSC) { if (timer->frequency != 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("timer %s doesn't support setting of timer frequency"), + _("timer %1$s doesn't support setting of timer frequency"), virDomainTimerNameTypeToString(timer->name)); return -1; } if (timer->mode) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("timer %s doesn't support setting of timer mode"), + _("timer %1$s doesn't support setting of timer mode"), virDomainTimerNameTypeToString(timer->name)); return -1; } @@ -195,7 +195,7 @@ virDomainDefPostParseTimer(virDomainDef *def) timer->name != VIR_DOMAIN_TIMER_NAME_RTC) { if (timer->track != VIR_DOMAIN_TIMER_TRACK_NONE) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("timer %s doesn't support setting of timer track"), + _("timer %1$s doesn't support setting of timer track"), virDomainTimerNameTypeToString(timer->name)); return -1; } @@ -341,7 +341,7 @@ virDomainHostdevDefPostParse(virDomainHostdevDef *dev, VIR_DOMAIN_DISK_BUS_SCSI, addr)) { virReportError(VIR_ERR_XML_ERROR, - _("SCSI host address controller='%u' bus='%u' target='%u' unit='%u' in use by a SCSI disk"), + _("SCSI host address controller='%1$u' bus='%2$u' target='%3$u' unit='%4$u' in use by a SCSI disk"), addr->controller, addr->bus, addr->target, addr->unit); return -1; @@ -358,7 +358,7 @@ virDomainHostdevDefPostParse(virDomainHostdevDef *dev, (model == VIR_MDEV_MODEL_TYPE_VFIO_CCW && dev->info->type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW)) { virReportError(VIR_ERR_XML_ERROR, - _("Unsupported address type '%s' with mediated device model '%s'"), + _("Unsupported address type '%1$s' with mediated device model '%2$s'"), virDomainDeviceAddressTypeToString(dev->info->type), virMediatedDeviceModelTypeToString(model)); return -1; @@ -391,7 +391,7 @@ virDomainChrIsaSerialDefPostParse(virDomainDef *def) if (isa_serial_count++ >= VIR_MAX_ISA_SERIAL_PORTS || def->serials[i]->target.port >= VIR_MAX_ISA_SERIAL_PORTS) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Maximum supported number of ISA serial ports is '%d'"), + _("Maximum supported number of ISA serial ports is '%1$d'"), VIR_MAX_ISA_SERIAL_PORTS); return -1; } @@ -399,7 +399,7 @@ virDomainChrIsaSerialDefPostParse(virDomainDef *def) if (def->serials[i]->target.port != -1) { if (used_serial_port[def->serials[i]->target.port]) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("target port '%d' already allocated"), + _("target port '%1$d' already allocated"), def->serials[i]->target.port); return -1; } @@ -842,7 +842,7 @@ virDomainDefPostParseCheckFeatures(virDomainDef *def, if (UNSUPPORTED(VIR_DOMAIN_DEF_FEATURE_NAME_SLASH)) { if (def->name && strchr(def->name, '/')) { virReportError(VIR_ERR_XML_ERROR, - _("name %s cannot contain '/'"), def->name); + _("name %1$s cannot contain '/'"), def->name); return -1; } } @@ -881,7 +881,7 @@ virDomainDeviceDefPostParseCheckFeatures(virDomainDeviceDef *dev, dev->type == VIR_DOMAIN_DEVICE_NET && dev->data.net->modelstr) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("driver does not support net model '%s'"), + _("driver does not support net model '%1$s'"), dev->data.net->modelstr); return -1; } @@ -890,7 +890,7 @@ virDomainDeviceDefPostParseCheckFeatures(virDomainDeviceDef *dev, dev->data.disk->src->fdgroup && UNSUPPORTED(VIR_DOMAIN_DEF_FEATURE_DISK_FD)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("driver does not support FD passing for disk '%s'"), + _("driver does not support FD passing for disk '%1$s'"), dev->data.disk->dst); return -1; } @@ -999,7 +999,7 @@ virDomainVcpuDefPostParse(virDomainDef *def) case VIR_TRISTATE_BOOL_NO: if (!vcpu->online) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("vcpu '%zu' is both offline and not hotpluggable"), i); + _("vcpu '%1$zu' is both offline and not hotpluggable"), i); return -1; } break; @@ -1056,7 +1056,7 @@ virDomainDefCollectBootOrder(virDomainDef *def G_GNUC_UNUSED, if (virHashLookup(bootHash, order)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("boot order '%s' used for more than one device"), + _("boot order '%1$s' used for more than one device"), order); return -1; } @@ -1166,7 +1166,7 @@ virDomainDefRejectDuplicateControllers(virDomainDef *def) if (virBitmapIsBitSet(bitmaps[cont->type], cont->idx)) { virReportError(VIR_ERR_XML_ERROR, - _("Multiple '%s' controllers with index '%d'"), + _("Multiple '%1$s' controllers with index '%2$d'"), virDomainControllerTypeToString(cont->type), cont->idx); goto cleanup; @@ -1195,7 +1195,7 @@ virDomainDefRejectDuplicatePanics(virDomainDef *def) virDomainPanicModel model = def->panics[i]->model; if (exists[model]) { virReportError(VIR_ERR_XML_ERROR, - _("Multiple panic devices with model '%s'"), + _("Multiple panic devices with model '%1$s'"), virDomainPanicModelTypeToString(model)); return -1; } diff --git a/src/conf/interface_conf.c b/src/conf/interface_conf.c index 671b8b088f..3dce82983d 100644 --- a/src/conf/interface_conf.c +++ b/src/conf/interface_conf.c @@ -142,7 +142,7 @@ virInterfaceDefParseStartMode(virInterfaceDef *def, def->startmode = VIR_INTERFACE_START_NONE; } else { virReportError(VIR_ERR_XML_ERROR, - _("unknown interface startmode %s"), tmp); + _("unknown interface startmode %1$s"), tmp); return -1; } return 0; @@ -172,7 +172,7 @@ virInterfaceDefParseBondMode(xmlXPathContextPtr ctxt) return VIR_INTERFACE_BOND_BALALB; } - virReportError(VIR_ERR_XML_ERROR, _("unknown bonding mode %s"), tmp); + virReportError(VIR_ERR_XML_ERROR, _("unknown bonding mode %1$s"), tmp); return -1; } @@ -190,7 +190,7 @@ virInterfaceDefParseBondMiiCarrier(xmlXPathContextPtr ctxt) return VIR_INTERFACE_BOND_MII_NETIF; } - virReportError(VIR_ERR_XML_ERROR, _("unknown mii bonding carrier %s"), tmp); + virReportError(VIR_ERR_XML_ERROR, _("unknown mii bonding carrier %1$s"), tmp); return -1; } @@ -210,7 +210,7 @@ virInterfaceDefParseBondArpValid(xmlXPathContextPtr ctxt) return VIR_INTERFACE_BOND_ARP_ALL; } - virReportError(VIR_ERR_XML_ERROR, _("unknown arp bonding validate %s"), tmp); + virReportError(VIR_ERR_XML_ERROR, _("unknown arp bonding validate %1$s"), tmp); return -1; } @@ -370,7 +370,8 @@ virInterfaceDefParseIfAdressing(virInterfaceDef *def, return -1; } else { virReportError(VIR_ERR_XML_ERROR, - _("unsupported protocol family '%s'"), proto->family); + _("unsupported protocol family '%1$s'"), + proto->family); return -1; } def->protos[def->nprotos++] = g_steal_pointer(&proto); @@ -399,7 +400,7 @@ virInterfaceDefParseBridge(virInterfaceDef *def, def->data.bridge.stp = 0; } else { virReportError(VIR_ERR_XML_ERROR, - _("bridge interface stp should be on or off got %s"), + _("bridge interface stp should be on or off got %1$s"), tmp); return 0; } @@ -585,7 +586,7 @@ virInterfaceDefParseXML(xmlXPathContextPtr ctxt, || (parentIfType == VIR_INTERFACE_TYPE_VLAN)) { virReportError(VIR_ERR_XML_ERROR, - _("interface has unsupported type '%s'"), + _("interface has unsupported type '%1$s'"), virInterfaceTypeToString(type)); return NULL; } @@ -895,7 +896,7 @@ virInterfaceDefDevFormat(virBuffer *buf, if (!(type = virInterfaceTypeToString(def->type))) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unexpected interface type %d"), def->type); + _("unexpected interface type %1$d"), def->type); return -1; } diff --git a/src/conf/netdev_bandwidth_conf.c b/src/conf/netdev_bandwidth_conf.c index f7d27fb5af..1609b14784 100644 --- a/src/conf/netdev_bandwidth_conf.c +++ b/src/conf/netdev_bandwidth_conf.c @@ -46,7 +46,7 @@ virNetDevBandwidthParseRate(xmlNodePtr node, virNetDevBandwidthRate *rate) if (average) { if (virStrToLong_ullp(average, NULL, 10, &rate->average) < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("could not convert bandwidth average value '%s'"), + _("could not convert bandwidth average value '%1$s'"), average); return -1; } @@ -64,21 +64,21 @@ virNetDevBandwidthParseRate(xmlNodePtr node, virNetDevBandwidthRate *rate) if (peak && virStrToLong_ullp(peak, NULL, 10, &rate->peak) < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("could not convert bandwidth peak value '%s'"), + _("could not convert bandwidth peak value '%1$s'"), peak); return -1; } if (burst && virStrToLong_ullp(burst, NULL, 10, &rate->burst) < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("could not convert bandwidth burst value '%s'"), + _("could not convert bandwidth burst value '%1$s'"), burst); return -1; } if (floor && virStrToLong_ullp(floor, NULL, 10, &rate->floor) < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("could not convert bandwidth floor value '%s'"), + _("could not convert bandwidth floor value '%1$s'"), floor); return -1; } @@ -128,7 +128,7 @@ virNetDevBandwidthParse(virNetDevBandwidth **bandwidth, } if (virStrToLong_ui(class_id_prop, NULL, 10, class_id) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to parse class id '%s'"), + _("Unable to parse class id '%1$s'"), class_id_prop); return -1; } diff --git a/src/conf/netdev_vlan_conf.c b/src/conf/netdev_vlan_conf.c index 28a818ad85..96ac7f3428 100644 --- a/src/conf/netdev_vlan_conf.c +++ b/src/conf/netdev_vlan_conf.c @@ -65,7 +65,7 @@ virNetDevVlanParse(xmlNodePtr node, xmlXPathContextPtr ctxt, virNetDevVlan *def) if (def->tag[i] > 4095) { virReportError(VIR_ERR_XML_ERROR, - _("vlan tag id %u too large (maximum 4095)"), def->tag[i]); + _("vlan tag id %1$u too large (maximum 4095)"), def->tag[i]); goto cleanup; } @@ -100,8 +100,8 @@ virNetDevVlanParse(xmlNodePtr node, xmlXPathContextPtr ctxt, virNetDevVlan *def) if (!def->trunk) { if (nTags > 1) { virReportError(VIR_ERR_XML_ERROR, - _("invalid \"trunk='%s'\" in <vlan> - trunk='yes' " - "is required for more than one vlan tag"), trunk); + _("invalid \"trunk='%1$s'\" in <vlan> - trunk='yes' is required for more than one vlan tag"), + trunk); goto cleanup; } if (def->nativeMode != 0) { @@ -113,8 +113,8 @@ virNetDevVlanParse(xmlNodePtr node, xmlXPathContextPtr ctxt, virNetDevVlan *def) /* allow (but discard) "trunk='no' if there is a single tag */ if (STRCASENEQ(trunk, "no")) { virReportError(VIR_ERR_XML_ERROR, - _("invalid \"trunk='%s'\" in <vlan> " - "- must be yes or no"), trunk); + _("invalid \"trunk='%1$s'\" in <vlan> - must be yes or no"), + trunk); goto cleanup; } } diff --git a/src/conf/netdev_vport_profile_conf.c b/src/conf/netdev_vport_profile_conf.c index 26f379248f..59237e10de 100644 --- a/src/conf/netdev_vport_profile_conf.c +++ b/src/conf/netdev_vport_profile_conf.c @@ -43,7 +43,7 @@ virNetDevVPortProfileParse(xmlNodePtr node, unsigned int flags) if ((virtPortType = virXMLPropString(node, "type")) && (virtPort->virtPortType = virNetDevVPortTypeFromString(virtPortType)) <= 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown virtualport type %s"), virtPortType); + _("unknown virtualport type %1$s"), virtPortType); return NULL; } diff --git a/src/conf/networkcommon_conf.c b/src/conf/networkcommon_conf.c index 275847853d..6f88d173c6 100644 --- a/src/conf/networkcommon_conf.c +++ b/src/conf/networkcommon_conf.c @@ -54,32 +54,28 @@ virNetDevIPRouteCreate(const char *errorDetail, if (!address) { virReportError(VIR_ERR_XML_ERROR, - _("%s: Missing required address attribute " - "in route definition"), + _("%1$s: Missing required address attribute in route definition"), errorDetail); return NULL; } if (!gateway) { virReportError(VIR_ERR_XML_ERROR, - _("%s: Missing required gateway attribute " - "in route definition"), + _("%1$s: Missing required gateway attribute in route definition"), errorDetail); return NULL; } if (virSocketAddrParse(&def->address, address, AF_UNSPEC) < 0) { virReportError(VIR_ERR_XML_ERROR, - _("%s: Bad network address '%s' " - "in route definition"), + _("%1$s: Bad network address '%2$s' in route definition"), errorDetail, address); return NULL; } if (virSocketAddrParse(&def->gateway, gateway, AF_UNSPEC) < 0) { virReportError(VIR_ERR_XML_ERROR, - _("%s: Bad gateway address '%s' " - "in route definition"), + _("%1$s: Bad gateway address '%2$s' in route definition"), errorDetail, gateway); return NULL; } @@ -90,89 +86,74 @@ virNetDevIPRouteCreate(const char *errorDetail, VIR_SOCKET_ADDR_IS_FAMILY(&def->address, AF_UNSPEC))) { virReportError(VIR_ERR_XML_ERROR, def->family == NULL ? - _("%s: No family specified for non-IPv4 address '%s' " - "in route definition") : - _("%s: IPv4 family specified for non-IPv4 address '%s' " - "in route definition"), + _("%1$s: No family specified for non-IPv4 address '%2$s' in route definition") : + _("%1$s: IPv4 family specified for non-IPv4 address '%2$s' in route definition"), errorDetail, address); return NULL; } if (!VIR_SOCKET_ADDR_IS_FAMILY(&def->gateway, AF_INET)) { virReportError(VIR_ERR_XML_ERROR, def->family == NULL ? - _("%s: No family specified for non-IPv4 gateway '%s' " - "in route definition") : - _("%s: IPv4 family specified for non-IPv4 gateway '%s' " - "in route definition"), + _("%1$s: No family specified for non-IPv4 gateway '%2$s' in route definition") : + _("%1$s: IPv4 family specified for non-IPv4 gateway '%2$s' in route definition"), errorDetail, address); return NULL; } if (netmask) { if (virSocketAddrParse(&def->netmask, netmask, AF_UNSPEC) < 0) { virReportError(VIR_ERR_XML_ERROR, - _("%s: Bad netmask address '%s' " - "in route definition"), + _("%1$s: Bad netmask address '%2$s' in route definition"), errorDetail, netmask); return NULL; } if (!VIR_SOCKET_ADDR_IS_FAMILY(&def->netmask, AF_INET)) { virReportError(VIR_ERR_XML_ERROR, - _("%s: Invalid netmask '%s' " - "for address '%s' (both must be IPv4)"), + _("%1$s: Invalid netmask '%2$s' for address '%3$s' (both must be IPv4)"), errorDetail, netmask, address); return NULL; } if (def->has_prefix) { /* can't have both netmask and prefix at the same time */ virReportError(VIR_ERR_XML_ERROR, - _("%s: Route definition cannot have both " - "a prefix and a netmask"), + _("%1$s: Route definition cannot have both a prefix and a netmask"), errorDetail); return NULL; } } if (def->prefix > 32) { virReportError(VIR_ERR_XML_ERROR, - _("%s: Invalid prefix %u specified " - "in route definition, " - "must be 0 - 32"), + _("%1$s: Invalid prefix %2$u specified in route definition, must be 0 - 32"), errorDetail, def->prefix); return NULL; } } else if (STREQ(def->family, "ipv6")) { if (!VIR_SOCKET_ADDR_IS_FAMILY(&def->address, AF_INET6)) { virReportError(VIR_ERR_XML_ERROR, - _("%s: ipv6 family specified for non-IPv6 address '%s' " - "in route definition"), + _("%1$s: ipv6 family specified for non-IPv6 address '%2$s' in route definition"), errorDetail, address); return NULL; } if (netmask) { virReportError(VIR_ERR_XML_ERROR, - _("%s: Specifying netmask invalid for IPv6 address '%s' " - "in route definition"), + _("%1$s: Specifying netmask invalid for IPv6 address '%2$s' in route definition"), errorDetail, address); return NULL; } if (!VIR_SOCKET_ADDR_IS_FAMILY(&def->gateway, AF_INET6)) { virReportError(VIR_ERR_XML_ERROR, - _("%s: ipv6 specified for non-IPv6 gateway address '%s' " - "in route definition"), + _("%1$s: ipv6 specified for non-IPv6 gateway address '%2$s' in route definition"), errorDetail, gateway); return NULL; } if (def->prefix > 128) { virReportError(VIR_ERR_XML_ERROR, - _("%s: Invalid prefix %u specified " - "in route definition, " - "must be 0 - 128"), + _("%1$s: Invalid prefix %2$u specified in route definition, must be 0 - 128"), errorDetail, def->prefix); return NULL; } } else { virReportError(VIR_ERR_XML_ERROR, - _("%s: Unrecognized family '%s' " - "in route definition"), + _("%1$s: Unrecognized family '%2$s' in route definition"), errorDetail, def->family); return NULL; } @@ -181,9 +162,7 @@ virNetDevIPRouteCreate(const char *errorDetail, if (netmask) { if (virSocketAddrMask(&def->address, &def->netmask, &testAddr) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("%s: Error converting address '%s' with netmask '%s' " - "to network-address " - "in route definition"), + _("%1$s: Error converting address '%2$s' with netmask '%3$s' to network-address in route definition"), errorDetail, address, netmask); return NULL; } @@ -191,17 +170,14 @@ virNetDevIPRouteCreate(const char *errorDetail, if (virSocketAddrMaskByPrefix(&def->address, def->prefix, &testAddr) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("%s: Error converting address '%s' with prefix %u " - "to network-address " - "in route definition"), + _("%1$s: Error converting address '%2$s' with prefix %3$u to network-address in route definition"), errorDetail, address, def->prefix); return NULL; } } if (!virSocketAddrEqual(&def->address, &testAddr)) { virReportError(VIR_ERR_XML_ERROR, - _("%s: Address '%s' in route definition " - "is not a network address"), + _("%1$s: Address '%2$s' in route definition is not a network address"), errorDetail, address); return NULL; } diff --git a/src/conf/node_device_util.c b/src/conf/node_device_util.c index 3c2fc4e258..cfe1b1077e 100644 --- a/src/conf/node_device_util.c +++ b/src/conf/node_device_util.c @@ -49,7 +49,7 @@ virNodeDeviceGetParentName(virConnectPtr conn, if (!(device = virNodeDeviceLookupByName(conn, nodedev_name))) { virReportError(VIR_ERR_XML_ERROR, - _("Cannot find '%s' in node device database"), + _("Cannot find '%1$s' in node device database"), nodedev_name); return NULL; } @@ -123,7 +123,7 @@ virNodeDeviceCreateVport(virStorageAdapterFCHost *fchost) */ if (!skip_capable_check && !virVHBAPathExists(NULL, parent_host)) { virReportError(VIR_ERR_XML_ERROR, - _("parent '%s' specified for vHBA does not exist"), + _("parent '%1$s' specified for vHBA does not exist"), parent_hoststr); return NULL; } @@ -174,7 +174,7 @@ virNodeDeviceDeleteVport(virConnectPtr conn, /* Find our vHBA by searching the fc_host sysfs tree for our wwnn/wwpn */ if (!(name = virVHBAGetHostByWWN(NULL, fchost->wwnn, fchost->wwpn))) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to find fc_host for wwnn='%s' and wwpn='%s'"), + _("Failed to find fc_host for wwnn='%1$s' and wwpn='%2$s'"), fchost->wwnn, fchost->wwpn); return -1; } diff --git a/src/conf/numa_conf.c b/src/conf/numa_conf.c index 7ef7aa5138..b21671f587 100644 --- a/src/conf/numa_conf.c +++ b/src/conf/numa_conf.c @@ -180,7 +180,7 @@ virDomainNumatuneNodeParseXML(virDomainNuma *numa, if (mem_node->nodeset) { virReportError(VIR_ERR_XML_ERROR, - _("Multiple memnode elements with cellid %u"), + _("Multiple memnode elements with cellid %1$u"), cellid); return -1; } @@ -211,7 +211,7 @@ virDomainNumatuneNodeParseXML(virDomainNuma *numa, if (virBitmapIsAllClear(mem_node->nodeset)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Invalid value of 'nodeset': %s"), tmp); + _("Invalid value of 'nodeset': %1$s"), tmp); return -1; } } @@ -247,14 +247,14 @@ virDomainNumatuneParseXML(virDomainNuma *numa, if ((modestr = virXMLPropString(node, "mode")) && (mode = virDomainNumatuneMemModeTypeFromString(modestr)) < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Unsupported NUMA memory tuning mode '%s'"), modestr); + _("Unsupported NUMA memory tuning mode '%1$s'"), modestr); return -1; } if ((placementstr = virXMLPropString(node, "placement")) && (placement = virDomainNumatunePlacementTypeFromString(placementstr)) < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Unsupported NUMA memory placement mode '%s'"), placementstr); + _("Unsupported NUMA memory placement mode '%1$s'"), placementstr); return -1; } @@ -264,7 +264,7 @@ virDomainNumatuneParseXML(virDomainNuma *numa, if (virBitmapIsAllClear(nodeset)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Invalid value of 'nodeset': %s"), nodesetstr); + _("Invalid value of 'nodeset': %1$s"), nodesetstr); return -1; } } @@ -507,7 +507,7 @@ virDomainNumatuneSet(virDomainNuma *numa, if (mode != -1 && (mode < 0 || mode >= VIR_DOMAIN_NUMATUNE_MEM_LAST)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Unsupported numatune mode '%d'"), + _("Unsupported numatune mode '%1$d'"), mode); return -1; } @@ -515,7 +515,7 @@ virDomainNumatuneSet(virDomainNuma *numa, if (placement != -1 && (placement < 0 || placement >= VIR_DOMAIN_NUMATUNE_PLACEMENT_LAST)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Unsupported numatune placement '%d'"), + _("Unsupported numatune placement '%1$d'"), mode); return -1; } @@ -732,8 +732,7 @@ virDomainNumaDefNodeDistanceParseXML(virDomainNuma *def, /* The "id" needs to be within numa/cell range */ if (sibling_id >= ndistances) { virReportError(VIR_ERR_XML_ERROR, - _("'sibling_id %d' does not refer to a " - "valid cell within NUMA 'cell id %d'"), + _("'sibling_id %1$d' does not refer to a valid cell within NUMA 'cell id %2$d'"), sibling_id, cur_cell); goto cleanup; } @@ -752,8 +751,7 @@ virDomainNumaDefNodeDistanceParseXML(virDomainNuma *def, (sibling_id != cur_cell && sibling_value == LOCAL_DISTANCE)) { virReportError(VIR_ERR_XML_ERROR, - _("'value %d' is invalid for " - "'sibling id %d' under NUMA 'cell id %d'"), + _("'value %1$d' is invalid for 'sibling id %2$d' under NUMA 'cell id %3$d'"), sibling_value, sibling_id, cur_cell); goto cleanup; } @@ -826,8 +824,7 @@ virDomainNumaDefNodeCacheParseXML(virDomainNuma *def, if (!(tmp = virXMLPropString(nodes[i], "level"))) { virReportError(VIR_ERR_XML_ERROR, - _("Missing 'level' attribute in cache " - "element for NUMA node %d"), + _("Missing 'level' attribute in cache element for NUMA node %1$d"), cur_cell); return -1; } @@ -835,8 +832,7 @@ virDomainNumaDefNodeCacheParseXML(virDomainNuma *def, if (virStrToLong_uip(tmp, NULL, 10, &level) < 0 || level == 0) { virReportError(VIR_ERR_XML_ERROR, - _("Invalid 'level' attribute in cache " - "element for NUMA node %d"), + _("Invalid 'level' attribute in cache element for NUMA node %1$d"), cur_cell); return -1; } @@ -844,15 +840,14 @@ virDomainNumaDefNodeCacheParseXML(virDomainNuma *def, if (!(tmp = virXMLPropString(nodes[i], "associativity"))) { virReportError(VIR_ERR_XML_ERROR, - _("Missing 'associativity' attribute in cache " - "element for NUMA node %d"), + _("Missing 'associativity' attribute in cache element for NUMA node %1$d"), cur_cell); return -1; } if ((associativity = virNumaCacheAssociativityTypeFromString(tmp)) < 0) { virReportError(VIR_ERR_XML_ERROR, - _("Invalid cache associativity '%s'"), + _("Invalid cache associativity '%1$s'"), tmp); return -1; } @@ -860,14 +855,13 @@ virDomainNumaDefNodeCacheParseXML(virDomainNuma *def, if (!(tmp = virXMLPropString(nodes[i], "policy"))) { virReportError(VIR_ERR_XML_ERROR, - _("Missing 'policy' attribute in cache " - "element for NUMA node %d"), + _("Missing 'policy' attribute in cache element for NUMA node %1$d"), cur_cell); } if ((policy = virNumaCachePolicyTypeFromString(tmp)) < 0) { virReportError(VIR_ERR_XML_ERROR, - _("Invalid cache policy '%s'"), + _("Invalid cache policy '%1$s'"), tmp); return -1; } @@ -932,7 +926,7 @@ virDomainNumaDefParseXML(virDomainNuma *def, if (def->mem_nodes[cur_cell].mem) { virReportError(VIR_ERR_XML_ERROR, - _("Duplicate NUMA cell info for cell id '%u'"), + _("Duplicate NUMA cell info for cell id '%1$u'"), cur_cell); return -1; } @@ -956,7 +950,7 @@ virDomainNumaDefParseXML(virDomainNuma *def, if (virBitmapOverlaps(def->mem_nodes[j].cpumask, def->mem_nodes[cur_cell].cpumask)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("NUMA cells %u and %zu have overlapping vCPU ids"), + _("NUMA cells %1$u and %2$zu have overlapping vCPU ids"), cur_cell, j); return -1; } @@ -1133,7 +1127,7 @@ virDomainNumaDefValidate(const virDomainNuma *def) if (virBitmapIsBitSet(levelsSeen, cache->level)) { virReportError(VIR_ERR_XML_ERROR, - _("Cache level '%u' already defined"), + _("Cache level '%1$u' already defined"), cache->level); return -1; } @@ -1259,8 +1253,7 @@ virDomainNumaCheckABIStability(virDomainNuma *src, if (virDomainNumaGetNodeCount(src) != virDomainNumaGetNodeCount(tgt)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target NUMA node count '%zu' doesn't match " - "source '%zu'"), + _("Target NUMA node count '%1$zu' doesn't match source '%2$zu'"), virDomainNumaGetNodeCount(tgt), virDomainNumaGetNodeCount(src)); return false; @@ -1270,8 +1263,8 @@ virDomainNumaCheckABIStability(virDomainNuma *src, if (virDomainNumaGetNodeMemorySize(src, i) != virDomainNumaGetNodeMemorySize(tgt, i)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Size of target NUMA node %zu (%llu) doesn't " - "match source (%llu)"), i, + _("Size of target NUMA node %1$zu (%2$llu) doesn't match source (%3$llu)"), + i, virDomainNumaGetNodeMemorySize(tgt, i), virDomainNumaGetNodeMemorySize(src, i)); return false; @@ -1280,8 +1273,8 @@ virDomainNumaCheckABIStability(virDomainNuma *src, if (!virBitmapEqual(virDomainNumaGetNodeCpumask(src, i), virDomainNumaGetNodeCpumask(tgt, i))) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Processor mask of target NUMA node %zu doesn't " - "match source"), i); + _("Processor mask of target NUMA node %1$zu doesn't match source"), + i); return false; } @@ -1289,8 +1282,8 @@ virDomainNumaCheckABIStability(virDomainNuma *src, if (virDomainNumaGetNodeDistance(src, i, j) != virDomainNumaGetNodeDistance(tgt, i, j)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target NUMA distance from %zu to %zu " - "doesn't match source"), i, j); + _("Target NUMA distance from %1$zu to %2$zu doesn't match source"), + i, j); return false; } @@ -1407,8 +1400,7 @@ virDomainNumaSetNodeDistance(virDomainNuma *numa, if (node >= numa->nmem_nodes) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Argument 'node' %zu outranges " - "defined number of NUMA nodes"), + _("Argument 'node' %1$zu outranges defined number of NUMA nodes"), node); return -1; } @@ -1431,15 +1423,14 @@ virDomainNumaSetNodeDistance(virDomainNuma *numa, if (value < LOCAL_DISTANCE || value > UNREACHABLE) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Distance value of %d is not in valid range"), + _("Distance value of %1$d is not in valid range"), value); return -1; } if (value == LOCAL_DISTANCE && node != cellid) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Distance value %d under node %zu is " - "LOCAL_DISTANCE and should be set to 10"), + _("Distance value %1$d under node %2$zu is LOCAL_DISTANCE and should be set to 10"), value, node); return -1; } @@ -1461,7 +1452,7 @@ virDomainNumaSetNodeDistanceCount(virDomainNuma *numa, distances = numa->mem_nodes[node].distances; if (distances) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Cannot alter an existing nmem_nodes distances set for node: %zu"), + _("Cannot alter an existing nmem_nodes distances set for node: %1$zu"), node); return 0; } diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c index 8d198a7bb1..70ad37e63d 100644 --- a/src/conf/nwfilter_conf.c +++ b/src/conf/nwfilter_conf.c @@ -2009,7 +2009,7 @@ virNWFilterRuleDetailsParse(xmlNodePtr node, if (!found || rc) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("%s has illegal value %s"), + _("%1$s has illegal value %2$s"), att[idx].name, prop); rc = -1; } @@ -2115,10 +2115,8 @@ virNWFilterRuleValidate(virNWFilterRuleDef *rule) } if (ret < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("%s rule with port specification requires " - "protocol specification with protocol to be " - "either one of tcp(6), udp(17), dccp(33), or " - "sctp(132)"), protocol); + _("%1$s rule with port specification requires protocol specification with protocol to be either one of tcp(6), udp(17), dccp(33), or sctp(132)"), + protocol); } } break; @@ -2485,8 +2483,7 @@ virNWFilterIsValidChainName(const char *chainname) { if (strlen(chainname) > MAX_CHAIN_SUFFIX_SIZE) { virReportError(VIR_ERR_INVALID_ARG, - _("Name of chain is longer than " - "%u characters"), + _("Name of chain is longer than %1$u characters"), MAX_CHAIN_SUFFIX_SIZE); return false; } @@ -2532,8 +2529,7 @@ virNWFilterIsAllowedChain(const char *chainname) } virBufferAsprintf(&buf, - _("Invalid chain name '%s'. Please use a chain name " - "called '%s' or any of the following prefixes: "), + _("Invalid chain name '%1$s'. Please use a chain name called '%2$s' or any of the following prefixes: "), chainname, virNWFilterChainSuffixTypeToString( VIR_NWFILTER_CHAINSUFFIX_ROOT)); @@ -2579,15 +2575,14 @@ virNWFilterDefParseXML(xmlXPathContextPtr ctxt) if (chain_pri_s) { if (virStrToLong_i(chain_pri_s, NULL, 10, &chain_priority) < 0) { virReportError(VIR_ERR_INVALID_ARG, - _("Could not parse chain priority '%s'"), + _("Could not parse chain priority '%1$s'"), chain_pri_s); return NULL; } if (chain_priority < NWFILTER_MIN_FILTER_PRIORITY || chain_priority > NWFILTER_MAX_FILTER_PRIORITY) { virReportError(VIR_ERR_INVALID_ARG, - _("Priority '%d' is outside valid " - "range of [%d,%d]"), + _("Priority '%1$d' is outside valid range of [%2$d,%3$d]"), chain_priority, NWFILTER_MIN_FILTER_PRIORITY, NWFILTER_MAX_FILTER_PRIORITY); @@ -2713,7 +2708,7 @@ virNWFilterDeleteDef(const char *configDir, if (unlink(configFile) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("cannot remove config for %s"), + _("cannot remove config for %1$s"), def->name); return -1; } @@ -2792,7 +2787,7 @@ virNWFilterRuleDefDetailsFormat(virBuffer *buf, if (att[i].formatter && !(flags & NWFILTER_ENTRY_ITEM_FLAG_HAS_VAR)) { if (!att[i].formatter(buf, def, item)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("formatter for %s %s reported error"), + _("formatter for %1$s %2$s reported error"), type, att[i].name); return; diff --git a/src/conf/nwfilter_params.c b/src/conf/nwfilter_params.c index 92385a97e6..496ed2f0b8 100644 --- a/src/conf/nwfilter_params.c +++ b/src/conf/nwfilter_params.c @@ -338,7 +338,7 @@ virNWFilterVarCombIterAddVariable(virNWFilterVarCombIterEntry *cie, varValue = virHashLookup(hash, varName); if (varValue == NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not find value for variable '%s'"), + _("Could not find value for variable '%1$s'"), varName); return -1; } @@ -409,8 +409,8 @@ virNWFilterVarCombIterEntryAreUniqueEntries(virNWFilterVarCombIterEntry *cie, value = virNWFilterVarValueGetNthValue(varValue, cie->curValue); if (!value) { - VIR_ERROR(_("Lookup of value at index %u resulted in a NULL " - "pointer"), cie->curValue); + VIR_ERROR(_("Lookup of value at index %1$u resulted in a NULL pointer"), + cie->curValue); return true; } @@ -550,8 +550,8 @@ virNWFilterVarCombIterGetVarValue(virNWFilterVarCombIter *ci, iterIndex = virNWFilterVarCombIterGetIndexByIterId(ci, iterId); if (iterIndex < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not get iterator index for " - "iterator ID %u"), iterId); + _("Could not get iterator index for iterator ID %1$u"), + iterId); return NULL; } break; @@ -560,8 +560,8 @@ virNWFilterVarCombIterGetVarValue(virNWFilterVarCombIter *ci, iterIndex = virNWFilterVarCombIterGetIndexByIterId(ci, iterId); if (iterIndex < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not get iterator index for " - "(internal) iterator ID %u"), iterId); + _("Could not get iterator index for (internal) iterator ID %1$u"), + iterId); return NULL; } break; @@ -578,7 +578,7 @@ virNWFilterVarCombIterGetVarValue(virNWFilterVarCombIter *ci, if (!found) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not find variable '%s' in iterator"), + _("Could not find variable '%1$s' in iterator"), varName); return NULL; } @@ -586,7 +586,7 @@ virNWFilterVarCombIterGetVarValue(virNWFilterVarCombIter *ci, value = virHashLookup(ci->hashTable, varName); if (!value) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not find value for variable '%s'"), + _("Could not find value for variable '%1$s'"), varName); return NULL; } @@ -594,8 +594,7 @@ virNWFilterVarCombIterGetVarValue(virNWFilterVarCombIter *ci, res = virNWFilterVarValueGetNthValue(value, ci->iter[iterIndex].curValue); if (!res) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not get nth (%u) value of " - "variable '%s'"), + _("Could not get nth (%1$u) value of variable '%2$s'"), ci->iter[iterIndex].curValue, varName); return NULL; } @@ -877,8 +876,8 @@ virNWFilterVarAccessParse(const char *varAccess) case VIR_NWFILTER_VAR_ACCESS_ITERATOR: if (result > VIR_NWFILTER_MAX_ITERID) { virReportError(VIR_ERR_INVALID_ARG, - _("Iterator ID exceeds maximum ID " - "of %u"), VIR_NWFILTER_MAX_ITERID); + _("Iterator ID exceeds maximum ID of %1$u"), + VIR_NWFILTER_MAX_ITERID); goto err_exit; } dest->u.iterId = result; diff --git a/src/conf/object_event.c b/src/conf/object_event.c index 62bbfb33bc..5fb96cb7aa 100644 --- a/src/conf/object_event.c +++ b/src/conf/object_event.c @@ -254,7 +254,7 @@ virObjectEventCallbackListRemoveID(virConnectPtr conn, } virReportError(VIR_ERR_INVALID_ARG, - _("could not find event callback %d for deletion"), + _("could not find event callback %1$d for deletion"), callbackID); return -1; } @@ -281,7 +281,7 @@ virObjectEventCallbackListMarkDeleteID(virConnectPtr conn, } virReportError(VIR_ERR_INVALID_ARG, - _("could not find event callback %d for deletion"), + _("could not find event callback %1$d for deletion"), callbackID); return -1; } @@ -596,7 +596,7 @@ virObjectEventNew(virClass *klass, if (!virClassIsDerivedFrom(klass, virObjectEventClass)) { virReportInvalidArg(klass, - _("Class %s must derive from virObjectEvent"), + _("Class %1$s must derive from virObjectEvent"), virClassName(klass)); return NULL; } @@ -973,7 +973,7 @@ virObjectEventStateCallbackID(virConnectPtr conn, if (ret < 0) virReportError(VIR_ERR_INVALID_ARG, - _("event callback function %p not registered"), + _("event callback function %1$p not registered"), callback); return ret; } @@ -1021,7 +1021,7 @@ virObjectEventStateEventID(virConnectPtr conn, if (ret < 0) virReportError(VIR_ERR_INVALID_ARG, - _("event callback id %d not registered"), + _("event callback id %1$d not registered"), callbackID); return ret; } diff --git a/src/conf/secret_conf.c b/src/conf/secret_conf.c index 629a4a57f7..7463185eb1 100644 --- a/src/conf/secret_conf.c +++ b/src/conf/secret_conf.c @@ -61,7 +61,7 @@ virSecretDefParseUsage(xmlXPathContextPtr ctxt, type = virSecretUsageTypeFromString(type_str); if (type < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown secret usage type %s"), type_str); + _("unknown secret usage type %1$s"), type_str); return -1; } def->usage_type = type; @@ -116,7 +116,7 @@ virSecretDefParseUsage(xmlXPathContextPtr ctxt, default: virReportError(VIR_ERR_INTERNAL_ERROR, - _("unexpected secret usage type %d"), + _("unexpected secret usage type %1$d"), def->usage_type); return -1; } @@ -200,7 +200,7 @@ virSecretDefFormatUsage(virBuffer *buf, type = virSecretUsageTypeToString(def->usage_type); if (type == NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unexpected secret usage type %d"), + _("unexpected secret usage type %1$d"), def->usage_type); return -1; } @@ -232,7 +232,7 @@ virSecretDefFormatUsage(virBuffer *buf, default: virReportError(VIR_ERR_INTERNAL_ERROR, - _("unexpected secret usage type %d"), + _("unexpected secret usage type %1$d"), def->usage_type); return -1; } diff --git a/src/conf/snapshot_conf.c b/src/conf/snapshot_conf.c index 9bf3c78353..0acba95d7f 100644 --- a/src/conf/snapshot_conf.c +++ b/src/conf/snapshot_conf.c @@ -153,7 +153,7 @@ virDomainSnapshotDiskDefParseXML(xmlNodePtr node, if (src->type == VIR_STORAGE_TYPE_VOLUME || src->type == VIR_STORAGE_TYPE_DIR) { virReportError(VIR_ERR_XML_ERROR, - _("unsupported disk snapshot type '%s'"), + _("unsupported disk snapshot type '%1$s'"), virStorageTypeToString(src->type)); return -1; } @@ -170,7 +170,7 @@ virDomainSnapshotDiskDefParseXML(xmlNodePtr node, if ((driver = virXPathString("string(./driver/@type)", ctxt)) && (src->format = virStorageFileFormatTypeFromString(driver)) <= 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown disk snapshot driver '%s'"), driver); + _("unknown disk snapshot driver '%1$s'"), driver); return -1; } @@ -183,7 +183,7 @@ virDomainSnapshotDiskDefParseXML(xmlNodePtr node, /* validate that the passed path is absolute */ if (virStorageSourceIsRelative(src)) { virReportError(VIR_ERR_XML_ERROR, - _("disk snapshot image path '%s' must be absolute"), + _("disk snapshot image path '%1$s' must be absolute"), src->path); return -1; } @@ -259,7 +259,7 @@ virDomainSnapshotDefParse(xmlXPathContextPtr ctxt, def->state = virDomainSnapshotStateTypeFromString(state); if (def->state <= 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Invalid state '%s' in domain snapshot XML"), + _("Invalid state '%1$s' in domain snapshot XML"), state); return NULL; } @@ -336,7 +336,7 @@ virDomainSnapshotDefParse(xmlXPathContextPtr ctxt, if (def->memorysnapshotfile && def->memory != VIR_DOMAIN_SNAPSHOT_LOCATION_EXTERNAL) { virReportError(VIR_ERR_XML_ERROR, - _("memory filename '%s' requires external snapshot"), + _("memory filename '%1$s' requires external snapshot"), def->memorysnapshotfile); return NULL; } @@ -360,7 +360,7 @@ virDomainSnapshotDefParse(xmlXPathContextPtr ctxt, /* verify that memory path is absolute */ if (def->memorysnapshotfile && !g_path_is_absolute(def->memorysnapshotfile)) { virReportError(VIR_ERR_XML_ERROR, - _("memory snapshot file path (%s) must be absolute"), + _("memory snapshot file path (%1$s) must be absolute"), def->memorysnapshotfile); return NULL; } @@ -434,8 +434,7 @@ virDomainSnapshotRedefineValidate(virDomainSnapshotDef *def, if ((flags & VIR_DOMAIN_SNAPSHOT_CREATE_DISK_ONLY) && def->state != VIR_DOMAIN_SNAPSHOT_DISK_SNAPSHOT) { virReportError(VIR_ERR_INVALID_ARG, - _("disk-only flag for snapshot %s requires " - "disk-snapshot state"), + _("disk-only flag for snapshot %1$s requires disk-snapshot state"), def->parent.name); return -1; } @@ -445,7 +444,7 @@ virDomainSnapshotRedefineValidate(virDomainSnapshotDef *def, virUUIDFormat(domain_uuid, uuidstr); virReportError(VIR_ERR_INVALID_ARG, - _("definition for snapshot %s must use uuid %s"), + _("definition for snapshot %1$s must use uuid %2$s"), def->parent.name, uuidstr); return -1; } @@ -458,8 +457,7 @@ virDomainSnapshotRedefineValidate(virDomainSnapshotDef *def, (def->state == VIR_DOMAIN_SNAPSHOT_RUNNING || def->state == VIR_DOMAIN_SNAPSHOT_PAUSED)) { virReportError(VIR_ERR_INVALID_ARG, - _("cannot change between online and offline " - "snapshot state in snapshot %s"), + _("cannot change between online and offline snapshot state in snapshot %1$s"), def->parent.name); return -1; } @@ -467,8 +465,7 @@ virDomainSnapshotRedefineValidate(virDomainSnapshotDef *def, if ((otherdef->state == VIR_DOMAIN_SNAPSHOT_DISK_SNAPSHOT) != (def->state == VIR_DOMAIN_SNAPSHOT_DISK_SNAPSHOT)) { virReportError(VIR_ERR_INVALID_ARG, - _("cannot change between disk only and " - "full system in snapshot %s"), + _("cannot change between disk only and full system in snapshot %1$s"), def->parent.name); return -1; } @@ -512,25 +509,21 @@ virDomainSnapshotDefAssignExternalNames(virDomainSnapshotDef *def) if (disk->src->type != VIR_STORAGE_TYPE_FILE) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("cannot generate external snapshot name " - "for disk '%s' on a '%s' device"), + _("cannot generate external snapshot name for disk '%1$s' on a '%2$s' device"), disk->name, virStorageTypeToString(disk->src->type)); return -1; } if (!(origpath = virDomainDiskGetSource(def->parent.dom->disks[i]))) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("cannot generate external snapshot name " - "for disk '%s' without source"), + _("cannot generate external snapshot name for disk '%1$s' without source"), disk->name); return -1; } if (stat(origpath, &sb) < 0 || !S_ISREG(sb.st_mode)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("source for disk '%s' is not a regular " - "file; refusing to generate external " - "snapshot name"), + _("source for disk '%1$s' is not a regular file; refusing to generate external snapshot name"), disk->name); return -1; } @@ -549,8 +542,7 @@ virDomainSnapshotDefAssignExternalNames(virDomainSnapshotDef *def) for (j = 0; j < i; j++) { if (STREQ_NULLABLE(disk->src->path, def->disks[j].src->path)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("cannot generate external snapshot name for " - "disk '%s': collision with disk '%s'"), + _("cannot generate external snapshot name for disk '%1$s': collision with disk '%2$s'"), disk->name, def->disks[j].name); return -1; } @@ -637,13 +629,13 @@ virDomainSnapshotAlignDisks(virDomainSnapshotDef *snapdef, if (!domdisk) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("no disk named '%s'"), snapdisk->name); + _("no disk named '%1$s'"), snapdisk->name); return -1; } if (virHashHasEntry(map, domdisk->dst)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("disk '%s' specified twice"), + _("disk '%1$s' specified twice"), snapdisk->name); return -1; } @@ -664,7 +656,7 @@ virDomainSnapshotAlignDisks(virDomainSnapshotDef *snapdef, !(snapdisk->snapshot == VIR_DOMAIN_SNAPSHOT_LOCATION_NO && domdisk->snapshot == VIR_DOMAIN_SNAPSHOT_LOCATION_NO)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("disk '%s' must use snapshot mode '%s'"), + _("disk '%1$s' must use snapshot mode '%2$s'"), snapdisk->name, virDomainSnapshotLocationTypeToString(default_snapshot)); return -1; @@ -673,8 +665,7 @@ virDomainSnapshotAlignDisks(virDomainSnapshotDef *snapdef, if (snapdisk->src->path && snapdisk->snapshot != VIR_DOMAIN_SNAPSHOT_LOCATION_EXTERNAL) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("file '%s' for disk '%s' requires " - "use of external snapshot mode"), + _("file '%1$s' for disk '%2$s' requires use of external snapshot mode"), snapdisk->src->path, snapdisk->name); return -1; } diff --git a/src/conf/storage_adapter_conf.c b/src/conf/storage_adapter_conf.c index 4c13cc4c17..2a8a1a3eb5 100644 --- a/src/conf/storage_adapter_conf.c +++ b/src/conf/storage_adapter_conf.c @@ -208,16 +208,14 @@ virStorageAdapterValidateFCHost(virStorageAdapterFCHost *fchost) if ((fchost->parent_wwnn && !fchost->parent_wwpn)) { virReportError(VIR_ERR_XML_ERROR, - _("when providing parent_wwnn='%s', the " - "parent_wwpn must also be provided"), + _("when providing parent_wwnn='%1$s', the parent_wwpn must also be provided"), fchost->parent_wwnn); return -1; } if (!fchost->parent_wwnn && fchost->parent_wwpn) { virReportError(VIR_ERR_XML_ERROR, - _("when providing parent_wwpn='%s', the " - "parent_wwnn must also be provided"), + _("when providing parent_wwpn='%1$s', the parent_wwnn must also be provided"), fchost->parent_wwpn); return -1; } diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index f5a9636ce2..3e584ad9b9 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -309,7 +309,7 @@ virStoragePoolTypeInfoLookup(int type) return &poolTypeInfo[i]; virReportError(VIR_ERR_INTERNAL_ERROR, - _("missing backend for pool type %d"), type); + _("missing backend for pool type %1$d"), type); return NULL; } @@ -554,7 +554,7 @@ virStoragePoolDefParseSource(xmlXPathContextPtr ctxt, if (source->format < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown pool format type %s"), format); + _("unknown pool format type %1$s"), format); return -1; } } @@ -638,15 +638,14 @@ virStoragePoolDefParseSource(xmlXPathContextPtr ctxt, if ((source->format != VIR_STORAGE_POOL_NETFS_NFS) && (source->format != VIR_STORAGE_POOL_NETFS_AUTO)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("storage pool protocol ver unsupported for " - "pool type '%s'"), + _("storage pool protocol ver unsupported for pool type '%1$s'"), virStoragePoolFormatFileSystemNetTypeToString(source->format)); return -1; } if (strchr(source->protocolVer, ',')) { virReportError(VIR_ERR_XML_DETAIL, - _("storage pool protocol ver '%s' must not contain ','"), + _("storage pool protocol ver '%1$s' must not contain ','"), source->protocolVer); return -1; } @@ -766,7 +765,7 @@ virStoragePoolDefRefreshParse(xmlXPathContextPtr ctxt, if ((tmp = virStorageVolDefRefreshAllocationTypeFromString(allocation)) < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown storage pool volume refresh allocation type %s"), + _("unknown storage pool volume refresh allocation type %1$s"), allocation); return -1; } @@ -865,7 +864,7 @@ virStoragePoolDefParseXML(xmlXPathContextPtr ctxt) if (strchr(def->name, '/')) { virReportError(VIR_ERR_XML_ERROR, - _("name %s cannot contain '/'"), def->name); + _("name %1$s cannot contain '/'"), def->name); return NULL; } @@ -1052,7 +1051,7 @@ virStoragePoolSourceFormat(virBuffer *buf, const char *format = (options->formatToString)(src->format); if (!format) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unknown pool format number %d"), + _("unknown pool format number %1$d"), src->format); return -1; } @@ -1275,7 +1274,7 @@ virStorageVolDefParseXML(virStoragePoolDef *pool, if (type) { if ((def->type = virStorageVolTypeFromString(type)) < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown volume type '%s'"), type); + _("unknown volume type '%1$s'"), type); return NULL; } } @@ -1296,7 +1295,7 @@ virStorageVolDefParseXML(virStoragePoolDef *pool, if (def->target.backingStore->format < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown volume format type %s"), format); + _("unknown volume format type %1$s"), format); return NULL; } } @@ -1342,7 +1341,7 @@ virStorageVolDefParseXML(virStoragePoolDef *pool, if (def->target.format < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown volume format type %s"), format); + _("unknown volume format type %1$s"), format); return NULL; } } @@ -1386,7 +1385,8 @@ virStorageVolDefParseXML(virStoragePoolDef *pool, int f = virStorageFileFeatureTypeFromString((const char*)nodes[i]->name); if (f < 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unsupported feature %s"), + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unsupported feature %1$s"), (const char*)nodes[i]->name); return NULL; } @@ -1446,7 +1446,7 @@ virStorageVolTargetDefFormat(virStorageVolOptions *options, const char *format = (options->formatToString)(def->format); if (!format) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unknown volume format number %d"), + _("unknown volume format number %1$d"), def->format); return -1; } diff --git a/src/conf/storage_encryption_conf.c b/src/conf/storage_encryption_conf.c index 3651ff8cfd..91fe30edf6 100644 --- a/src/conf/storage_encryption_conf.c +++ b/src/conf/storage_encryption_conf.c @@ -159,7 +159,7 @@ virStorageEncryptionSecretParse(xmlXPathContextPtr ctxt, if ((ret->type = virStorageEncryptionSecretTypeFromString(type_str)) < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown volume encryption secret type %s"), + _("unknown volume encryption secret type %1$s"), type_str); goto cleanup; } @@ -237,7 +237,7 @@ virStorageEncryptionParseNode(xmlNodePtr node, if ((encdef->format = virStorageEncryptionFormatTypeFromString(format_str)) < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown volume encryption format type %s"), + _("unknown volume encryption format type %1$s"), format_str); goto cleanup; } diff --git a/src/conf/storage_source_conf.c b/src/conf/storage_source_conf.c index 58009fd06e..99061e4df7 100644 --- a/src/conf/storage_source_conf.c +++ b/src/conf/storage_source_conf.c @@ -259,7 +259,7 @@ virStorageAuthDefParse(xmlNodePtr node, */ if ((authdef->authType = virStorageAuthTypeFromString(authtype)) < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown auth type '%s'"), authtype); + _("unknown auth type '%1$s'"), authtype); return NULL; } } @@ -360,14 +360,14 @@ virStoragePRDefParseXML(xmlXPathContextPtr ctxt) if (type && STRNEQ(type, "unix")) { virReportError(VIR_ERR_XML_ERROR, - _("unsupported connection type for <reservations/>: %s"), + _("unsupported connection type for <reservations/>: %1$s"), type); goto cleanup; } if (mode && STRNEQ(mode, "client")) { virReportError(VIR_ERR_XML_ERROR, - _("unsupported connection mode for <reservations/>: %s"), + _("unsupported connection mode for <reservations/>: %1$s"), mode); goto cleanup; } @@ -648,7 +648,7 @@ virStorageSourceNetCookieValidate(virStorageNetCookieDef *def) if (virStringHasChars(def->name, virStorageSourceCookieValueInvalidChars) || virStringHasChars(def->name, virStorageSourceCookieNameInvalidChars)) { virReportError(VIR_ERR_XML_ERROR, - _("cookie name '%s' contains invalid characters"), + _("cookie name '%1$s' contains invalid characters"), def->name); return -1; } @@ -657,7 +657,7 @@ virStorageSourceNetCookieValidate(virStorageNetCookieDef *def) if (val[0] == '"') { if (val[len - 1] != '"') { virReportError(VIR_ERR_XML_ERROR, - _("value of cookie '%s' contains invalid characters"), + _("value of cookie '%1$s' contains invalid characters"), def->name); return -1; } @@ -669,7 +669,7 @@ virStorageSourceNetCookieValidate(virStorageNetCookieDef *def) /* check invalid characters in value */ if (virStringHasChars(checkval, virStorageSourceCookieValueInvalidChars)) { virReportError(VIR_ERR_XML_ERROR, - _("value of cookie '%s' contains invalid characters"), + _("value of cookie '%1$s' contains invalid characters"), def->name); return -1; } @@ -690,7 +690,8 @@ virStorageSourceNetCookiesValidate(virStorageSource *src) for (j = i + 1; j < src->ncookies; j++) { if (STREQ(src->cookies[i]->name, src->cookies[j]->name)) { - virReportError(VIR_ERR_XML_ERROR, _("duplicate cookie '%s'"), + virReportError(VIR_ERR_XML_ERROR, + _("duplicate cookie '%1$s'"), src->cookies[i]->name); return -1; } diff --git a/src/conf/virchrdev.c b/src/conf/virchrdev.c index 0ffd3db90a..acf1871d36 100644 --- a/src/conf/virchrdev.c +++ b/src/conf/virchrdev.c @@ -115,8 +115,7 @@ static int virChrdevLockFileCreate(const char *dev) if (virPidFileReadPathIfAlive(path, &pid, NULL) == 0 && pid >= 0) { /* the process exists, the lockfile is valid */ virReportError(VIR_ERR_OPERATION_FAILED, - _("Requested device '%s' is locked by " - "lock file '%s' held by process %lld"), + _("Requested device '%1$s' is locked by lock file '%2$s' held by process %3$lld"), dev, path, (long long) pid); return -1; } else { @@ -142,8 +141,7 @@ static int virChrdevLockFileCreate(const char *dev) return 0; } virReportSystemError(errno, - _("Couldn't create lock file for " - "device '%s' in path '%s'"), + _("Couldn't create lock file for device '%1$s' in path '%2$s'"), dev, path); return -1; } @@ -151,8 +149,7 @@ static int virChrdevLockFileCreate(const char *dev) /* write the pid to the file */ if (safewrite(lockfd, pidStr, strlen(pidStr)) < 0) { virReportSystemError(errno, - _("Couldn't write to lock file for " - "device '%s' in path '%s'"), + _("Couldn't write to lock file for device '%1$s' in path '%2$s'"), dev, path); unlink(path); return -1; @@ -340,7 +337,7 @@ int virChrdevOpen(virChrdevs *devs, break; default: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Unsupported device type '%s'"), + _("Unsupported device type '%1$s'"), virDomainChrTypeToString(source->type)); return -1; } @@ -405,7 +402,7 @@ int virChrdevOpen(virChrdevs *devs, break; default: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Unsupported device type '%s'"), + _("Unsupported device type '%1$s'"), virDomainChrTypeToString(source->type)); goto error; } diff --git a/src/conf/virdomainjob.c b/src/conf/virdomainjob.c index c4cbbe8f6d..2644a793f8 100644 --- a/src/conf/virdomainjob.c +++ b/src/conf/virdomainjob.c @@ -368,7 +368,7 @@ virDomainObjBeginJobInternal(virDomainObj *obj, virUUIDFormat(obj->def->uuid, uuidstr); virReportError(VIR_ERR_NO_DOMAIN, - _("no domain with matching uuid '%s' (%s)"), + _("no domain with matching uuid '%1$s' (%2$s)"), uuidstr, obj->def->name); goto cleanup; } @@ -461,18 +461,15 @@ virDomainObjBeginJobInternal(virDomainObj *obj, if (errno == ETIMEDOUT) { if (blocker && agentBlocker) { virReportError(VIR_ERR_OPERATION_TIMEOUT, - _("cannot acquire state change " - "lock (held by monitor=%s agent=%s)"), + _("cannot acquire state change lock (held by monitor=%1$s agent=%2$s)"), blocker, agentBlocker); } else if (blocker) { virReportError(VIR_ERR_OPERATION_TIMEOUT, - _("cannot acquire state change " - "lock (held by monitor=%s)"), + _("cannot acquire state change lock (held by monitor=%1$s)"), blocker); } else if (agentBlocker) { virReportError(VIR_ERR_OPERATION_TIMEOUT, - _("cannot acquire state change " - "lock (held by agent=%s)"), + _("cannot acquire state change lock (held by agent=%1$s)"), agentBlocker); } else { virReportError(VIR_ERR_OPERATION_TIMEOUT, "%s", @@ -483,21 +480,15 @@ virDomainObjBeginJobInternal(virDomainObj *obj, jobObj->jobsQueued > jobObj->maxQueuedJobs) { if (blocker && agentBlocker) { virReportError(VIR_ERR_OPERATION_FAILED, - _("cannot acquire state change " - "lock (held by monitor=%s agent=%s) " - "due to max_queued limit"), + _("cannot acquire state change lock (held by monitor=%1$s agent=%2$s) due to max_queued limit"), blocker, agentBlocker); } else if (blocker) { virReportError(VIR_ERR_OPERATION_FAILED, - _("cannot acquire state change " - "lock (held by monitor=%s) " - "due to max_queued limit"), + _("cannot acquire state change lock (held by monitor=%1$s) due to max_queued limit"), blocker); } else if (agentBlocker) { virReportError(VIR_ERR_OPERATION_FAILED, - _("cannot acquire state change " - "lock (held by agent=%s) " - "due to max_queued limit"), + _("cannot acquire state change lock (held by agent=%1$s) due to max_queued limit"), agentBlocker); } else { virReportError(VIR_ERR_OPERATION_FAILED, "%s", @@ -569,7 +560,7 @@ virDomainObjBeginNestedJob(virDomainObj *obj, { if (asyncJob != obj->job->asyncJob) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unexpected async job %d type expected %d"), + _("unexpected async job %1$d type expected %2$d"), asyncJob, obj->job->asyncJob); return -1; } diff --git a/src/conf/virdomainmomentobjlist.c b/src/conf/virdomainmomentobjlist.c index f19ec3319a..e5cdd9a141 100644 --- a/src/conf/virdomainmomentobjlist.c +++ b/src/conf/virdomainmomentobjlist.c @@ -235,7 +235,7 @@ virDomainMomentAssignDef(virDomainMomentObjList *moments, if (virHashLookup(moments->objs, def->name) != NULL) { virReportError(VIR_ERR_OPERATION_FAILED, - _("domain moment %s already exists"), + _("domain moment %1$s already exists"), def->name); return NULL; } @@ -539,21 +539,21 @@ virDomainMomentCheckCycles(virDomainMomentObjList *list, if (def->parent_name) { if (STREQ(def->name, def->parent_name)) { virReportError(VIR_ERR_INVALID_ARG, - _("cannot set moment %s as its own parent"), + _("cannot set moment %1$s as its own parent"), def->name); return -1; } other = virDomainMomentFindByName(list, def->parent_name); if (!other) { virReportError(VIR_ERR_INVALID_ARG, - _("parent %s for moment %s not found"), + _("parent %1$s for moment %2$s not found"), def->parent_name, def->name); return -1; } while (other->def->parent_name) { if (STREQ(other->def->parent_name, def->name)) { virReportError(VIR_ERR_INVALID_ARG, - _("parent %s would create cycle to %s"), + _("parent %1$s would create cycle to %2$s"), other->def->name, def->name); return -1; } diff --git a/src/conf/virdomainobjlist.c b/src/conf/virdomainobjlist.c index 13675acda5..6be5de5e2b 100644 --- a/src/conf/virdomainobjlist.c +++ b/src/conf/virdomainobjlist.c @@ -280,14 +280,14 @@ virDomainObjListAddLocked(virDomainObjList *doms, if ((vm = virDomainObjListFindByUUIDLocked(doms, (*def)->uuid))) { if (vm->removing) { virReportError(VIR_ERR_OPERATION_FAILED, - _("domain '%s' is already being removed"), + _("domain '%1$s' is already being removed"), vm->def->name); goto error; } else if (STRNEQ(vm->def->name, (*def)->name)) { /* UUID matches, but if names don't match, refuse it */ virUUIDFormat(vm->def->uuid, uuidstr); virReportError(VIR_ERR_OPERATION_FAILED, - _("domain '%s' is already defined with uuid %s"), + _("domain '%1$s' is already defined with uuid %2$s"), vm->def->name, uuidstr); goto error; } @@ -296,13 +296,13 @@ virDomainObjListAddLocked(virDomainObjList *doms, /* UUID & name match, but if VM is already active, refuse it */ if (virDomainObjIsActive(vm)) { virReportError(VIR_ERR_OPERATION_INVALID, - _("domain '%s' is already active"), + _("domain '%1$s' is already active"), vm->def->name); goto error; } if (!vm->persistent) { virReportError(VIR_ERR_OPERATION_INVALID, - _("domain '%s' is already being started"), + _("domain '%1$s' is already being started"), vm->def->name); goto error; } @@ -317,7 +317,7 @@ virDomainObjListAddLocked(virDomainObjList *doms, if ((vm = virDomainObjListFindByNameLocked(doms, (*def)->name))) { virUUIDFormat(vm->def->uuid, uuidstr); virReportError(VIR_ERR_OPERATION_FAILED, - _("domain '%s' already exists with uuid %s"), + _("domain '%1$s' already exists with uuid %2$s"), (*def)->name, uuidstr); goto error; } @@ -443,7 +443,7 @@ virDomainObjListRename(virDomainObjList *doms, if (virHashLookup(doms->objsName, new_name) != NULL) { virReportError(VIR_ERR_OPERATION_INVALID, - _("domain with name '%s' already exists"), + _("domain with name '%1$s' already exists"), new_name); goto cleanup; } @@ -539,7 +539,7 @@ virDomainObjListLoadStatus(virDomainObjList *doms, if (virHashLookup(doms->objs, uuidstr) != NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unexpected domain %s already exists"), + _("unexpected domain %1$s already exists"), obj->def->name); goto error; } @@ -608,7 +608,7 @@ virDomainObjListLoadAllConfigs(virDomainObjList *doms, dom->persistent = 1; virDomainObjEndAPI(&dom); } else { - VIR_ERROR(_("Failed to load config for domain '%s'"), entry->d_name); + VIR_ERROR(_("Failed to load config for domain '%1$s'"), entry->d_name); } } @@ -1007,7 +1007,7 @@ virDomainObjListConvert(virDomainObjList *domlist, virObjectRWUnlock(domlist); virReportError(VIR_ERR_NO_DOMAIN, - _("no domain with matching uuid '%s' (%s)"), + _("no domain with matching uuid '%1$s' (%2$s)"), uuidstr, dom->name); goto error; } diff --git a/src/conf/virnetworkobj.c b/src/conf/virnetworkobj.c index c75ecf3a04..1726fc381f 100644 --- a/src/conf/virnetworkobj.c +++ b/src/conf/virnetworkobj.c @@ -543,7 +543,7 @@ virNetworkObjAssignDefLocked(virNetworkObjList *nets, if (STRNEQ(obj->def->name, def->name)) { virUUIDFormat(obj->def->uuid, uuidstr); virReportError(VIR_ERR_OPERATION_FAILED, - _("network '%s' is already defined with uuid %s"), + _("network '%1$s' is already defined with uuid %2$s"), obj->def->name, uuidstr); goto cleanup; } @@ -552,7 +552,7 @@ virNetworkObjAssignDefLocked(virNetworkObjList *nets, /* UUID & name match, but if network is already active, refuse it */ if (virNetworkObjIsActive(obj)) { virReportError(VIR_ERR_OPERATION_INVALID, - _("network is already active as '%s'"), + _("network is already active as '%1$s'"), obj->def->name); goto cleanup; } @@ -566,7 +566,7 @@ virNetworkObjAssignDefLocked(virNetworkObjList *nets, virObjectLock(obj); virUUIDFormat(obj->def->uuid, uuidstr); virReportError(VIR_ERR_OPERATION_FAILED, - _("network '%s' already exists with uuid %s"), + _("network '%1$s' already exists with uuid %2$s"), def->name, uuidstr); goto cleanup; } @@ -862,8 +862,7 @@ virNetworkLoadState(virNetworkObjList *nets, if (STRNEQ(name, def->name)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Network config filename '%s'" - " does not match network name '%s'"), + _("Network config filename '%1$s' does not match network name '%2$s'"), configFile, def->name); return NULL; } @@ -888,7 +887,7 @@ virNetworkLoadState(virNetworkObjList *nets, if (floor_sum && virStrToLong_ull(floor_sum, NULL, 10, &floor_sum_val) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Malformed 'floor_sum' attribute: %s"), + _("Malformed 'floor_sum' attribute: %1$s"), floor_sum); return NULL; } @@ -902,7 +901,7 @@ virNetworkLoadState(virNetworkObjList *nets, int flag = virNetworkTaintTypeFromString(str); if (flag < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Unknown taint flag %s"), str); + _("Unknown taint flag %1$s"), str); return NULL; } /* Compute taint mask here. The network object does not @@ -961,8 +960,7 @@ virNetworkLoadConfig(virNetworkObjList *nets, if (STRNEQ(name, def->name)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Network config filename '%s'" - " does not match network name '%s'"), + _("Network config filename '%1$s' does not match network name '%2$s'"), configFile, def->name); return NULL; } @@ -1105,7 +1103,7 @@ virNetworkObjDeleteConfig(const char *configDir, if (unlink(configFile) < 0) { virReportSystemError(errno, - _("cannot remove config file '%s'"), + _("cannot remove config file '%1$s'"), configFile); return -1; } @@ -1565,7 +1563,7 @@ virNetworkObjAddPort(virNetworkObj *net, if (virHashLookup(net->ports, uuidstr)) { virReportError(VIR_ERR_NETWORK_PORT_EXIST, - _("Network port with UUID %s already exists"), + _("Network port with UUID %1$s already exists"), uuidstr); return -1; } @@ -1596,7 +1594,7 @@ virNetworkObjLookupPort(virNetworkObj *net, if (!(ret = virHashLookup(net->ports, uuidstr))) { virReportError(VIR_ERR_NO_NETWORK_PORT, - _("Network port with UUID %s does not exist"), + _("Network port with UUID %1$s does not exist"), uuidstr); return NULL; } @@ -1618,7 +1616,7 @@ virNetworkObjDeletePort(virNetworkObj *net, if (!(portdef = virHashLookup(net->ports, uuidstr))) { virReportError(VIR_ERR_NO_NETWORK_PORT, - _("Network port with UUID %s does not exist"), + _("Network port with UUID %1$s does not exist"), uuidstr); return -1; } diff --git a/src/conf/virnetworkportdef.c b/src/conf/virnetworkportdef.c index 37f5376976..fc06ef41d5 100644 --- a/src/conf/virnetworkportdef.c +++ b/src/conf/virnetworkportdef.c @@ -102,7 +102,7 @@ virNetworkPortDefParseXML(xmlXPathContextPtr ctxt) } if (virUUIDParse(uuid, def->uuid) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to parse UUID '%s'"), uuid); + _("Unable to parse UUID '%1$s'"), uuid); return NULL; } @@ -123,7 +123,7 @@ virNetworkPortDefParseXML(xmlXPathContextPtr ctxt) if (virUUIDParse(uuid, def->owneruuid) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to parse UUID '%s'"), uuid); + _("Unable to parse UUID '%1$s'"), uuid); return NULL; } @@ -143,7 +143,7 @@ virNetworkPortDefParseXML(xmlXPathContextPtr ctxt) } if (virMacAddrParse(mac, &def->mac) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to parse MAC '%s'"), mac); + _("Unable to parse MAC '%1$s'"), mac); return NULL; } @@ -196,8 +196,8 @@ virNetworkPortDefParseXML(xmlXPathContextPtr ctxt) (def->plug.bridge.macTableManager = virNetworkBridgeMACTableManagerTypeFromString(macmgr)) <= 0) { virReportError(VIR_ERR_XML_ERROR, - _("Invalid macTableManager setting '%s' " - "in network port"), macmgr); + _("Invalid macTableManager setting '%1$s' in network port"), + macmgr); return NULL; } break; @@ -213,7 +213,7 @@ virNetworkPortDefParseXML(xmlXPathContextPtr ctxt) (def->plug.direct.mode = virNetDevMacVLanModeTypeFromString(mode)) < 0) { virReportError(VIR_ERR_XML_ERROR, - _("Invalid mode setting '%s' in network port"), mode); + _("Invalid mode setting '%1$s' in network port"), mode); return NULL; } break; @@ -424,7 +424,7 @@ virNetworkPortDefDeleteStatus(virNetworkPortDef *def, if (unlink(path) < 0 && errno != ENOENT) { virReportSystemError(errno, - _("Unable to delete %s"), path); + _("Unable to delete %1$s"), path); return -1; } diff --git a/src/conf/virnodedeviceobj.c b/src/conf/virnodedeviceobj.c index 4c22484d11..cfef30d47e 100644 --- a/src/conf/virnodedeviceobj.c +++ b/src/conf/virnodedeviceobj.c @@ -554,8 +554,7 @@ virNodeDeviceFindFCParentHost(virNodeDeviceObj *obj) if (!cap) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Parent device %s is not capable " - "of vport operations"), + _("Parent device %1$s is not capable of vport operations"), obj->def->name); return -1; } @@ -574,7 +573,7 @@ virNodeDeviceObjListGetParentHostByParent(virNodeDeviceObjList *devs, if (!(obj = virNodeDeviceObjListFindByName(devs, parent_name))) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not find parent device for '%s'"), + _("Could not find parent device for '%1$s'"), dev_name); return -1; } @@ -599,7 +598,7 @@ virNodeDeviceObjListGetParentHostByWWNs(virNodeDeviceObjList *devs, if (!(obj = virNodeDeviceObjListFindByWWNs(devs, parent_wwnn, parent_wwpn))) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not find parent device for '%s'"), + _("Could not find parent device for '%1$s'"), dev_name); return -1; } @@ -622,7 +621,7 @@ virNodeDeviceObjListGetParentHostByFabricWWN(virNodeDeviceObjList *devs, if (!(obj = virNodeDeviceObjListFindByFabricWWN(devs, parent_fabric_wwn))) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not find parent device for '%s'"), + _("Could not find parent device for '%1$s'"), dev_name); return -1; } diff --git a/src/conf/virnwfilterbindingdef.c b/src/conf/virnwfilterbindingdef.c index 592731fc1b..423ed7a392 100644 --- a/src/conf/virnwfilterbindingdef.c +++ b/src/conf/virnwfilterbindingdef.c @@ -113,7 +113,7 @@ virNWFilterBindingDefParseXML(xmlXPathContextPtr ctxt) if (virUUIDParse(uuid, ret->owneruuid) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to parse UUID '%s'"), uuid); + _("Unable to parse UUID '%1$s'"), uuid); VIR_FREE(uuid); goto cleanup; } @@ -128,7 +128,7 @@ virNWFilterBindingDefParseXML(xmlXPathContextPtr ctxt) if (virMacAddrParse(mac, &ret->mac) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to parse MAC '%s'"), mac); + _("Unable to parse MAC '%1$s'"), mac); VIR_FREE(mac); goto cleanup; } diff --git a/src/conf/virnwfilterbindingobj.c b/src/conf/virnwfilterbindingobj.c index 862f825422..e0101a1086 100644 --- a/src/conf/virnwfilterbindingobj.c +++ b/src/conf/virnwfilterbindingobj.c @@ -159,7 +159,7 @@ virNWFilterBindingObjSave(const virNWFilterBindingObj *obj, if (g_mkdir_with_parents(statusDir, 0777) < 0) { virReportSystemError(errno, - _("cannot create config directory '%s'"), + _("cannot create config directory '%1$s'"), statusDir); return -1; } @@ -185,7 +185,7 @@ virNWFilterBindingObjDelete(const virNWFilterBindingObj *obj, if (unlink(filename) < 0 && errno != ENOENT) { virReportSystemError(errno, - _("Unable to remove status '%s' for nwfilter binding %s'"), + _("Unable to remove status '%1$s' for nwfilter binding %2$s'"), filename, obj->def->portdevname); return -1; } diff --git a/src/conf/virnwfilterbindingobjlist.c b/src/conf/virnwfilterbindingobjlist.c index a349f5c195..002f6e2245 100644 --- a/src/conf/virnwfilterbindingobjlist.c +++ b/src/conf/virnwfilterbindingobjlist.c @@ -169,11 +169,11 @@ virNWFilterBindingObjListAddLocked(virNWFilterBindingObjList *bindings, if (binding) { if (virNWFilterBindingObjGetRemoving(binding)) { virReportError(VIR_ERR_OPERATION_FAILED, - _("binding '%s' is already being removed"), + _("binding '%1$s' is already being removed"), def->portdevname); } else { virReportError(VIR_ERR_OPERATION_FAILED, - _("binding '%s' already exists"), + _("binding '%1$s' already exists"), def->portdevname); } goto error; @@ -272,7 +272,7 @@ virNWFilterBindingObjListLoadStatus(virNWFilterBindingObjList *bindings, def = virNWFilterBindingObjGetDef(obj); if (virHashLookup(bindings->objs, def->portdevname) != NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unexpected binding %s already exists"), + _("unexpected binding %1$s already exists"), def->portdevname); goto error; } @@ -321,7 +321,7 @@ virNWFilterBindingObjListLoadAllConfigs(virNWFilterBindingObjList *bindings, if (binding) virNWFilterBindingObjEndAPI(&binding); else - VIR_ERROR(_("Failed to load config for binding '%s'"), entry->d_name); + VIR_ERROR(_("Failed to load config for binding '%1$s'"), entry->d_name); } virObjectRWUnlock(bindings); diff --git a/src/conf/virnwfilterobj.c b/src/conf/virnwfilterobj.c index 2e75e90cf1..6456add593 100644 --- a/src/conf/virnwfilterobj.c +++ b/src/conf/virnwfilterobj.c @@ -190,13 +190,13 @@ virNWFilterObjListFindInstantiateFilter(virNWFilterObjList *nwfilters, if (!(obj = virNWFilterObjListFindByName(nwfilters, filtername))) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("referenced filter '%s' is missing"), filtername); + _("referenced filter '%1$s' is missing"), filtername); return NULL; } if (virNWFilterObjWantRemoved(obj)) { virReportError(VIR_ERR_NO_NWFILTER, - _("Filter '%s' is in use."), filtername); + _("Filter '%1$s' is in use."), filtername); virNWFilterObjUnlock(obj); return NULL; } @@ -305,8 +305,7 @@ virNWFilterObjListAssignDef(virNWFilterObjList *nwfilters, if (STRNEQ(def->name, objdef->name)) { virReportError(VIR_ERR_OPERATION_FAILED, - _("filter with same UUID but different name " - "('%s') already exists"), + _("filter with same UUID but different name ('%1$s') already exists"), objdef->name); virNWFilterObjUnlock(obj); return NULL; @@ -317,7 +316,7 @@ virNWFilterObjListAssignDef(virNWFilterObjList *nwfilters, objdef = obj->def; virUUIDFormat(objdef->uuid, uuidstr); virReportError(VIR_ERR_OPERATION_FAILED, - _("filter '%s' already exists with uuid %s"), + _("filter '%1$s' already exists with uuid %2$s"), def->name, uuidstr); virNWFilterObjUnlock(obj); return NULL; @@ -576,8 +575,7 @@ virNWFilterObjListLoadConfig(virNWFilterObjList *nwfilters, if (STRNEQ(name, def->name)) { virReportError(VIR_ERR_XML_ERROR, - _("network filter config filename '%s' " - "does not match name '%s'"), + _("network filter config filename '%1$s' does not match name '%2$s'"), configFile, def->name); goto error; } diff --git a/src/conf/virsecretobj.c b/src/conf/virsecretobj.c index 4929f74155..e0393e6cec 100644 --- a/src/conf/virsecretobj.c +++ b/src/conf/virsecretobj.c @@ -344,8 +344,7 @@ virSecretObjListAdd(virSecretObjList *secrets, if (STRNEQ_NULLABLE(objdef->usage_id, (*newdef)->usage_id)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("a secret with UUID %s is already defined for " - "use with %s"), + _("a secret with UUID %1$s is already defined for use with %2$s"), uuidstr, objdef->usage_id); goto cleanup; } @@ -371,8 +370,7 @@ virSecretObjListAdd(virSecretObjList *secrets, objdef = obj->def; virUUIDFormat(objdef->uuid, uuidstr); virReportError(VIR_ERR_INTERNAL_ERROR, - _("a secret with UUID %s already defined for " - "use with %s"), + _("a secret with UUID %1$s already defined for use with %2$s"), uuidstr, (*newdef)->usage_id); goto cleanup; } @@ -644,7 +642,7 @@ virSecretObjDeleteConfig(virSecretObj *obj) if (!def->isephemeral && unlink(obj->configFile) < 0 && errno != ENOENT) { - virReportSystemError(errno, _("cannot unlink '%s'"), + virReportSystemError(errno, _("cannot unlink '%1$s'"), obj->configFile); return -1; } @@ -725,7 +723,7 @@ virSecretObjGetValue(virSecretObj *obj) char uuidstr[VIR_UUID_STRING_BUFLEN]; virUUIDFormat(def->uuid, uuidstr); virReportError(VIR_ERR_NO_SECRET, - _("secret '%s' does not have a value"), uuidstr); + _("secret '%1$s' does not have a value"), uuidstr); return NULL; } @@ -799,7 +797,7 @@ virSecretLoadValidateUUID(virSecretDef *def, if (!virStringMatchesNameSuffix(file, uuidstr, ".xml")) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("<uuid> does not match secret file name '%s'"), + _("<uuid> does not match secret file name '%1$s'"), file); return -1; } @@ -820,20 +818,20 @@ virSecretLoadValue(virSecretObj *obj) ret = 0; goto cleanup; } - virReportSystemError(errno, _("cannot open '%s'"), + virReportSystemError(errno, _("cannot open '%1$s'"), obj->base64File); goto cleanup; } if (fstat(fd, &st) < 0) { - virReportSystemError(errno, _("cannot stat '%s'"), + virReportSystemError(errno, _("cannot stat '%1$s'"), obj->base64File); goto cleanup; } if ((size_t)st.st_size != st.st_size) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("'%s' file does not fit in memory"), + _("'%1$s' file does not fit in memory"), obj->base64File); goto cleanup; } @@ -841,7 +839,7 @@ virSecretLoadValue(virSecretObj *obj) contents = g_new0(char, st.st_size + 1); if (saferead(fd, contents, st.st_size) != st.st_size) { - virReportSystemError(errno, _("cannot read '%s'"), + virReportSystemError(errno, _("cannot read '%1$s'"), obj->base64File); goto cleanup; } @@ -914,7 +912,7 @@ virSecretLoadAllConfigs(virSecretObjList *secrets, continue; if (!(obj = virSecretLoad(secrets, de->d_name, path, configDir))) { - VIR_ERROR(_("Error reading secret: %s"), + VIR_ERROR(_("Error reading secret: %1$s"), virGetLastErrorMessage()); VIR_FREE(path); continue; diff --git a/src/conf/virstorageobj.c b/src/conf/virstorageobj.c index e6c187e80a..7010e97d61 100644 --- a/src/conf/virstorageobj.c +++ b/src/conf/virstorageobj.c @@ -1037,7 +1037,7 @@ virStoragePoolObjIsDuplicate(virStoragePoolObjList *pools, char uuidstr[VIR_UUID_STRING_BUFLEN]; virUUIDFormat(obj->def->uuid, uuidstr); virReportError(VIR_ERR_OPERATION_FAILED, - _("pool '%s' is already defined with uuid %s"), + _("pool '%1$s' is already defined with uuid %2$s"), obj->def->name, uuidstr); goto cleanup; } @@ -1046,14 +1046,14 @@ virStoragePoolObjIsDuplicate(virStoragePoolObjList *pools, /* UUID & name match, but if Pool is already active, refuse it */ if (virStoragePoolObjIsActive(obj)) { virReportError(VIR_ERR_OPERATION_INVALID, - _("pool is already active as '%s'"), + _("pool is already active as '%1$s'"), obj->def->name); goto cleanup; } if (virStoragePoolObjIsStarting(obj)) { virReportError(VIR_ERR_OPERATION_INVALID, - _("pool '%s' is starting up"), + _("pool '%1$s' is starting up"), obj->def->name); goto cleanup; } @@ -1071,7 +1071,7 @@ virStoragePoolObjIsDuplicate(virStoragePoolObjList *pools, virUUIDFormat(obj->def->uuid, uuidstr); virReportError(VIR_ERR_OPERATION_FAILED, - _("pool '%s' already exists with uuid %s"), + _("pool '%1$s' already exists with uuid %2$s"), def->name, uuidstr); goto cleanup; } @@ -1455,7 +1455,7 @@ virStoragePoolObjSourceFindDuplicate(virStoragePoolObjList *pools, if (obj) { virReportError(VIR_ERR_OPERATION_FAILED, - _("Storage source conflict with pool: '%s'"), + _("Storage source conflict with pool: '%1$s'"), obj->def->name); return -1; } @@ -1577,8 +1577,7 @@ virStoragePoolObjLoad(virStoragePoolObjList *pools, if (!virStringMatchesNameSuffix(file, def->name, ".xml")) { virReportError(VIR_ERR_XML_ERROR, - _("Storage pool config filename '%s' does " - "not match pool name '%s'"), + _("Storage pool config filename '%1$s' does not match pool name '%2$s'"), path, def->name); return NULL; } @@ -1630,8 +1629,7 @@ virStoragePoolObjLoadState(virStoragePoolObjList *pools, if (STRNEQ(name, def->name)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Storage pool state file '%s' does not match " - "pool name '%s'"), + _("Storage pool state file '%1$s' does not match pool name '%2$s'"), stateFile, def->name); return NULL; } @@ -1715,7 +1713,7 @@ virStoragePoolObjSaveDef(virStorageDriverState *driver, if (!obj->configFile) { if (g_mkdir_with_parents(driver->configDir, 0777) < 0) { virReportSystemError(errno, - _("cannot create config directory %s"), + _("cannot create config directory %1$s"), driver->configDir); return -1; } @@ -1741,13 +1739,13 @@ virStoragePoolObjDeleteDef(virStoragePoolObj *obj) { if (!obj->configFile) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("no config file for %s"), obj->def->name); + _("no config file for %1$s"), obj->def->name); return -1; } if (unlink(obj->configFile) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("cannot remove config for %s"), + _("cannot remove config for %1$s"), obj->def->name); return -1; } -- 2.39.2

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com&gt; --- src/esx/esx_driver.c | 106 ++++++++-------- src/esx/esx_network_driver.c | 21 ++-- src/esx/esx_storage_backend_iscsi.c | 6 +- src/esx/esx_storage_backend_vmfs.c | 32 ++--- src/esx/esx_storage_driver.c | 8 +- src/esx/esx_stream.c | 4 +- src/esx/esx_util.c | 29 ++--- src/esx/esx_vi.c | 189 ++++++++++++++-------------- src/esx/esx_vi_types.c | 48 ++++--- 9 files changed, 211 insertions(+), 232 deletions(-) diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index 9dc5489411..c86e1e7470 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -208,8 +208,8 @@ esxParseVMXFileName(const char *fileName, !(datastoreName = strtok_r(tmp, "/", &saveptr)) || !(directoryAndFileName = strtok_r(NULL, "", &saveptr))) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("File name '%s' doesn't have expected format " - "'/vmfs/volumes/<datastore>/<path>'"), fileName); + _("File name '%1$s' doesn't have expected format '/vmfs/volumes/<datastore>/<path>'"), + fileName); goto cleanup; } @@ -226,7 +226,7 @@ esxParseVMXFileName(const char *fileName, ret = 0; } else { virReportError(VIR_ERR_INTERNAL_ERROR, - _("File name '%s' refers to non-existing datastore '%s'"), + _("File name '%1$s' refers to non-existing datastore '%2$s'"), fileName, datastoreName); } goto cleanup; @@ -243,7 +243,7 @@ esxParseVMXFileName(const char *fileName, if (!*out) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not handle file name '%s'"), fileName); + _("Could not handle file name '%1$s'"), fileName); goto cleanup; } @@ -334,7 +334,7 @@ esxFormatVMXFileName(const char *fileName, void *opaque) tmpResult = g_strdup(fileName); } else { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not handle file name '%s'"), fileName); + _("Could not handle file name '%1$s'"), fileName); goto cleanup; } @@ -381,7 +381,7 @@ esxAutodetectSCSIControllerModel(virDomainDiskDef *def, int *model, if (!vmDiskFileInfo || !vmDiskFileInfo->controllerType) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not lookup controller model for '%s'"), src); + _("Could not lookup controller model for '%1$s'"), src); goto cleanup; } @@ -399,7 +399,7 @@ esxAutodetectSCSIControllerModel(virDomainDiskDef *def, int *model, *model = VIR_DOMAIN_CONTROLLER_MODEL_SCSI_VMPVSCSI; } else { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Found unexpected controller model '%s' for disk '%s'"), + _("Found unexpected controller model '%1$s' for disk '%2$s'"), vmDiskFileInfo->controllerType, src); goto cleanup; } @@ -462,10 +462,8 @@ esxSupportsLongMode(esxPrivate *priv) priv->supportsLongMode = esxVI_Boolean_False; } else { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Bit 29 (Long Mode) of HostSystem property " - "'hardware.cpuFeature[].edx' with value '%s' " - "has unexpected value '%c', expecting '0' " - "or '1'"), hostCpuIdInfo->edx, edxLongModeBit); + _("Bit 29 (Long Mode) of HostSystem property 'hardware.cpuFeature[].edx' with value '%1$s' has unexpected value '%2$c', expecting '0' or '1'"), + hostCpuIdInfo->edx, edxLongModeBit); goto cleanup; } @@ -637,7 +635,7 @@ esxConnectToHost(esxPrivate *priv, if (priv->host->productLine != expectedProductLine) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Expecting '%s' to be a %s host but found a %s host"), + _("Expecting '%1$s' to be a %2$s host but found a %3$s host"), conn->uri->server, esxVI_ProductLineToDisplayName(expectedProductLine), esxVI_ProductLineToDisplayName(priv->host->productLine)); @@ -720,7 +718,7 @@ esxConnectToVCenter(esxPrivate *priv, if (priv->vCenter->productLine != esxVI_ProductLine_VPX) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Expecting '%s' to be a %s host but found a %s host"), + _("Expecting '%1$s' to be a %2$s host but found a %3$s host"), hostname, esxVI_ProductLineToDisplayName(esxVI_ProductLine_VPX), esxVI_ProductLineToDisplayName(priv->vCenter->productLine)); @@ -867,9 +865,7 @@ esxConnectOpen(virConnectPtr conn, virConnectAuthPtr auth, if (potentialVCenterIPAddress && STRNEQ(vCenterIPAddress, potentialVCenterIPAddress)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("This host is managed by a vCenter with IP " - "address %s, but a mismatching vCenter '%s' " - "(%s) has been specified"), + _("This host is managed by a vCenter with IP address %1$s, but a mismatching vCenter '%2$s' (%3$s) has been specified"), potentialVCenterIPAddress, priv->parsedUri->vCenter, vCenterIPAddress); goto cleanup; @@ -1031,7 +1027,7 @@ esxConnectSupportsFeature(virConnectPtr conn, int feature) case VIR_DRV_FEATURE_NETWORK_UPDATE_HAS_CORRECT_ORDER: case VIR_DRV_FEATURE_FD_PASSING: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Global feature %d should have already been handled"), + _("Global feature %1$d should have already been handled"), feature); return -1; @@ -1258,7 +1254,7 @@ esxNodeGetInfo(virConnectPtr conn, virNodeInfoPtr nodeinfo) dynamicProperty->val->string[sizeof(nodeinfo->model) - 1] = '\0'; if (virStrcpyStatic(nodeinfo->model, dynamicProperty->val->string) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("CPU Model %s too long for destination"), + _("CPU Model %1$s too long for destination"), dynamicProperty->val->string); goto cleanup; } @@ -1338,7 +1334,7 @@ esxConnectListDomains(virConnectPtr conn, int *ids, int maxids) &ids[count]) < 0 || ids[count] <= 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to parse positive integer from '%s'"), + _("Failed to parse positive integer from '%1$s'"), virtualMachine->obj->value); goto cleanup; } @@ -1430,7 +1426,7 @@ esxDomainLookupByID(virConnectPtr conn, int id) } if (!domain) - virReportError(VIR_ERR_NO_DOMAIN, _("No domain with ID %d"), id); + virReportError(VIR_ERR_NO_DOMAIN, _("No domain with ID %1$d"), id); cleanup: esxVI_String_Free(&propertyNameList); @@ -1562,7 +1558,7 @@ esxDomainSuspend(virDomainPtr domain) } if (taskInfoState != esxVI_TaskInfoState_Success) { - virReportError(VIR_ERR_INTERNAL_ERROR, _("Could not suspend domain: %s"), + virReportError(VIR_ERR_INTERNAL_ERROR, _("Could not suspend domain: %1$s"), taskInfoErrorMessage); goto cleanup; } @@ -1617,7 +1613,7 @@ esxDomainResume(virDomainPtr domain) } if (taskInfoState != esxVI_TaskInfoState_Success) { - virReportError(VIR_ERR_INTERNAL_ERROR, _("Could not resume domain: %s"), + virReportError(VIR_ERR_INTERNAL_ERROR, _("Could not resume domain: %1$s"), taskInfoErrorMessage); goto cleanup; } @@ -1774,7 +1770,7 @@ esxDomainDestroyFlags(virDomainPtr domain, } if (taskInfoState != esxVI_TaskInfoState_Success) { - virReportError(VIR_ERR_INTERNAL_ERROR, _("Could not destroy domain: %s"), + virReportError(VIR_ERR_INTERNAL_ERROR, _("Could not destroy domain: %1$s"), taskInfoErrorMessage); goto cleanup; } @@ -1835,7 +1831,7 @@ esxDomainGetMaxMemory(virDomainPtr domain) if (dynamicProperty->val->int32 < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Got invalid memory size %d"), + _("Got invalid memory size %1$d"), dynamicProperty->val->int32); } else { memoryMB = dynamicProperty->val->int32; @@ -1907,7 +1903,7 @@ esxDomainSetMaxMemory(virDomainPtr domain, unsigned long memory) if (taskInfoState != esxVI_TaskInfoState_Success) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not set max-memory to %lu kilobytes: %s"), memory, + _("Could not set max-memory to %1$lu kilobytes: %2$s"), memory, taskInfoErrorMessage); goto cleanup; } @@ -1965,7 +1961,7 @@ esxDomainSetMemoryFlags(virDomainPtr domain, if (taskInfoState != esxVI_TaskInfoState_Success) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not set memory to %lu kilobytes: %s"), memory, + _("Could not set memory to %1$lu kilobytes: %2$s"), memory, taskInfoErrorMessage); goto cleanup; } @@ -2200,7 +2196,7 @@ esxDomainGetInfo(virDomainPtr domain, virDomainInfoPtr info) if (!perfEntityMetric) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("QueryPerf returned object with unexpected type '%s'"), + _("QueryPerf returned object with unexpected type '%1$s'"), esxVI_Type_ToString(perfEntityMetricBase->_type)); goto cleanup; } @@ -2210,7 +2206,7 @@ esxDomainGetInfo(virDomainPtr domain, virDomainInfoPtr info) if (!perfMetricIntSeries) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("QueryPerf returned object with unexpected type '%s'"), + _("QueryPerf returned object with unexpected type '%1$s'"), esxVI_Type_ToString(perfEntityMetric->value->_type)); goto cleanup; } @@ -2413,8 +2409,7 @@ esxDomainSetVcpusFlags(virDomainPtr domain, unsigned int nvcpus, if (nvcpus > maxVcpus) { virReportError(VIR_ERR_INVALID_ARG, - _("Requested number of virtual CPUs is greater than max " - "allowable number of virtual CPUs for the domain: %d > %d"), + _("Requested number of virtual CPUs is greater than max allowable number of virtual CPUs for the domain: %1$d > %2$d"), nvcpus, maxVcpus); return -1; } @@ -2440,7 +2435,7 @@ esxDomainSetVcpusFlags(virDomainPtr domain, unsigned int nvcpus, if (taskInfoState != esxVI_TaskInfoState_Success) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not set number of virtual CPUs to %d: %s"), nvcpus, + _("Could not set number of virtual CPUs to %1$d: %2$s"), nvcpus, taskInfoErrorMessage); goto cleanup; } @@ -2636,7 +2631,7 @@ esxConnectDomainXMLFromNative(virConnectPtr conn, const char *nativeFormat, if (STRNEQ(nativeFormat, VMX_CONFIG_FORMAT_ARGV)) { virReportError(VIR_ERR_INVALID_ARG, - _("Unsupported config format '%s'"), nativeFormat); + _("Unsupported config format '%1$s'"), nativeFormat); return NULL; } @@ -2679,7 +2674,7 @@ esxConnectDomainXMLToNative(virConnectPtr conn, const char *nativeFormat, if (STRNEQ(nativeFormat, VMX_CONFIG_FORMAT_ARGV)) { virReportError(VIR_ERR_INVALID_ARG, - _("Unsupported config format '%s'"), nativeFormat); + _("Unsupported config format '%1$s'"), nativeFormat); return NULL; } @@ -2837,7 +2832,7 @@ esxDomainCreateWithFlags(virDomainPtr domain, unsigned int flags) } if (taskInfoState != esxVI_TaskInfoState_Success) { - virReportError(VIR_ERR_INTERNAL_ERROR, _("Could not start domain: %s"), + virReportError(VIR_ERR_INTERNAL_ERROR, _("Could not start domain: %1$s"), taskInfoErrorMessage); goto cleanup; } @@ -2999,8 +2994,8 @@ esxDomainDefineXMLFlags(virConnectPtr conn, const char *xml, unsigned int flags) if (!virStringHasCaseSuffix(src, ".vmdk")) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Expecting source '%s' of first file-based harddisk to " - "be a VMDK image"), src); + _("Expecting source '%1$s' of first file-based harddisk to be a VMDK image"), + src); goto cleanup; } @@ -3056,7 +3051,7 @@ esxDomainDefineXMLFlags(virConnectPtr conn, const char *xml, unsigned int flags) } if (taskInfoState != esxVI_TaskInfoState_Success) { - virReportError(VIR_ERR_INTERNAL_ERROR, _("Could not define domain: %s"), + virReportError(VIR_ERR_INTERNAL_ERROR, _("Could not define domain: %1$s"), taskInfoErrorMessage); goto cleanup; } @@ -3522,8 +3517,8 @@ esxDomainSetSchedulerParametersFlags(virDomainPtr domain, if (params[i].value.l < 0) { virReportError(VIR_ERR_INVALID_ARG, - _("Could not set reservation to %lld MHz, expecting " - "positive value"), params[i].value.l); + _("Could not set reservation to %1$lld MHz, expecting positive value"), + params[i].value.l); goto cleanup; } @@ -3534,8 +3529,7 @@ esxDomainSetSchedulerParametersFlags(virDomainPtr domain, if (params[i].value.l < -1) { virReportError(VIR_ERR_INVALID_ARG, - _("Could not set limit to %lld MHz, expecting " - "positive value or -1 (unlimited)"), + _("Could not set limit to %1$lld MHz, expecting positive value or -1 (unlimited)"), params[i].value.l); goto cleanup; } @@ -3573,8 +3567,7 @@ esxDomainSetSchedulerParametersFlags(virDomainPtr domain, default: virReportError(VIR_ERR_INVALID_ARG, - _("Could not set shares to %d, expecting positive " - "value or -1 (low), -2 (normal) or -3 (high)"), + _("Could not set shares to %1$d, expecting positive value or -1 (low), -2 (normal) or -3 (high)"), params[i].value.i); goto cleanup; } @@ -3593,7 +3586,7 @@ esxDomainSetSchedulerParametersFlags(virDomainPtr domain, if (taskInfoState != esxVI_TaskInfoState_Success) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not change scheduler parameters: %s"), + _("Could not change scheduler parameters: %1$s"), taskInfoErrorMessage); goto cleanup; } @@ -3744,8 +3737,8 @@ esxDomainMigratePerform(virDomainPtr domain, */ if (eventList->fullFormattedMessage) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not migrate domain, validation reported a " - "problem: %s"), eventList->fullFormattedMessage); + _("Could not migrate domain, validation reported a problem: %1$s"), + eventList->fullFormattedMessage); } else { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Could not migrate domain, validation reported a " @@ -3770,8 +3763,7 @@ esxDomainMigratePerform(virDomainPtr domain, if (taskInfoState != esxVI_TaskInfoState_Success) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not migrate domain, migration task finished with " - "an error: %s"), + _("Could not migrate domain, migration task finished with an error: %1$s"), taskInfoErrorMessage); goto cleanup; } @@ -4024,7 +4016,7 @@ esxDomainSnapshotCreateXML(virDomainPtr domain, const char *xmlDesc, if (snapshotTree) { virReportError(VIR_ERR_OPERATION_INVALID, - _("Snapshot '%s' already exists"), def->parent.name); + _("Snapshot '%1$s' already exists"), def->parent.name); goto cleanup; } @@ -4041,7 +4033,7 @@ esxDomainSnapshotCreateXML(virDomainPtr domain, const char *xmlDesc, } if (taskInfoState != esxVI_TaskInfoState_Success) { - virReportError(VIR_ERR_INTERNAL_ERROR, _("Could not create snapshot: %s"), + virReportError(VIR_ERR_INTERNAL_ERROR, _("Could not create snapshot: %1$s"), taskInfoErrorMessage); goto cleanup; } @@ -4373,7 +4365,7 @@ esxDomainSnapshotGetParent(virDomainSnapshotPtr snapshot, unsigned int flags) if (!snapshotTreeParent) { virReportError(VIR_ERR_NO_DOMAIN_SNAPSHOT, - _("snapshot '%s' does not have a parent"), + _("snapshot '%1$s' does not have a parent"), snapshotTree->name); goto cleanup; } @@ -4517,7 +4509,7 @@ esxDomainRevertToSnapshot(virDomainSnapshotPtr snapshot, unsigned int flags) if (taskInfoState != esxVI_TaskInfoState_Success) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not revert to snapshot '%s': %s"), snapshot->name, + _("Could not revert to snapshot '%1$s': %2$s"), snapshot->name, taskInfoErrorMessage); goto cleanup; } @@ -4579,7 +4571,7 @@ esxDomainSnapshotDelete(virDomainSnapshotPtr snapshot, unsigned int flags) if (taskInfoState != esxVI_TaskInfoState_Success) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not delete snapshot '%s': %s"), snapshot->name, + _("Could not delete snapshot '%1$s': %2$s"), snapshot->name, taskInfoErrorMessage); goto cleanup; } @@ -4646,7 +4638,7 @@ esxDomainSetMemoryParameters(virDomainPtr domain, virTypedParameterPtr params, if (taskInfoState != esxVI_TaskInfoState_Success) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not change memory parameters: %s"), + _("Could not change memory parameters: %1$s"), taskInfoErrorMessage); goto cleanup; } @@ -4967,7 +4959,7 @@ esxDomainHasManagedSaveImage(virDomainPtr domain, unsigned int flags) if (!managedObjectReference) { virReportError(VIR_ERR_NO_DOMAIN, - _("Could not find domain with UUID '%s'"), + _("Could not find domain with UUID '%1$s'"), uuid_string); goto cleanup; } @@ -5084,7 +5076,7 @@ esxDomainInterfaceAddresses(virDomainPtr domain, virCheckFlags(0, -1); if (source != VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_AGENT) { virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, - _("Unknown IP address data source %d"), + _("Unknown IP address data source %1$d"), source); return -1; } @@ -5120,7 +5112,7 @@ esxDomainInterfaceAddresses(virDomainPtr domain, if (!guestNicInfoList) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Missing property '%s' in answer"), + _("Missing property '%1$s' in answer"), "guest.net"); goto cleanup; } diff --git a/src/esx/esx_network_driver.c b/src/esx/esx_network_driver.c index 1261b3f1fa..273147af40 100644 --- a/src/esx/esx_network_driver.c +++ b/src/esx/esx_network_driver.c @@ -148,7 +148,7 @@ esxNetworkLookupByUUID(virConnectPtr conn, const unsigned char *uuid) virUUIDFormat(uuid, uuid_string); virReportError(VIR_ERR_NO_NETWORK, - _("Could not find HostVirtualSwitch with UUID '%s'"), + _("Could not find HostVirtualSwitch with UUID '%1$s'"), uuid_string); goto cleanup; @@ -337,7 +337,7 @@ esxNetworkDefineXMLFlags(virConnectPtr conn, const char *xml, case VIR_NETWORK_FORWARD_PASSTHROUGH: case VIR_NETWORK_FORWARD_HOSTDEV: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Unsupported forward mode '%s'"), + _("Unsupported forward mode '%1$s'"), virNetworkForwardTypeToString(def->forward.type)); goto cleanup; @@ -357,7 +357,7 @@ esxNetworkDefineXMLFlags(virConnectPtr conn, const char *xml, hostPortGroup = hostPortGroup->_next) { if (STREQ(def->portGroups[i].name, hostPortGroup->spec->name)) { virReportError(VIR_ERR_NETWORK_EXIST, - _("HostPortGroup with name '%s' exists already"), + _("HostPortGroup with name '%1$s' exists already"), def->portGroups[i].name); goto cleanup; } @@ -390,8 +390,7 @@ esxNetworkDefineXMLFlags(virConnectPtr conn, const char *xml, if (def->forward.ifs[i].type != VIR_NETWORK_FORWARD_HOSTDEV_DEVICE_NETDEV) { virReportError(VIR_ERR_NO_SUPPORT, - _("unsupported device type in network %s " - "interface pool"), + _("unsupported device type in network %1$s interface pool"), def->name); goto cleanup; } @@ -412,7 +411,7 @@ esxNetworkDefineXMLFlags(virConnectPtr conn, const char *xml, if (! found) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not find PhysicalNic with name '%s'"), + _("Could not find PhysicalNic with name '%1$s'"), def->forward.ifs[i].device.dev); goto cleanup; } @@ -537,7 +536,7 @@ esxNetworkUndefine(virNetworkPtr network) hostPortGroupPort = hostPortGroupPort->_next) { if (STRNEQ(hostPortGroupPort->type, "virtualMachine")) { virReportError(VIR_ERR_OPERATION_INVALID, - _("Cannot undefine HostVirtualSwitch that has a '%s' port"), + _("Cannot undefine HostVirtualSwitch that has a '%1$s' port"), hostPortGroupPort->type); goto cleanup; } @@ -550,7 +549,7 @@ esxNetworkUndefine(virNetworkPtr network) if (! found) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not find HostPortGroup for key '%s'"), + _("Could not find HostPortGroup for key '%1$s'"), hostPortGroupKey->value); goto cleanup; } @@ -578,7 +577,7 @@ esxNetworkUndefine(virNetworkPtr network) if (! found) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not find HostPortGroup for key '%s'"), + _("Could not find HostPortGroup for key '%1$s'"), hostPortGroupKey->value); goto cleanup; } @@ -714,7 +713,7 @@ esxNetworkGetXMLDesc(virNetworkPtr network_, unsigned int flags) if (! found) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not find PhysicalNic with key '%s'"), + _("Could not find PhysicalNic with key '%1$s'"), physicalNicKey->value); goto cleanup; } @@ -787,7 +786,7 @@ esxNetworkGetXMLDesc(virNetworkPtr network_, unsigned int flags) if (! found) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not find HostPortGroup with key '%s'"), + _("Could not find HostPortGroup with key '%1$s'"), hostPortGroupKey->value); goto cleanup; } diff --git a/src/esx/esx_storage_backend_iscsi.c b/src/esx/esx_storage_backend_iscsi.c index 7be0444f1b..087365392b 100644 --- a/src/esx/esx_storage_backend_iscsi.c +++ b/src/esx/esx_storage_backend_iscsi.c @@ -320,7 +320,7 @@ esxStoragePoolGetXMLDesc(virStoragePoolPtr pool, unsigned int flags) if (!target) { /* pool not found */ virReportError(VIR_ERR_NO_STORAGE_POOL, - _("Could not find storage pool with name '%s'"), + _("Could not find storage pool with name '%1$s'"), pool->name); goto cleanup; } @@ -638,7 +638,7 @@ esxStorageVolGetInfo(virStorageVolPtr volume, if (!hostScsiDisk) { virReportError(VIR_ERR_NO_STORAGE_VOL, - _("Could not find volume with name: %s"), + _("Could not find volume with name: %1$s"), volume->name); goto cleanup; } @@ -693,7 +693,7 @@ esxStorageVolGetXMLDesc(virStorageVolPtr volume, if (!scsiLun) { virReportError(VIR_ERR_NO_STORAGE_VOL, - _("Could find volume with name: %s"), volume->name); + _("Could find volume with name: %1$s"), volume->name); goto cleanup; } diff --git a/src/esx/esx_storage_backend_vmfs.c b/src/esx/esx_storage_backend_vmfs.c index 4efcc2fc75..f00c7eec4e 100644 --- a/src/esx/esx_storage_backend_vmfs.c +++ b/src/esx/esx_storage_backend_vmfs.c @@ -522,7 +522,7 @@ esxStoragePoolGetXMLDesc(virStoragePoolPtr pool, unsigned int flags) def.source.format = VIR_STORAGE_POOL_NETFS_CIFS; } else { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Datastore has unexpected type '%s'"), + _("Datastore has unexpected type '%1$s'"), nasInfo->nas->type); goto cleanup; } @@ -877,15 +877,15 @@ esxStorageVolCreateXML(virStoragePoolPtr pool, if (!tmp || *def->name == '/' || tmp[1] == '\0') { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Volume name '%s' doesn't have expected format " - "'<directory>/<file>'"), def->name); + _("Volume name '%1$s' doesn't have expected format '<directory>/<file>'"), + def->name); goto cleanup; } if (!virStringHasCaseSuffix(def->name, ".vmdk")) { virReportError(VIR_ERR_NO_SUPPORT, - _("Volume name '%s' has unsupported suffix, " - "expecting '.vmdk'"), def->name); + _("Volume name '%1$s' has unsupported suffix, expecting '.vmdk'"), + def->name); goto cleanup; } @@ -980,7 +980,7 @@ esxStorageVolCreateXML(virStoragePoolPtr pool, if (taskInfoState != esxVI_TaskInfoState_Success) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not create volume: %s"), + _("Could not create volume: %1$s"), taskInfoErrorMessage); goto cleanup; } @@ -1002,7 +1002,7 @@ esxStorageVolCreateXML(virStoragePoolPtr pool, } } else { virReportError(VIR_ERR_NO_SUPPORT, - _("Creation of %s volumes is not supported"), + _("Creation of %1$s volumes is not supported"), virStorageFileFormatTypeToString(def->target.format)); goto cleanup; } @@ -1079,15 +1079,15 @@ esxStorageVolCreateXMLFrom(virStoragePoolPtr pool, if (!tmp || *def->name == '/' || tmp[1] == '\0') { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Volume name '%s' doesn't have expected format " - "'<directory>/<file>'"), def->name); + _("Volume name '%1$s' doesn't have expected format '<directory>/<file>'"), + def->name); goto cleanup; } if (!virStringHasCaseSuffix(def->name, ".vmdk")) { virReportError(VIR_ERR_NO_SUPPORT, - _("Volume name '%s' has unsupported suffix, " - "expecting '.vmdk'"), def->name); + _("Volume name '%1$s' has unsupported suffix, expecting '.vmdk'"), + def->name); goto cleanup; } @@ -1148,7 +1148,7 @@ esxStorageVolCreateXMLFrom(virStoragePoolPtr pool, } if (taskInfoState != esxVI_TaskInfoState_Success) { - virReportError(VIR_ERR_INTERNAL_ERROR, _("Could not copy volume: %s"), + virReportError(VIR_ERR_INTERNAL_ERROR, _("Could not copy volume: %1$s"), taskInfoErrorMessage); goto cleanup; } @@ -1170,7 +1170,7 @@ esxStorageVolCreateXMLFrom(virStoragePoolPtr pool, } } else { virReportError(VIR_ERR_NO_SUPPORT, - _("Creation of %s volumes is not supported"), + _("Creation of %1$s volumes is not supported"), virStorageFileFormatTypeToString(def->target.format)); goto cleanup; } @@ -1211,7 +1211,7 @@ esxStorageVolDelete(virStorageVolPtr volume, unsigned int flags) } if (taskInfoState != esxVI_TaskInfoState_Success) { - virReportError(VIR_ERR_INTERNAL_ERROR, _("Could not delete volume: %s"), + virReportError(VIR_ERR_INTERNAL_ERROR, _("Could not delete volume: %1$s"), taskInfoErrorMessage); goto cleanup; } @@ -1250,7 +1250,7 @@ esxStorageVolWipe(virStorageVolPtr volume, unsigned int flags) } if (taskInfoState != esxVI_TaskInfoState_Success) { - virReportError(VIR_ERR_INTERNAL_ERROR, _("Could not wipe volume: %s"), + virReportError(VIR_ERR_INTERNAL_ERROR, _("Could not wipe volume: %1$s"), taskInfoErrorMessage); goto cleanup; } @@ -1372,7 +1372,7 @@ esxStorageVolGetXMLDesc(virStorageVolPtr volume, def.target.format = VIR_STORAGE_FILE_RAW; } else { virReportError(VIR_ERR_INTERNAL_ERROR, - _("File '%s' has unknown type"), datastorePath); + _("File '%1$s' has unknown type"), datastorePath); goto cleanup; } diff --git a/src/esx/esx_storage_driver.c b/src/esx/esx_storage_driver.c index 7ce2efe855..085650f0fb 100644 --- a/src/esx/esx_storage_driver.c +++ b/src/esx/esx_storage_driver.c @@ -154,7 +154,7 @@ esxStoragePoolLookupByName(virConnectPtr conn, const char *name) } virReportError(VIR_ERR_NO_STORAGE_POOL, - _("Could not find storage pool with name '%s'"), name); + _("Could not find storage pool with name '%1$s'"), name); return NULL; } @@ -182,7 +182,7 @@ esxStoragePoolLookupByUUID(virConnectPtr conn, const unsigned char *uuid) virUUIDFormat(uuid, uuid_string); virReportError(VIR_ERR_NO_STORAGE_POOL, - _("Could not find storage pool with uuid '%s'"), + _("Could not find storage pool with uuid '%1$s'"), uuid_string); return NULL; @@ -349,7 +349,7 @@ esxStorageVolLookupByPath(virConnectPtr conn, const char *path) return backends[ISCSI]->storageVolLookupByPath(conn, path); } else { virReportError(VIR_ERR_INVALID_ARG, - _("Unexpected volume path format: %s"), path); + _("Unexpected volume path format: %1$s"), path); return NULL; } @@ -375,7 +375,7 @@ esxStorageVolLookupByKey(virConnectPtr conn, const char *key) } virReportError(VIR_ERR_NO_STORAGE_VOL, - _("Could not find storage volume with key '%s'"), + _("Could not find storage volume with key '%1$s'"), key); return NULL; diff --git a/src/esx/esx_stream.c b/src/esx/esx_stream.c index 85fef53339..1439940330 100644 --- a/src/esx/esx_stream.c +++ b/src/esx/esx_stream.c @@ -176,14 +176,14 @@ esxStreamTransfer(esxStreamPrivate *priv, bool blocking) if (status < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not complete transfer: %s (%d)"), + _("Could not complete transfer: %1$s (%2$d)"), curl_easy_strerror(errorCode), errorCode); return -1; } if (responseCode != 200 && responseCode != 206) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unexpected HTTP response code %lu"), + _("Unexpected HTTP response code %1$lu"), responseCode); return -1; } diff --git a/src/esx/esx_util.c b/src/esx/esx_util.c index 89d5517262..fbbf226555 100644 --- a/src/esx/esx_util.c +++ b/src/esx/esx_util.c @@ -59,8 +59,7 @@ esxUtil_ParseUri(esxUtil_ParsedUri **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; } @@ -72,8 +71,8 @@ esxUtil_ParseUri(esxUtil_ParsedUri **parsedUri, virURI *uri) if (virStrToLong_i(queryParam->value, NULL, 10, &noVerify) < 0 || (noVerify != 0 && noVerify != 1)) { virReportError(VIR_ERR_INVALID_ARG, - _("Query parameter 'no_verify' has unexpected value " - "'%s' (should be 0 or 1)"), queryParam->value); + _("Query parameter 'no_verify' has unexpected value '%1$s' (should be 0 or 1)"), + queryParam->value); goto cleanup; } @@ -82,8 +81,8 @@ esxUtil_ParseUri(esxUtil_ParsedUri **parsedUri, virURI *uri) if (virStrToLong_i(queryParam->value, NULL, 10, &autoAnswer) < 0 || (autoAnswer != 0 && autoAnswer != 1)) { virReportError(VIR_ERR_INVALID_ARG, - _("Query parameter 'auto_answer' has unexpected " - "value '%s' (should be 0 or 1)"), queryParam->value); + _("Query parameter 'auto_answer' has unexpected value '%1$s' (should be 0 or 1)"), + queryParam->value); goto cleanup; } @@ -108,8 +107,7 @@ esxUtil_ParseUri(esxUtil_ParsedUri **parsedUri, virURI *uri) *tmp = '\0'; virReportError(VIR_ERR_INVALID_ARG, - _("Query parameter 'proxy' contains unexpected " - "type '%s' (should be (http|socks(|4|4a|5))"), + _("Query parameter 'proxy' contains unexpected type '%1$s' (should be (http|socks(|4|4a|5))"), queryParam->value); goto cleanup; } else { @@ -133,8 +131,7 @@ esxUtil_ParseUri(esxUtil_ParsedUri **parsedUri, virURI *uri) (*parsedUri)->proxy_port < 1 || (*parsedUri)->proxy_port > 65535) { virReportError(VIR_ERR_INVALID_ARG, - _("Query parameter 'proxy' has unexpected " - "port value '%s' (should be [1..65535])"), + _("Query parameter 'proxy' has unexpected port value '%1$s' (should be [1..65535])"), tmp); goto cleanup; } @@ -223,8 +220,8 @@ esxUtil_ParseDatastorePath(const char *datastorePath, char **datastoreName, if (!(tmp = STRSKIP(copyOfDatastorePath, "[")) || *tmp == ']' || !(preliminaryDatastoreName = strtok_r(tmp, "]", &saveptr))) { virReportError(VIR_ERR_INVALID_ARG, - _("Datastore path '%s' doesn't have expected format " - "'[<datastore>] <path>'"), datastorePath); + _("Datastore path '%1$s' doesn't have expected format '[<datastore>] <path>'"), + datastorePath); goto cleanup; } @@ -291,14 +288,14 @@ esxUtil_ResolveHostname(const char *hostname, char **ipAddress) if (errcode != 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("IP address lookup for host '%s' failed: %s"), hostname, + _("IP address lookup for host '%1$s' failed: %2$s"), hostname, gai_strerror(errcode)); return -1; } if (!result) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("No IP address for host '%s' found: %s"), hostname, + _("No IP address for host '%1$s' found: %2$s"), hostname, gai_strerror(errcode)); return -1; } @@ -310,7 +307,7 @@ esxUtil_ResolveHostname(const char *hostname, char **ipAddress) if (errcode != 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Formatting IP address for host '%s' failed: %s"), hostname, + _("Formatting IP address for host '%1$s' failed: %2$s"), hostname, gai_strerror(errcode)); return -1; } @@ -329,7 +326,7 @@ esxUtil_ReformatUuid(const char *input, char *output) if (virUUIDParse(input, uuid) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not parse UUID from string '%s'"), + _("Could not parse UUID from string '%1$s'"), input); return -1; } diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index b56d84fc43..122e5bed2e 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -235,7 +235,7 @@ esxVI_CURL_Perform(esxVI_CURL *curl, const char *url) if (errorCode != CURLE_OK) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("curl_easy_perform() returned an error: %s (%d) : %s"), + _("curl_easy_perform() returned an error: %1$s (%2$d) : %3$s"), curl_easy_strerror(errorCode), errorCode, curl->error); return -1; } @@ -245,8 +245,8 @@ esxVI_CURL_Perform(esxVI_CURL *curl, const char *url) if (errorCode != CURLE_OK) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("curl_easy_getinfo(CURLINFO_RESPONSE_CODE) returned an " - "error: %s (%d) : %s"), curl_easy_strerror(errorCode), + _("curl_easy_getinfo(CURLINFO_RESPONSE_CODE) returned an error: %1$s (%2$d) : %3$s"), + curl_easy_strerror(errorCode), errorCode, curl->error); return -1; } @@ -264,13 +264,13 @@ esxVI_CURL_Perform(esxVI_CURL *curl, const char *url) if (errorCode != CURLE_OK) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("curl_easy_getinfo(CURLINFO_REDIRECT_URL) returned " - "an error: %s (%d) : %s"), + _("curl_easy_getinfo(CURLINFO_REDIRECT_URL) returned an error: %1$s (%2$d) : %3$s"), curl_easy_strerror(errorCode), errorCode, curl->error); } else { virReportError(VIR_ERR_INTERNAL_ERROR, - _("The server redirects from '%s' to '%s'"), url, + _("The server redirects from '%1$s' to '%2$s'"), + url, redirectUrl); } @@ -394,7 +394,7 @@ esxVI_CURL_Download(esxVI_CURL *curl, const char *url, char **content, return -1; } else if (responseCode != 200 && responseCode != 206) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("HTTP response code %d for download from '%s'"), + _("HTTP response code %1$d for download from '%2$s'"), responseCode, url); return -1; } @@ -434,7 +434,7 @@ esxVI_CURL_Upload(esxVI_CURL *curl, const char *url, const char *content) return -1; } else if (responseCode != 200 && responseCode != 201) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("HTTP response code %d for upload to '%s'"), + _("HTTP response code %1$d for upload to '%2$s'"), responseCode, url); return -1; } @@ -469,7 +469,7 @@ esxVI_SharedCURL_Lock(CURL *handle G_GNUC_UNUSED, curl_lock_data data, break; default: - VIR_ERROR(_("Trying to lock unknown SharedCURL lock %d"), (int)data); + VIR_ERROR(_("Trying to lock unknown SharedCURL lock %1$d"), (int)data); return; } @@ -497,7 +497,7 @@ esxVI_SharedCURL_Unlock(CURL *handle G_GNUC_UNUSED, curl_lock_data data, break; default: - VIR_ERROR(_("Trying to unlock unknown SharedCURL lock %d"), (int)data); + VIR_ERROR(_("Trying to unlock unknown SharedCURL lock %1$d"), (int)data); return; } @@ -717,7 +717,7 @@ esxVI_MultiCURL_Wait(esxVI_MultiCURL *multi, int *runningHandles) if (errorCode != CURLM_OK) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not wait for transfer: %s (%d)"), + _("Could not wait for transfer: %1$s (%2$d)"), curl_multi_strerror(errorCode), errorCode); return -1; } @@ -736,7 +736,7 @@ esxVI_MultiCURL_Perform(esxVI_MultiCURL *multi, int *runningHandles) if (errorCode != CURLM_OK) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not transfer data: %s (%d)"), + _("Could not transfer data: %1$s (%2$d)"), curl_multi_strerror(errorCode), errorCode); return -1; } @@ -851,22 +851,22 @@ esxVI_Context_Connect(esxVI_Context *ctx, const char *url, if (STRNEQ(ctx->service->about->apiType, "HostAgent") && STRNEQ(ctx->service->about->apiType, "VirtualCenter")) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Expecting VI API type 'HostAgent' or 'VirtualCenter' " - "but found '%s'"), ctx->service->about->apiType); + _("Expecting VI API type 'HostAgent' or 'VirtualCenter' but found '%1$s'"), + ctx->service->about->apiType); return -1; } if (virStringParseVersion(&ctx->apiVersion, ctx->service->about->apiVersion, true) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not parse VI API version '%s'"), + _("Could not parse VI API version '%1$s'"), ctx->service->about->apiVersion); return -1; } if (ctx->apiVersion < 1000000 * 2 + 1000 * 5 /* 2.5 */) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Minimum supported %s version is %s but found version '%s'"), + _("Minimum supported %1$s version is %2$s but found version '%3$s'"), "VI API", "2.5", ctx->service->about->apiVersion); return -1; } @@ -874,7 +874,7 @@ esxVI_Context_Connect(esxVI_Context *ctx, const char *url, if (virStringParseVersion(&ctx->productVersion, ctx->service->about->version, true) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not parse product version '%s'"), + _("Could not parse product version '%1$s'"), ctx->service->about->version); return -1; } @@ -882,7 +882,7 @@ esxVI_Context_Connect(esxVI_Context *ctx, const char *url, if (STREQ(ctx->service->about->productLineId, "gsx")) { if (ctx->productVersion < 1000000 * 2 + 1000 * 0 /* 2.0 */) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Minimum supported %s version is %s but found version '%s'"), + _("Minimum supported %1$s version is %2$s but found version '%3$s'"), esxVI_ProductLineToDisplayName(esxVI_ProductLine_GSX), "2.0", ctx->service->about->version); return -1; @@ -893,7 +893,7 @@ esxVI_Context_Connect(esxVI_Context *ctx, const char *url, STREQ(ctx->service->about->productLineId, "embeddedEsx")) { if (ctx->productVersion < 1000000 * 3 + 1000 * 5 /* 3.5 */) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Minimum supported %s version is %s but found version '%s'"), + _("Minimum supported %1$s version is %2$s but found version '%3$s'"), esxVI_ProductLineToDisplayName(esxVI_ProductLine_ESX), "3.5", ctx->service->about->version); return -1; @@ -903,7 +903,7 @@ esxVI_Context_Connect(esxVI_Context *ctx, const char *url, } else if (STREQ(ctx->service->about->productLineId, "vpx")) { if (ctx->productVersion < 1000000 * 2 + 1000 * 5 /* 2.5 */) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Minimum supported %s version is %s but found version '%s'"), + _("Minimum supported %1$s version is %2$s but found version '%3$s'"), esxVI_ProductLineToDisplayName(esxVI_ProductLine_VPX), "2.5", ctx->service->about->version); return -1; @@ -912,8 +912,7 @@ esxVI_Context_Connect(esxVI_Context *ctx, const char *url, ctx->productLine = esxVI_ProductLine_VPX; } else { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Expecting product 'gsx' or 'esx' or 'embeddedEsx' " - "or 'vpx' but found '%s'"), + _("Expecting product 'gsx' or 'esx' or 'embeddedEsx' or 'vpx' but found '%1$s'"), ctx->service->about->productLineId); return -1; } @@ -1000,7 +999,7 @@ esxVI_Context_LookupManagedObjectsByPath(esxVI_Context *ctx, const char *path) if (!item) { virReportError(VIR_ERR_INVALID_ARG, - _("Path '%s' does not specify a datacenter"), path); + _("Path '%1$s' does not specify a datacenter"), path); goto cleanup; } @@ -1041,7 +1040,7 @@ esxVI_Context_LookupManagedObjectsByPath(esxVI_Context *ctx, const char *path) if (!ctx->datacenter) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not find datacenter specified in '%s'"), path); + _("Could not find datacenter specified in '%1$s'"), path); goto cleanup; } @@ -1050,7 +1049,7 @@ esxVI_Context_LookupManagedObjectsByPath(esxVI_Context *ctx, const char *path) /* Lookup (Cluster)ComputeResource */ if (!item) { virReportError(VIR_ERR_INVALID_ARG, - _("Path '%s' does not specify a compute resource"), path); + _("Path '%1$s' does not specify a compute resource"), path); goto cleanup; } @@ -1095,7 +1094,7 @@ esxVI_Context_LookupManagedObjectsByPath(esxVI_Context *ctx, const char *path) if (!ctx->computeResource) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not find compute resource specified in '%s'"), + _("Could not find compute resource specified in '%1$s'"), path); goto cleanup; } @@ -1113,7 +1112,7 @@ esxVI_Context_LookupManagedObjectsByPath(esxVI_Context *ctx, const char *path) "ClusterComputeResource")) { if (!item) { virReportError(VIR_ERR_INVALID_ARG, - _("Path '%s' does not specify a host system"), path); + _("Path '%1$s' does not specify a host system"), path); goto cleanup; } @@ -1124,7 +1123,7 @@ esxVI_Context_LookupManagedObjectsByPath(esxVI_Context *ctx, const char *path) if (item) { virReportError(VIR_ERR_INVALID_ARG, - _("Path '%s' ends with an excess item"), path); + _("Path '%1$s' ends with an excess item"), path); goto cleanup; } @@ -1139,7 +1138,7 @@ esxVI_Context_LookupManagedObjectsByPath(esxVI_Context *ctx, const char *path) if (!ctx->hostSystem) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not find host system specified in '%s'"), path); + _("Could not find host system specified in '%1$s'"), path); goto cleanup; } @@ -1255,23 +1254,21 @@ esxVI_Context_Execute(esxVI_Context *ctx, const char *methodName, if (!(*response)->node) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("HTTP response code %d for call to '%s'. " - "Fault is unknown, XPath evaluation failed"), + _("HTTP response code %1$d for call to '%2$s'. Fault is unknown, XPath evaluation failed"), (*response)->responseCode, methodName); goto cleanup; } if (esxVI_Fault_Deserialize((*response)->node, &fault) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("HTTP response code %d for call to '%s'. " - "Fault is unknown, deserialization failed"), + _("HTTP response code %1$d for call to '%2$s'. Fault is unknown, deserialization failed"), (*response)->responseCode, methodName); goto cleanup; } virReportError(VIR_ERR_INTERNAL_ERROR, - _("HTTP response code %d for call to '%s'. " - "Fault: %s - %s"), (*response)->responseCode, + _("HTTP response code %1$d for call to '%2$s'. Fault: %3$s - %4$s"), + (*response)->responseCode, methodName, fault->faultcode, fault->faultstring); /* FIXME: Dump raw response until detail part gets deserialized */ @@ -1288,8 +1285,8 @@ esxVI_Context_Execute(esxVI_Context *ctx, const char *methodName, if (!responseNode) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("XPath evaluation of response for call to '%s' " - "failed"), methodName); + _("XPath evaluation of response for call to '%1$s' failed"), + methodName); goto cleanup; } @@ -1300,13 +1297,13 @@ esxVI_Context_Execute(esxVI_Context *ctx, const char *methodName, case esxVI_Occurrence_RequiredItem: if (!(*response)->node) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Call to '%s' returned an empty result, " - "expecting a non-empty result"), methodName); + _("Call to '%1$s' returned an empty result, expecting a non-empty result"), + methodName); goto cleanup; } else if ((*response)->node->next) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Call to '%s' returned a list, expecting " - "exactly one item"), methodName); + _("Call to '%1$s' returned a list, expecting exactly one item"), + methodName); goto cleanup; } @@ -1315,8 +1312,8 @@ esxVI_Context_Execute(esxVI_Context *ctx, const char *methodName, case esxVI_Occurrence_RequiredList: if (!(*response)->node) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Call to '%s' returned an empty result, " - "expecting a non-empty result"), methodName); + _("Call to '%1$s' returned an empty result, expecting a non-empty result"), + methodName); goto cleanup; } @@ -1326,8 +1323,8 @@ esxVI_Context_Execute(esxVI_Context *ctx, const char *methodName, if ((*response)->node && (*response)->node->next) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Call to '%s' returned a list, expecting " - "exactly one item"), methodName); + _("Call to '%1$s' returned a list, expecting exactly one item"), + methodName); goto cleanup; } @@ -1340,8 +1337,8 @@ esxVI_Context_Execute(esxVI_Context *ctx, const char *methodName, case esxVI_Occurrence_None: if ((*response)->node) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Call to '%s' returned something, expecting " - "an empty result"), methodName); + _("Call to '%1$s' returned something, expecting an empty result"), + methodName); goto cleanup; } @@ -1355,7 +1352,7 @@ esxVI_Context_Execute(esxVI_Context *ctx, const char *methodName, } } else { virReportError(VIR_ERR_HTTP_ERROR, - _("HTTP response code %d for call to '%s'"), + _("HTTP response code %1$d for call to '%2$s'"), (*response)->responseCode, methodName); goto cleanup; } @@ -1409,7 +1406,7 @@ esxVI_Enumeration_CastFromAnyType(const esxVI_Enumeration *enumeration, if (anyType->type != enumeration->type) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Expecting type '%s' but found '%s'"), + _("Expecting type '%1$s' but found '%2$s'"), esxVI_Type_ToString(enumeration->type), esxVI_AnyType_TypeToString(anyType)); return -1; @@ -1423,7 +1420,7 @@ esxVI_Enumeration_CastFromAnyType(const esxVI_Enumeration *enumeration, } virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unknown value '%s' for %s"), anyType->value, + _("Unknown value '%1$s' for %2$s"), anyType->value, esxVI_Type_ToString(enumeration->type)); return -1; @@ -1494,7 +1491,7 @@ esxVI_Enumeration_Deserialize(const esxVI_Enumeration *enumeration, } if (result < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, _("Unknown value '%s' for %s"), + virReportError(VIR_ERR_INTERNAL_ERROR, _("Unknown value '%1$s' for %2$s"), name, esxVI_Type_ToString(enumeration->type)); } @@ -1580,7 +1577,7 @@ esxVI_List_CastFromAnyType(esxVI_AnyType *anyType, esxVI_List **list, if (! STRPREFIX(anyType->other, "ArrayOf")) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Expecting type to begin with 'ArrayOf' but found '%s'"), + _("Expecting type to begin with 'ArrayOf' but found '%1$s'"), anyType->other); return -1; } @@ -1589,7 +1586,7 @@ esxVI_List_CastFromAnyType(esxVI_AnyType *anyType, esxVI_List **list, childNode = childNode->next) { if (childNode->type != XML_ELEMENT_NODE) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Wrong XML element type %d"), childNode->type); + _("Wrong XML element type %1$d"), childNode->type); goto cleanup; } @@ -1658,7 +1655,7 @@ esxVI_List_Deserialize(xmlNodePtr node, esxVI_List **list, for (; node; node = node->next) { if (node->type != XML_ELEMENT_NODE) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Wrong XML element type %d"), node->type); + _("Wrong XML element type %1$d"), node->type); goto failure; } @@ -1960,7 +1957,7 @@ esxVI_LookupObjectContentByType(esxVI_Context *ctx, objectSpec->selectSet = ctx->selectSet_folderToChildEntity; } else { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Invalid lookup of '%s' from '%s'"), + _("Invalid lookup of '%1$s' from '%2$s'"), type, root->type); goto cleanup; } @@ -1972,7 +1969,7 @@ esxVI_LookupObjectContentByType(esxVI_Context *ctx, objectSpec->selectSet = ctx->selectSet_computeResourceToParentToParent; } else { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Invalid lookup of '%s' from '%s'"), + _("Invalid lookup of '%1$s' from '%2$s'"), type, root->type); goto cleanup; } @@ -1986,7 +1983,7 @@ esxVI_LookupObjectContentByType(esxVI_Context *ctx, objectSpec->selectSet = ctx->selectSet_hostSystemToDatastore; } else { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Invalid lookup of '%s' from '%s'"), + _("Invalid lookup of '%1$s' from '%2$s'"), type, root->type); goto cleanup; } @@ -1995,13 +1992,13 @@ esxVI_LookupObjectContentByType(esxVI_Context *ctx, objectSpec->selectSet = ctx->selectSet_datacenterToNetwork; } else { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Invalid lookup of '%s' from '%s'"), + _("Invalid lookup of '%1$s' from '%2$s'"), type, root->type); goto cleanup; } } else { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Invalid lookup from '%s'"), root->type); + _("Invalid lookup from '%1$s'"), root->type); goto cleanup; } } @@ -2041,13 +2038,13 @@ esxVI_LookupObjectContentByType(esxVI_Context *ctx, case esxVI_Occurrence_RequiredItem: virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not lookup '%s' from '%s'"), + _("Could not lookup '%1$s' from '%2$s'"), type, root->type); break; case esxVI_Occurrence_RequiredList: virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not lookup '%s' list from '%s'"), + _("Could not lookup '%1$s' list from '%2$s'"), type, root->type); break; @@ -2106,8 +2103,8 @@ esxVI_GetManagedEntityStatus(esxVI_ObjectContent *objectContent, } virReportError(VIR_ERR_INTERNAL_ERROR, - _("Missing '%s' property while looking for " - "ManagedEntityStatus"), propertyName); + _("Missing '%1$s' property while looking for ManagedEntityStatus"), + propertyName); return -1; } @@ -2201,7 +2198,7 @@ esxVI_GetBoolean(esxVI_ObjectContent *objectContent, const char *propertyName, if (*value == esxVI_Boolean_Undefined && occurrence == esxVI_Occurrence_RequiredItem) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Missing '%s' property"), propertyName); + _("Missing '%1$s' property"), propertyName); return -1; } @@ -2230,7 +2227,7 @@ esxVI_GetInt(esxVI_ObjectContent *objectContent, const char *propertyName, if (!(*value) && occurrence == esxVI_Occurrence_RequiredItem) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Missing '%s' property"), propertyName); + _("Missing '%1$s' property"), propertyName); return -1; } @@ -2259,7 +2256,7 @@ esxVI_GetLong(esxVI_ObjectContent *objectContent, const char *propertyName, if (!(*value) && occurrence == esxVI_Occurrence_RequiredItem) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Missing '%s' property"), propertyName); + _("Missing '%1$s' property"), propertyName); return -1; } @@ -2292,7 +2289,7 @@ esxVI_GetStringValue(esxVI_ObjectContent *objectContent, if (!(*value) && occurrence == esxVI_Occurrence_RequiredItem) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Missing '%s' property"), propertyName); + _("Missing '%1$s' property"), propertyName); return -1; } @@ -2325,7 +2322,7 @@ esxVI_GetManagedObjectReference(esxVI_ObjectContent *objectContent, if (!(*value) && occurrence == esxVI_Occurrence_RequiredItem) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Missing '%s' property"), propertyName); + _("Missing '%1$s' property"), propertyName); return -1; } @@ -2404,7 +2401,7 @@ esxVI_GetVirtualMachineIdentity(esxVI_ObjectContent *virtualMachine, if (esxUtil_ParseVirtualMachineIDString (virtualMachine->obj->value, id) < 0 || *id <= 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not parse positive integer from '%s'"), + _("Could not parse positive integer from '%1$s'"), virtualMachine->obj->value); goto failure; } @@ -2473,7 +2470,7 @@ esxVI_GetVirtualMachineIdentity(esxVI_ObjectContent *virtualMachine, if (virUUIDParse(uuid_string, uuid) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not parse UUID from string '%s'"), + _("Could not parse UUID from string '%1$s'"), uuid_string); goto failure; } @@ -2602,7 +2599,7 @@ esxVI_GetSnapshotTreeByName return 0; } else { virReportError(VIR_ERR_NO_DOMAIN_SNAPSHOT, - _("Could not find snapshot with name '%s'"), name); + _("Could not find snapshot with name '%1$s'"), name); return -1; } @@ -2634,7 +2631,7 @@ esxVI_GetSnapshotTreeBySnapshot } virReportError(VIR_ERR_NO_DOMAIN_SNAPSHOT, - _("Could not find domain snapshot with internal name '%s'"), + _("Could not find domain snapshot with internal name '%1$s'"), snapshot->value); return -1; @@ -2697,7 +2694,7 @@ esxVI_LookupVirtualMachineByUuid(esxVI_Context *ctx, const unsigned char *uuid, goto cleanup; } else { virReportError(VIR_ERR_NO_DOMAIN, - _("Could not find domain with UUID '%s'"), + _("Could not find domain with UUID '%1$s'"), uuid_string); goto cleanup; } @@ -2761,7 +2758,7 @@ esxVI_LookupVirtualMachineByName(esxVI_Context *ctx, const char *name, if (!(*virtualMachine) && occurrence != esxVI_Occurrence_OptionalItem) { virReportError(VIR_ERR_NO_DOMAIN, - _("Could not find domain with name '%s'"), name); + _("Could not find domain with name '%1$s'"), name); goto cleanup; } @@ -2888,7 +2885,7 @@ esxVI_LookupDatastoreByName(esxVI_Context *ctx, const char *name, if (!(*datastore) && occurrence != esxVI_Occurrence_OptionalItem) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not find datastore with name '%s'"), name); + _("Could not find datastore with name '%1$s'"), name); goto cleanup; } @@ -2970,7 +2967,7 @@ esxVI_LookupDatastoreByAbsolutePath(esxVI_Context *ctx, if (!(*datastore) && occurrence != esxVI_Occurrence_OptionalItem) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not find datastore containing absolute path '%s'"), + _("Could not find datastore containing absolute path '%1$s'"), absolutePath); goto cleanup; } @@ -3379,7 +3376,7 @@ esxVI_LookupFileInfoByDatastorePath(esxVI_Context *ctx, if (directoryAndFileName[length] != '/' || directoryAndFileName[length + 1] == '\0') { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Datastore path '%s' doesn't reference a file"), + _("Datastore path '%1$s' doesn't reference a file"), datastorePath); goto cleanup; } @@ -3466,7 +3463,7 @@ esxVI_LookupFileInfoByDatastorePath(esxVI_Context *ctx, if (taskInfoState != esxVI_TaskInfoState_Success) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not search in datastore '%s': %s"), + _("Could not search in datastore '%1$s': %2$s"), datastoreName, taskInfoErrorMessage); goto cleanup; } @@ -3485,7 +3482,7 @@ esxVI_LookupFileInfoByDatastorePath(esxVI_Context *ctx, goto cleanup; } else { virReportError(VIR_ERR_NO_STORAGE_VOL, - _("No storage volume with key or path '%s'"), + _("No storage volume with key or path '%1$s'"), datastorePath); goto cleanup; } @@ -3604,7 +3601,7 @@ esxVI_LookupDatastoreContentByDatastoreName if (taskInfoState != esxVI_TaskInfoState_Success) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not search in datastore '%s': %s"), + _("Could not search in datastore '%1$s': %2$s"), datastoreName, taskInfoErrorMessage); goto cleanup; } @@ -3853,7 +3850,7 @@ esxVI_LookupPhysicalNicByName(esxVI_Context *ctx, const char *name, if (!(*physicalNic) && occurrence != esxVI_Occurrence_OptionalItem) { virReportError(VIR_ERR_NO_INTERFACE, - _("Could not find physical NIC with name '%s'"), name); + _("Could not find physical NIC with name '%1$s'"), name); goto cleanup; } @@ -3897,7 +3894,7 @@ esxVI_LookupPhysicalNicByMACAddress(esxVI_Context *ctx, const char *mac, if (!(*physicalNic) && occurrence != esxVI_Occurrence_OptionalItem) { virReportError(VIR_ERR_NO_INTERFACE, - _("Could not find physical NIC with MAC address '%s'"), mac); + _("Could not find physical NIC with MAC address '%1$s'"), mac); goto cleanup; } @@ -3985,7 +3982,7 @@ esxVI_LookupHostVirtualSwitchByName(esxVI_Context *ctx, const char *name, if (!(*hostVirtualSwitch) && occurrence != esxVI_Occurrence_OptionalItem) { virReportError(VIR_ERR_NO_NETWORK, - _("Could not find HostVirtualSwitch with name '%s'"), + _("Could not find HostVirtualSwitch with name '%1$s'"), name); goto cleanup; } @@ -4098,17 +4095,15 @@ esxVI_HandleVirtualMachineQuestion if (autoAnswer) { if (!possibleAnswers) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Pending question blocks virtual machine execution, " - "question is '%s', no possible answers"), + _("Pending question blocks virtual machine execution, question is '%1$s', no possible answers"), questionInfo->text); *blocked = true; return -1; } else if (!answerChoice) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Pending question blocks virtual machine execution, " - "question is '%s', possible answers are %s, but no " - "default answer is specified"), questionInfo->text, + _("Pending question blocks virtual machine execution, question is '%1$s', possible answers are %2$s, but no default answer is specified"), + questionInfo->text, possibleAnswers); *blocked = true; @@ -4127,13 +4122,11 @@ esxVI_HandleVirtualMachineQuestion } else { if (possibleAnswers) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Pending question blocks virtual machine execution, " - "question is '%s', possible answers are %s"), + _("Pending question blocks virtual machine execution, question is '%1$s', possible answers are %2$s"), questionInfo->text, possibleAnswers); } else { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Pending question blocks virtual machine execution, " - "question is '%s', no possible answers"), + _("Pending question blocks virtual machine execution, question is '%1$s', no possible answers"), questionInfo->text); } @@ -4348,7 +4341,7 @@ esxVI_ParseHostCpuIdInfo(esxVI_ParsedHostCpuIdInfo *parsedHostCpuIdInfo, for (r = 0; r < 4; ++r) { if (strlen(input[r]) != expectedLength) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("HostCpuIdInfo register '%s' has an unexpected length"), + _("HostCpuIdInfo register '%1$s' has an unexpected length"), name[r]); return -1; } @@ -4362,7 +4355,7 @@ esxVI_ParseHostCpuIdInfo(esxVI_ParsedHostCpuIdInfo *parsedHostCpuIdInfo, if (i + 4 < expectedLength && input[r][i + 4] != ':') { virReportError(VIR_ERR_INTERNAL_ERROR, - _("HostCpuIdInfo register '%s' has an unexpected format"), + _("HostCpuIdInfo register '%1$s' has an unexpected format"), name[r]); return -1; } @@ -4499,7 +4492,7 @@ esxVI_LookupHostInternetScsiHbaStaticTargetByName if (!candidate) { if (occurrence == esxVI_Occurrence_RequiredItem) { virReportError(VIR_ERR_NO_STORAGE_POOL, - _("Could not find storage pool with name: %s"), name); + _("Could not find storage pool with name: %1$s"), name); } goto cleanup; @@ -4939,7 +4932,7 @@ esxVI_LookupManagedObjectHelper(esxVI_Context *ctx, if (!esxVI_String_ListContainsValue(propertyNameList, "name")) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Missing 'name' property in %s lookup"), type); + _("Missing 'name' property in %1$s lookup"), type); goto cleanup; } @@ -4978,10 +4971,10 @@ esxVI_LookupManagedObjectHelper(esxVI_Context *ctx, if (occurrence != esxVI_Occurrence_OptionalItem) { if (name) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not find %s with name '%s'"), type, name); + _("Could not find %1$s with name '%2$s'"), type, name); } else { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not find %s"), type); + _("Could not find %1$s"), type); } goto cleanup; diff --git a/src/esx/esx_vi_types.c b/src/esx/esx_vi_types.c index 15f8f957e2..96c131f618 100644 --- a/src/esx/esx_vi_types.c +++ b/src/esx/esx_vi_types.c @@ -80,7 +80,7 @@ VIR_LOG_INIT("esx.esx_vi_types"); if (item->_type <= esxVI_Type_Undefined || \ item->_type >= esxVI_Type_Other) { \ virReportError(VIR_ERR_INTERNAL_ERROR, \ - _("%s object has invalid dynamic type"), typeName);\ + _("%1$s object has invalid dynamic type"), typeName);\ return -1; \ } \ \ @@ -206,8 +206,7 @@ VIR_LOG_INIT("esx.esx_vi_types"); { \ if (anyType->type != esxVI_Type_##_type) { \ virReportError(VIR_ERR_INTERNAL_ERROR, \ - _("Call to %s for unexpected type '%s', " \ - "expected '%s'"), \ + _("Call to %1$s for unexpected type '%2$s', expected '%3$s'"), \ __FUNCTION__, anyType->other, \ esxVI_Type_ToString(esxVI_Type_##_type)); \ return -1; \ @@ -221,8 +220,7 @@ VIR_LOG_INIT("esx.esx_vi_types"); { \ if (anyType->type != esxVI_Type_##_type) { \ virReportError(VIR_ERR_INTERNAL_ERROR, \ - _("Call to %s for unexpected type '%s', " \ - "expected '%s'"), \ + _("Call to %1$s for unexpected type '%2$s', expected '%3$s'"), \ __FUNCTION__, anyType->other, \ esxVI_Type_ToString(esxVI_Type_##_type)); \ return -1; \ @@ -294,7 +292,7 @@ VIR_LOG_INIT("esx.esx_vi_types"); childNode = childNode->next) { \ if (childNode->type != XML_ELEMENT_NODE) { \ virReportError(VIR_ERR_INTERNAL_ERROR, \ - _("Wrong XML element type %d"), \ + _("Wrong XML element type %1$d"), \ childNode->type); \ goto failure; \ } \ @@ -346,21 +344,21 @@ VIR_LOG_INIT("esx.esx_vi_types"); \ if (!string) { \ virReportError(VIR_ERR_INTERNAL_ERROR, \ - _("XML node doesn't contain text, expecting an %s "\ - "value"), _xsdType); \ + _("XML node doesn't contain text, expecting an %1$s value"), \ + _xsdType); \ goto cleanup; \ } \ \ if (virStrToLong_ll(string, NULL, 10, &value) < 0) { \ virReportError(VIR_ERR_INTERNAL_ERROR, \ - _("Unknown value '%s' for %s"), string, _xsdType); \ + _("Unknown value '%1$s' for %2$s"), string, _xsdType); \ goto cleanup; \ } \ \ if (((_min) != INT64_MIN && value < (_min)) \ || ((_max) != INT64_MAX && value > (_max))) { \ virReportError(VIR_ERR_INTERNAL_ERROR, \ - _("Value '%s' is not representable as %s"), \ + _("Value '%1$s' is not representable as %2$s"), \ string, _xsdType); \ goto cleanup; \ } \ @@ -483,7 +481,7 @@ VIR_LOG_INIT("esx.esx_vi_types"); #define ESX_VI__TEMPLATE__PROPERTY__REQUIRE(_name) \ if (item->_name == 0) { \ virReportError(VIR_ERR_INTERNAL_ERROR, \ - _("%s object is missing the required '%s' property"), \ + _("%1$s object is missing the required '%2$s' property"), \ typeName, #_name); \ return -1; \ } @@ -540,7 +538,7 @@ VIR_LOG_INIT("esx.esx_vi_types"); \ default: \ virReportError(VIR_ERR_INTERNAL_ERROR, \ - _("Call to %s for unexpected type '%s'"), \ + _("Call to %1$s for unexpected type '%2$s'"), \ __FUNCTION__, _actual_type_name); \ return _error_return; \ } @@ -686,7 +684,7 @@ VIR_LOG_INIT("esx.esx_vi_types"); \ default: \ virReportError(VIR_ERR_INTERNAL_ERROR, \ - _("Call to %s for unexpected type '%s'"), \ + _("Call to %1$s for unexpected type '%2$s'"), \ __FUNCTION__, esxVI_Type_ToString(type)); \ return -1; \ }, \ @@ -720,7 +718,7 @@ esxVI_GetActualObjectType(xmlNodePtr node, esxVI_Type baseType, if (*actualType == esxVI_Type_Undefined || *actualType == esxVI_Type_Other) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unknown value '%s' for %s 'type' property"), + _("Unknown value '%1$s' for %2$s 'type' property"), type, esxVI_Type_ToString(baseType)); return -1; } @@ -740,7 +738,7 @@ esxVI_GetActualObjectType(xmlNodePtr node, esxVI_Type baseType, if (item->_name == 0 && \ esxVI_String_ListContainsValue(selectedPropertyNameList, #_name)) { \ virReportError(VIR_ERR_INTERNAL_ERROR, \ - _("%s object is missing the required '%s' property"), \ + _("%1$s object is missing the required '%2$s' property"), \ typeName, #_name); \ return -1; \ } @@ -757,7 +755,7 @@ esxVI_GetActualObjectType(xmlNodePtr node, esxVI_Type baseType, if (item->_type <= esxVI_Type_Undefined || \ item->_type >= esxVI_Type_Other) { \ virReportError(VIR_ERR_INTERNAL_ERROR, \ - _("%s object has invalid dynamic type"), typeName);\ + _("%1$s object has invalid dynamic type"), typeName);\ return -1; \ } \ \ @@ -910,7 +908,7 @@ esxVI_AnyType_ExpectType(esxVI_AnyType *anyType, esxVI_Type type) { if (anyType->type != type) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Expecting type '%s' but found '%s'"), + _("Expecting type '%1$s' but found '%2$s'"), esxVI_Type_ToString(type), esxVI_AnyType_TypeToString(anyType)); return -1; @@ -1014,7 +1012,7 @@ esxVI_AnyType_Deserialize(xmlNodePtr node, esxVI_AnyType **anyType) if ((*anyType)->type == esxVI_Type_Undefined) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unknown value '%s' for AnyType 'type' property"), + _("Unknown value '%1$s' for AnyType 'type' property"), (*anyType)->other); goto failure; } @@ -1029,7 +1027,7 @@ esxVI_AnyType_Deserialize(xmlNodePtr node, esxVI_AnyType **anyType) do { \ if (virStrToLong_ll((*anyType)->value, NULL, 10, &number) < 0) { \ virReportError(VIR_ERR_INTERNAL_ERROR, \ - _("Unknown value '%s' for %s"), \ + _("Unknown value '%1$s' for %2$s"), \ (*anyType)->value, _xsdType); \ goto failure; \ } \ @@ -1037,7 +1035,7 @@ esxVI_AnyType_Deserialize(xmlNodePtr node, esxVI_AnyType **anyType) if (((_min) != INT64_MIN && number < (_min)) \ || ((_max) != INT64_MAX && number > (_max))) { \ virReportError(VIR_ERR_INTERNAL_ERROR, \ - _("Value '%s' is out of %s range"), \ + _("Value '%1$s' is out of %2$s range"), \ (*anyType)->value, _xsdType); \ goto failure; \ } \ @@ -1053,7 +1051,7 @@ esxVI_AnyType_Deserialize(xmlNodePtr node, esxVI_AnyType **anyType) (*anyType)->boolean = esxVI_Boolean_False; } else { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unknown value '%s' for xsd:boolean"), + _("Unknown value '%1$s' for xsd:boolean"), (*anyType)->value); goto failure; } @@ -1499,7 +1497,7 @@ esxVI_DateTime_ConvertToCalendarTime(esxVI_DateTime *dateTime, /* second */ virStrToLong_i(tmp+1, &tmp, 10, &sec) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("xsd:dateTime value '%s' has unexpected format"), + _("xsd:dateTime value '%1$s' has unexpected format"), dateTime->value); return -1; } @@ -1509,7 +1507,7 @@ esxVI_DateTime_ConvertToCalendarTime(esxVI_DateTime *dateTime, if (*tmp == '.' && virStrToLong_i(tmp + 1, &tmp, 10, &milliseconds) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("xsd:dateTime value '%s' has unexpected format"), + _("xsd:dateTime value '%1$s' has unexpected format"), dateTime->value); return -1; } @@ -1521,7 +1519,7 @@ esxVI_DateTime_ConvertToCalendarTime(esxVI_DateTime *dateTime, tz = g_time_zone_new_utc(); } else { virReportError(VIR_ERR_INTERNAL_ERROR, - _("xsd:dateTime value '%s' has unexpected format"), + _("xsd:dateTime value '%1$s' has unexpected format"), dateTime->value); return -1; } @@ -1771,7 +1769,7 @@ ESX_VI__TEMPLATE__DESERIALIZE_EXTRA(Event, /* nothing */, if (!(*ptrptr)->_actualType) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("%s is missing 'type' property"), + _("%1$s is missing 'type' property"), esxVI_Type_ToString((*ptrptr)->_type)); goto failure; } -- 2.39.2

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com&gt; --- src/hypervisor/domain_cgroup.c | 4 +-- src/hypervisor/domain_driver.c | 20 ++++++------- src/hypervisor/virhostdev.c | 53 ++++++++++++++-------------------- 3 files changed, 33 insertions(+), 44 deletions(-) diff --git a/src/hypervisor/domain_cgroup.c b/src/hypervisor/domain_cgroup.c index 7265325406..20ad96b11c 100644 --- a/src/hypervisor/domain_cgroup.c +++ b/src/hypervisor/domain_cgroup.c @@ -166,7 +166,7 @@ virDomainCgroupSetupDomainBlkioParameters(virCgroup *cgroup, } } } else { - virReportError(VIR_ERR_INVALID_ARG, _("Unknown blkio parameter %s"), + virReportError(VIR_ERR_INVALID_ARG, _("Unknown blkio parameter %1$s"), param->field); ret = -1; virBlkioDeviceArrayClear(devices, ndevices); @@ -370,7 +370,7 @@ virDomainCgroupInitCgroup(const char *prefix, if (!g_path_is_absolute(vm->def->resource->partition)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Resource partition '%s' must start with '/'"), + _("Resource partition '%1$s' must start with '/'"), vm->def->resource->partition); return -1; } diff --git a/src/hypervisor/domain_driver.c b/src/hypervisor/domain_driver.c index d020b94921..66e09ffb04 100644 --- a/src/hypervisor/domain_driver.c +++ b/src/hypervisor/domain_driver.c @@ -151,7 +151,7 @@ virDomainDriverMergeBlkioDevice(virBlkioDevice **dest_array, } else if (STREQ(type, VIR_DOMAIN_BLKIO_DEVICE_WRITE_BPS)) { dest->wbps = src->wbps; } else { - virReportError(VIR_ERR_INVALID_ARG, _("Unknown parameter %s"), + virReportError(VIR_ERR_INVALID_ARG, _("Unknown parameter %1$s"), type); return -1; } @@ -256,7 +256,7 @@ virDomainDriverParseBlkioDeviceStr(char *blkioDeviceStr, const char *type, goto number_error; } else { virReportError(VIR_ERR_INVALID_ARG, - _("unknown parameter '%s'"), type); + _("unknown parameter '%1$s'"), type); goto cleanup; } @@ -279,13 +279,13 @@ virDomainDriverParseBlkioDeviceStr(char *blkioDeviceStr, const char *type, parse_error: virReportError(VIR_ERR_INVALID_ARG, - _("unable to parse blkio device '%s' '%s'"), + _("unable to parse blkio device '%1$s' '%2$s'"), type, blkioDeviceStr); goto cleanup; number_error: virReportError(VIR_ERR_INVALID_ARG, - _("invalid value '%s' for parameter '%s' of device '%s'"), + _("invalid value '%1$s' for parameter '%2$s' of device '%3$s'"), temp, type, result[i].path); cleanup: @@ -362,7 +362,7 @@ virDomainDriverNodeDeviceGetPCIInfo(virNodeDeviceDef *def, if (!cap) { virReportError(VIR_ERR_INVALID_ARG, - _("device %s is not a PCI device"), def->name); + _("device %1$s is not a PCI device"), def->name); return -1; } @@ -525,7 +525,7 @@ virDomainDriverAddIOThreadCheck(virDomainDef *def, { if (virDomainIOThreadIDFind(def, iothread_id)) { virReportError(VIR_ERR_INVALID_ARG, - _("an IOThread is already using iothread_id '%u'"), + _("an IOThread is already using iothread_id '%1$u'"), iothread_id); return -1; } @@ -548,7 +548,7 @@ virDomainDriverDelIOThreadCheck(virDomainDef *def, if (!virDomainIOThreadIDFind(def, iothread_id)) { virReportError(VIR_ERR_INVALID_ARG, - _("cannot find IOThread '%u' in iothreadids list"), + _("cannot find IOThread '%1$u' in iothreadids list"), iothread_id); return -1; } @@ -556,8 +556,7 @@ virDomainDriverDelIOThreadCheck(virDomainDef *def, for (i = 0; i < def->ndisks; i++) { if (def->disks[i]->iothread == iothread_id) { virReportError(VIR_ERR_INVALID_ARG, - _("cannot remove IOThread %u since it " - "is being used by disk '%s'"), + _("cannot remove IOThread %1$u since it is being used by disk '%2$s'"), iothread_id, def->disks[i]->dst); return -1; } @@ -566,8 +565,7 @@ virDomainDriverDelIOThreadCheck(virDomainDef *def, for (i = 0; i < def->ncontrollers; i++) { if (def->controllers[i]->iothread == iothread_id) { virReportError(VIR_ERR_INVALID_ARG, - _("cannot remove IOThread '%u' since it " - "is being used by controller"), + _("cannot remove IOThread '%1$u' since it is being used by controller"), iothread_id); return -1; } diff --git a/src/hypervisor/virhostdev.c b/src/hypervisor/virhostdev.c index bc5a20d691..eac3474783 100644 --- a/src/hypervisor/virhostdev.c +++ b/src/hypervisor/virhostdev.c @@ -94,13 +94,12 @@ static int virHostdevIsPCINodeDeviceUsed(virPCIDeviceAddress *devAddr, void *opa if (actual_drvname && actual_domname) virReportError(VIR_ERR_OPERATION_INVALID, - _("PCI device %s is in use by " - "driver %s, domain %s"), + _("PCI device %1$s is in use by driver %2$s, domain %3$s"), virPCIDeviceGetName(actual), actual_drvname, actual_domname); else virReportError(VIR_ERR_OPERATION_INVALID, - _("PCI device %s is in use"), + _("PCI device %1$s is in use"), virPCIDeviceGetName(actual)); return -1; } @@ -171,7 +170,7 @@ virHostdevManagerNew(void) if (g_mkdir_with_parents(hostdevMgr->stateDir, 0777) < 0) { virReportError(VIR_ERR_OPERATION_FAILED, - _("Failed to create state dir '%s'"), + _("Failed to create state dir '%1$s'"), hostdevMgr->stateDir); return NULL; } @@ -188,7 +187,7 @@ virHostdevManagerNew(void) if (g_mkdir_with_parents(hostdevMgr->stateDir, 0777) < 0) { umask(old_umask); virReportError(VIR_ERR_OPERATION_FAILED, - _("Failed to create state dir '%s'"), + _("Failed to create state dir '%1$s'"), hostdevMgr->stateDir); return NULL; } @@ -250,7 +249,7 @@ virHostdevGetPCIHostDevice(const virDomainHostdevDef *hostdev, virPCIDeviceSetStubDriver(actual, VIR_PCI_STUB_DRIVER_XEN); } else { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("pci backend driver '%s' is not supported"), + _("pci backend driver '%1$s' is not supported"), virDomainHostdevSubsysPCIBackendTypeToString(pcisrc->backend)); return -1; } @@ -333,7 +332,7 @@ virHostdevNetDevice(virDomainHostdevDef *hostdev, if (!(*linkdev)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("The device at %s has no network device name"), + _("The device at %1$s has no network device name"), sysfs_path); return -1; } @@ -378,9 +377,7 @@ virHostdevNetConfigVirtPortProfile(const char *linkdev, int vf, case VIR_NETDEV_VPORT_PROFILE_8021QBG: case VIR_NETDEV_VPORT_PROFILE_LAST: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("virtualport type %s is " - "currently not supported on interfaces of type " - "hostdev"), + _("virtualport type %1$s is currently not supported on interfaces of type hostdev"), virNetDevVPortTypeToString(virtPort->virtPortType)); break; @@ -475,8 +472,7 @@ virHostdevSetNetConfig(virDomainHostdevDef *hostdev, if (virtPort) { if (vlan) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("direct setting of the vlan tag is not allowed " - "for hostdev devices using %s mode"), + _("direct setting of the vlan tag is not allowed for hostdev devices using %1$s mode"), virNetDevVPortTypeToString(virtPort->virtPortType)); return -1; } @@ -611,7 +607,7 @@ virHostdevResetAllPCIDevices(virHostdevManager *mgr, VIR_DEBUG("Resetting PCI device %s", virPCIDeviceGetName(pci)); if (virPCIDeviceReset(pci, mgr->activePCIHostdevs, mgr->inactivePCIHostdevs) < 0) { - VIR_ERROR(_("Failed to reset PCI device: %s"), + VIR_ERROR(_("Failed to reset PCI device: %1$s"), virGetLastErrorMessage()); ret = -1; } @@ -642,7 +638,7 @@ virHostdevReattachAllPCIDevices(virHostdevManager *mgr, if (virPCIDeviceReattach(actual, mgr->activePCIHostdevs, mgr->inactivePCIHostdevs) < 0) { - VIR_ERROR(_("Failed to re-attach PCI device: %s"), + VIR_ERROR(_("Failed to re-attach PCI device: %1$s"), virGetLastErrorMessage()); } } else { @@ -699,7 +695,7 @@ virHostdevPreparePCIDevicesImpl(virHostdevManager *mgr, if (!usesVFIO && !virPCIDeviceIsAssignable(pci, strict_acs_check)) { virReportError(VIR_ERR_OPERATION_INVALID, - _("PCI device %s is not assignable"), + _("PCI device %1$s is not assignable"), virPCIDeviceGetName(pci)); goto cleanup; } @@ -788,8 +784,7 @@ virHostdevPreparePCIDevicesImpl(virHostdevManager *mgr, goto reattachdevs; } else { virReportError(VIR_ERR_OPERATION_INVALID, - _("Unmanaged PCI device %s must be manually " - "detached from the host"), + _("Unmanaged PCI device %1$s must be manually detached from the host"), virPCIDeviceGetName(pci)); goto reattachdevs; } @@ -1012,7 +1007,7 @@ virHostdevReAttachPCIDevicesImpl(virHostdevManager *mgr, if (!actual || virPCIDeviceListAdd(mgr->inactivePCIHostdevs, actual) < 0) { - VIR_ERROR(_("Failed to add PCI device %s to the inactive list"), + VIR_ERROR(_("Failed to add PCI device %1$s to the inactive list"), virGetLastErrorMessage()); virResetLastError(); } @@ -1104,7 +1099,7 @@ virHostdevReAttachPCIDevices(virHostdevManager *mgr, return; if (!(pcidevs = virHostdevGetPCIHostDeviceList(hostdevs, nhostdevs))) { - VIR_ERROR(_("Failed to allocate PCI device list: %s"), + VIR_ERROR(_("Failed to allocate PCI device list: %1$s"), virGetLastErrorMessage()); virResetLastError(); return; @@ -1340,13 +1335,12 @@ virHostdevMarkUSBDevices(virHostdevManager *mgr, virUSBDeviceGetUsedBy(tmp, &other_drvname, &other_domname); if (other_drvname && other_domname) virReportError(VIR_ERR_OPERATION_INVALID, - _("USB device %s is in use by " - "driver %s, domain %s"), + _("USB device %1$s is in use by driver %2$s, domain %3$s"), virUSBDeviceGetName(tmp), other_drvname, other_domname); else virReportError(VIR_ERR_OPERATION_INVALID, - _("USB device %s is already in use"), + _("USB device %1$s is already in use"), virUSBDeviceGetName(tmp)); goto error; } @@ -1423,13 +1417,11 @@ virHostdevFindUSBDevice(virDomainHostdevDef *hostdev, } else if (rc > 1) { if (autoAddress) { virReportError(VIR_ERR_OPERATION_FAILED, - _("Multiple USB devices for %x:%x were found," - " but none of them is at bus:%u device:%u"), + _("Multiple USB devices for %1$x:%2$x were found, but none of them is at bus:%3$u device:%4$u"), vendor, product, bus, device); } else { virReportError(VIR_ERR_OPERATION_FAILED, - _("Multiple USB devices for %x:%x, " - "use <address> to specify one"), + _("Multiple USB devices for %1$x:%2$x, use <address> to specify one"), vendor, product); } return -1; @@ -1610,8 +1602,7 @@ virHostdevPrepareSCSIDevices(virHostdevManager *mgr, if (!(scsi_shareable && tmp_shareable)) { virReportError(VIR_ERR_OPERATION_INVALID, - _("SCSI device %s is already in use by " - "other domain(s) as '%s'"), + _("SCSI device %1$s is already in use by other domain(s) as '%2$s'"), virSCSIDeviceGetName(tmp), tmp_shareable ? "shareable" : "non-shareable"); goto error; @@ -2287,7 +2278,7 @@ virHostdevPrepareOneNVMeDevice(virHostdevManager *hostdev_mgr, addrStr = virPCIDeviceAddressAsString(addr); virReportError(VIR_ERR_OPERATION_INVALID, - _("NVMe device %s already in use by driver %s domain %s"), + _("NVMe device %1$s already in use by driver %2$s domain %3$s"), NULLSTR(addrStr), actual_drvname, actual_domname); goto cleanup; } @@ -2376,7 +2367,7 @@ virHostdevPrepareNVMeDevices(virHostdevManager *hostdev_mgr, while (lastGoodDiskIdx >= 0) { if (virHostdevReAttachOneNVMeDevice(hostdev_mgr, drv_name, dom_name, disks[lastGoodDiskIdx]->src) < 0) { - VIR_ERROR(_("Failed to reattach NVMe for disk target: %s"), + VIR_ERROR(_("Failed to reattach NVMe for disk target: %1$s"), disks[lastGoodDiskIdx]->dst); } @@ -2446,7 +2437,7 @@ virHostdevReAttachNVMeDevices(virHostdevManager *hostdev_mgr, for (i = 0; i < ndisks; i++) { if (virHostdevReAttachOneNVMeDevice(hostdev_mgr, drv_name, dom_name, disks[i]->src) < 0) { - VIR_ERROR(_("Failed to reattach NVMe for disk target: %s"), + VIR_ERROR(_("Failed to reattach NVMe for disk target: %1$s"), disks[i]->dst); ret = -1; } -- 2.39.2

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com&gt; --- src/libxl/libxl_capabilities.c | 2 +- src/libxl/libxl_conf.c | 61 +++++----- src/libxl/libxl_domain.c | 24 ++-- src/libxl/libxl_driver.c | 215 ++++++++++++++++----------------- src/libxl/libxl_migration.c | 6 +- src/libxl/xen_common.c | 72 +++++------ src/libxl/xen_xl.c | 28 ++--- src/libxl/xen_xm.c | 4 +- 8 files changed, 201 insertions(+), 211 deletions(-) diff --git a/src/libxl/libxl_capabilities.c b/src/libxl/libxl_capabilities.c index c2975d637e..cd40cff739 100644 --- a/src/libxl/libxl_capabilities.c +++ b/src/libxl/libxl_capabilities.c @@ -348,7 +348,7 @@ libxlCapsInitGuests(libxl_ctx *ctx, virCaps *caps) regex = g_regex_new(XEN_CAP_REGEX, 0, 0, &err); if (!regex) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to compile regex %s"), err->message); + _("Failed to compile regex %1$s"), err->message); return -1; } diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 15369b2791..12a0eb7085 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -186,7 +186,7 @@ libxlMakeDomCreateInfo(libxl_ctx *ctx, strlen(def->seclabels[0]->label), &c_info->ssidref)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("libxenlight failed to resolve security label '%s'"), + _("libxenlight failed to resolve security label '%1$s'"), def->seclabels[0]->label); } } @@ -194,7 +194,7 @@ libxlMakeDomCreateInfo(libxl_ctx *ctx, virUUIDFormat(def->uuid, uuidstr); if (libxl_uuid_from_string(&c_info->uuid, uuidstr)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("libxenlight failed to parse UUID '%s'"), uuidstr); + _("libxenlight failed to parse UUID '%1$s'"), uuidstr); goto error; } @@ -272,7 +272,7 @@ libxlMakeChrdevStr(virDomainChrDef *def, char **buf) default: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unsupported chardev '%s'"), type); + _("unsupported chardev '%1$s'"), type); return -1; } @@ -384,7 +384,7 @@ libxlMakeDomBuildInfo(virDomainDef *def, case VIR_DOMAIN_CLOCK_OFFSET_TIMEZONE: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unsupported clock offset '%s'"), + _("unsupported clock offset '%1$s'"), virDomainClockOffsetTypeToString(clock.offset)); return -1; @@ -392,7 +392,7 @@ libxlMakeDomBuildInfo(virDomainDef *def, case VIR_DOMAIN_CLOCK_OFFSET_LAST: default: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unexpected clock offset '%d'"), clock.offset); + _("unexpected clock offset '%1$d'"), clock.offset); return -1; } @@ -421,7 +421,7 @@ libxlMakeDomBuildInfo(virDomainDef *def, case VIR_DOMAIN_TIMER_NAME_HPET: if (!hvm) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unsupported timer type (name) '%s'"), + _("unsupported timer type (name) '%1$s'"), virDomainTimerNameTypeToString(clock.timers[i]->name)); return -1; } @@ -436,7 +436,7 @@ libxlMakeDomBuildInfo(virDomainDef *def, case VIR_DOMAIN_TIMER_NAME_PIT: case VIR_DOMAIN_TIMER_NAME_ARMVTIMER: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unsupported timer type (name) '%s'"), + _("unsupported timer type (name) '%1$s'"), virDomainTimerNameTypeToString(clock.timers[i]->name)); return -1; @@ -503,7 +503,7 @@ libxlMakeDomBuildInfo(virDomainDef *def, false)); if (libxl_cpuid_parse_config(&b_info->cpuid, xlCPU)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unsupported cpu feature '%s'"), + _("unsupported cpu feature '%1$s'"), def->cpu->features[i].name); return -1; } @@ -524,7 +524,7 @@ libxlMakeDomBuildInfo(virDomainDef *def, def->cpu->features[i].name, false)); if (libxl_cpuid_parse_config(&b_info->cpuid, xlCPU)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unsupported cpu feature '%s'"), + _("unsupported cpu feature '%1$s'"), def->cpu->features[i].name); return -1; } @@ -542,7 +542,7 @@ libxlMakeDomBuildInfo(virDomainDef *def, libxl_defbool_set(&b_info->u.hvm.nested_hvm, hasHwVirt); } else { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unsupported nested HVM setting for %s machine on this Xen version"), + _("unsupported nested HVM setting for %1$s machine on this Xen version"), def->os.machine); return -1; } @@ -658,7 +658,7 @@ libxlMakeDomBuildInfo(virDomainDef *def, if (def->os.loader && 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; } @@ -666,14 +666,14 @@ libxlMakeDomBuildInfo(virDomainDef *def, if (def->emulator) { if (!virFileExists(def->emulator)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("emulator '%s' not found"), + _("emulator '%1$s' not found"), def->emulator); return -1; } if (!virFileIsExecutable(def->emulator)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("emulator '%s' is not executable"), + _("emulator '%1$s' is not executable"), def->emulator); return -1; } @@ -800,7 +800,7 @@ libxlMakeDomBuildInfo(virDomainDef *def, case VIR_DOMAIN_MEMBALLOON_MODEL_VIRTIO_TRANSITIONAL: case VIR_DOMAIN_MEMBALLOON_MODEL_VIRTIO_NON_TRANSITIONAL: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unsupported balloon device model '%s'"), + _("unsupported balloon device model '%1$s'"), virDomainMemballoonModelTypeToString(def->memballoon->model)); return -1; case VIR_DOMAIN_MEMBALLOON_MODEL_NONE: @@ -894,7 +894,7 @@ libxlMakeVnumaList(virDomainDef *def, bitmap = virDomainNumaGetNodeCpumask(numa, i); if (bitmap == NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("vnuma sibling %zu missing vcpus set"), i); + _("vnuma sibling %1$zu missing vcpus set"), i); goto cleanup; } @@ -980,14 +980,14 @@ libxlMakeNetworkDiskSrcStr(virStorageSource *src, case VIR_STORAGE_NET_PROTOCOL_LAST: case VIR_STORAGE_NET_PROTOCOL_NONE: virReportError(VIR_ERR_NO_SUPPORT, - _("Unsupported network block protocol '%s'"), + _("Unsupported network block protocol '%1$s'"), virStorageNetProtocolTypeToString(src->protocol)); return NULL; case VIR_STORAGE_NET_PROTOCOL_RBD: if (strchr(src->path, ':')) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("':' not allowed in RBD source volume name '%s'"), + _("':' not allowed in RBD source volume name '%1$s'"), src->path); return NULL; } @@ -1115,8 +1115,7 @@ libxlMakeDisk(virDomainDiskDef *l_disk, libxl_device_disk *x_disk) break; default: virReportError(VIR_ERR_INTERNAL_ERROR, - _("libxenlight does not support disk format %s " - "with disk driver %s"), + _("libxenlight does not support disk format %1$s with disk driver %2$s"), virStorageFileFormatTypeToString(format), driver); return -1; @@ -1141,8 +1140,7 @@ libxlMakeDisk(virDomainDiskDef *l_disk, libxl_device_disk *x_disk) break; default: virReportError(VIR_ERR_INTERNAL_ERROR, - _("libxenlight does not support disk format %s " - "with disk driver %s"), + _("libxenlight does not support disk format %1$s with disk driver %2$s"), virStorageFileFormatTypeToString(format), driver); return -1; @@ -1150,8 +1148,7 @@ libxlMakeDisk(virDomainDiskDef *l_disk, libxl_device_disk *x_disk) } else if (STREQ(driver, "file")) { if (format != VIR_STORAGE_FILE_RAW) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("libxenlight does not support disk format %s " - "with disk driver %s"), + _("libxenlight does not support disk format %1$s with disk driver %2$s"), virStorageFileFormatTypeToString(format), driver); return -1; @@ -1161,8 +1158,7 @@ libxlMakeDisk(virDomainDiskDef *l_disk, libxl_device_disk *x_disk) } else if (STREQ(driver, "phy")) { if (format != VIR_STORAGE_FILE_RAW) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("libxenlight does not support disk format %s " - "with disk driver %s"), + _("libxenlight does not support disk format %1$s with disk driver %2$s"), virStorageFileFormatTypeToString(format), driver); return -1; @@ -1171,7 +1167,7 @@ libxlMakeDisk(virDomainDiskDef *l_disk, libxl_device_disk *x_disk) x_disk->backend = LIBXL_DISK_BACKEND_PHY; } else { virReportError(VIR_ERR_INTERNAL_ERROR, - _("libxenlight does not support disk driver %s"), + _("libxenlight does not support disk driver %1$s"), driver); return -1; } @@ -1409,7 +1405,7 @@ libxlMakeNic(virDomainDef *def, case VIR_DOMAIN_NET_TYPE_VDS: case VIR_DOMAIN_NET_TYPE_LAST: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unsupported interface type %s"), + _("unsupported interface type %1$s"), virDomainNetTypeToString(l_nic->type)); goto cleanup; } @@ -1728,7 +1724,7 @@ libxlGetAutoballoonConf(libxlDriverConfig *cfg, 0, 0, &err); if (!regex) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to compile regex %s"), err->message); + _("Failed to compile regex %1$s"), err->message); return -1; } @@ -1791,7 +1787,7 @@ libxlDriverConfigInit(libxlDriverConfig *cfg) if (g_mkdir_with_parents(cfg->logDir, 0777) < 0) { virReportSystemError(errno, - _("failed to create log dir '%s'"), + _("failed to create log dir '%1$s'"), cfg->logDir); return -1; } @@ -2196,8 +2192,7 @@ libxlMakeUSB(virDomainHostdevDef *hostdev, libxl_device_usbdev *usbdev) } else { if (virHostdevFindUSBDevice(hostdev, true, &usb) < 0) { virReportError(VIR_ERR_OPERATION_FAILED, - _("failed to find USB device busnum:devnum " - "for %x:%x"), + _("failed to find USB device busnum:devnum for %1$x:%2$x"), usbsrc->vendor, usbsrc->product); goto cleanup; } @@ -2390,7 +2385,7 @@ libxlMakeVideo(virDomainDef *def, libxl_domain_config *d_config) case VIR_DOMAIN_VIDEO_TYPE_LAST: default: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("video type %s is not supported by libxl"), + _("video type %1$s is not supported by libxl"), virDomainVideoTypeToString(def->videos[0]->type)); return -1; } @@ -2421,7 +2416,7 @@ libxlDriverNodeGetInfo(libxlDriverPrivate *driver, virNodeInfoPtr info) if (virStrcpyStatic(info->model, virArchToString(hostarch)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("host arch %s is too big for destination"), + _("host arch %1$s is too big for destination"), virArchToString(hostarch)); goto cleanup; } diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index f28a6207a3..6c167df63e 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -153,8 +153,7 @@ libxlDomainDeviceDefPostParse(virDomainDeviceDef *dev, /* forbid capabilities mode hostdev in this kind of hypervisor */ if (hostdev->mode == VIR_DOMAIN_HOSTDEV_MODE_CAPABILITIES) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("hostdev mode 'capabilities' is not " - "supported in %s"), + _("hostdev mode 'capabilities' is not supported in %1$s"), virDomainVirtTypeToString(def->virtType)); return -1; } @@ -339,7 +338,7 @@ libxlDomainDefValidate(const virDomainDef *def, case VIR_DOMAIN_SOUND_MODEL_ICH9: case VIR_DOMAIN_SOUND_MODEL_LAST: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unsupported audio model %s"), + _("unsupported audio model %1$s"), virDomainSoundModelTypeToString(snd->model)); return -1; } @@ -379,7 +378,7 @@ libxlDomainShutdownHandleRestart(libxlDriverPrivate *driver, libxlDomainDestroyInternal(driver, vm); libxlDomainCleanup(driver, vm); if (libxlDomainStartNew(driver, vm, false) < 0) { - VIR_ERROR(_("Failed to restart VM '%s': %s"), + VIR_ERROR(_("Failed to restart VM '%1$s': %2$s"), vm->def->name, virGetLastErrorMessage()); } } @@ -489,8 +488,7 @@ libxlDomainShutdownThread(void *opaque) if (libxlRetrieveDomainConfigurationWrapper(cfg->ctx, vm->def->id, &d_config) != 0) { - VIR_ERROR(_("Failed to retrieve config for VM '%s'. " - "Unable to perform soft reset. Destroying VM"), + VIR_ERROR(_("Failed to retrieve config for VM '%1$s'. Unable to perform soft reset. Destroying VM"), vm->def->name); libxlDomainShutdownHandleDestroy(driver, vm); goto endjob; @@ -503,7 +501,7 @@ libxlDomainShutdownThread(void *opaque) if (libxl_domain_soft_reset(cfg->ctx, &d_config, vm->def->id, NULL, NULL) != 0) { - VIR_ERROR(_("Failed to soft reset VM '%s'. Destroying VM"), + VIR_ERROR(_("Failed to soft reset VM '%1$s'. Destroying VM"), vm->def->name); libxlDomainShutdownHandleDestroy(driver, vm); goto endjob; @@ -675,7 +673,7 @@ libxlDomainSaveImageOpen(libxlDriverPrivate *driver, if ((fd = virFileOpenAs(from, O_RDONLY, 0, -1, -1, 0)) < 0) { virReportSystemError(-fd, - _("Failed to open domain image file '%s'"), from); + _("Failed to open domain image file '%1$s'"), from); goto error; } @@ -692,14 +690,14 @@ libxlDomainSaveImageOpen(libxlDriverPrivate *driver, if (hdr.version > LIBXL_SAVE_VERSION) { virReportError(VIR_ERR_OPERATION_FAILED, - _("image version is not supported (%d > %d)"), + _("image version is not supported (%1$d > %2$d)"), hdr.version, LIBXL_SAVE_VERSION); goto error; } if (hdr.xmlLen <= 0) { virReportError(VIR_ERR_OPERATION_FAILED, - _("invalid XML length: %d"), hdr.xmlLen); + _("invalid XML length: %1$d"), hdr.xmlLen); goto error; } @@ -1256,11 +1254,11 @@ libxlDomainStartPerform(libxlDriverPrivate *driver, if (libxlret) { if (restore_fd < 0) virReportError(VIR_ERR_INTERNAL_ERROR, - _("libxenlight failed to create new domain '%s'"), + _("libxenlight failed to create new domain '%1$s'"), d_config.c_info.name); else virReportError(VIR_ERR_INTERNAL_ERROR, - _("libxenlight failed to restore domain '%s'"), + _("libxenlight failed to restore domain '%1$s'"), d_config.c_info.name); goto cleanup; } @@ -1399,7 +1397,7 @@ libxlDomainStartNew(libxlDriverPrivate *driver, virUUIDFormat(vm->def->uuid, vm_uuidstr); virUUIDFormat(def->uuid, def_uuidstr); virReportError(VIR_ERR_OPERATION_FAILED, - _("cannot restore domain '%s' uuid %s from a file which belongs to domain '%s' uuid %s"), + _("cannot restore domain '%1$s' uuid %2$s from a file which belongs to domain '%3$s' uuid %4$s"), vm->def->name, vm_uuidstr, def->name, def_uuidstr); goto cleanup; } diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 04e74086e6..68c4c7b768 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -307,7 +307,7 @@ libxlDomObjFromDomain(virDomainPtr dom) if (!vm) { virUUIDFormat(dom->uuid, uuidstr); virReportError(VIR_ERR_NO_DOMAIN, - _("no domain with matching uuid '%s' (%s)"), + _("no domain with matching uuid '%1$s' (%2$s)"), uuidstr, dom->name); return NULL; } @@ -332,7 +332,7 @@ libxlAutostartDomain(virDomainObj *vm, if (vm->autostart && !virDomainObjIsActive(vm) && libxlDomainStartNew(driver, vm, false) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to autostart VM '%s': %s"), + _("Failed to autostart VM '%1$s': %2$s"), vm->def->name, virGetLastErrorMessage()); goto endjob; } @@ -721,31 +721,31 @@ libxlStateInitialize(bool privileged, libxl_driver->config = cfg; if (g_mkdir_with_parents(cfg->stateDir, 0777) < 0) { virReportSystemError(errno, - _("failed to create state dir '%s'"), + _("failed to create state dir '%1$s'"), cfg->stateDir); goto error; } if (g_mkdir_with_parents(cfg->libDir, 0777) < 0) { virReportSystemError(errno, - _("failed to create lib dir '%s'"), + _("failed to create lib dir '%1$s'"), cfg->libDir); goto error; } if (g_mkdir_with_parents(cfg->saveDir, 0777) < 0) { virReportSystemError(errno, - _("failed to create save dir '%s'"), + _("failed to create save dir '%1$s'"), cfg->saveDir); goto error; } if (g_mkdir_with_parents(cfg->autoDumpDir, 0777) < 0) { virReportSystemError(errno, - _("failed to create dump dir '%s'"), + _("failed to create dump dir '%1$s'"), cfg->autoDumpDir); goto error; } if (g_mkdir_with_parents(cfg->channelDir, 0777) < 0) { virReportSystemError(errno, - _("failed to create channel dir '%s'"), + _("failed to create channel dir '%1$s'"), cfg->channelDir); goto error; } @@ -875,7 +875,7 @@ libxlConnectOpen(virConnectPtr conn, STRNEQ(conn->uri->path, "/") && STRNEQ(conn->uri->path, "/system")) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unexpected Xen URI path '%s', try xen:///system"), + _("unexpected Xen URI path '%1$s', try xen:///system"), conn->uri->path); return VIR_DRV_OPEN_ERROR; } @@ -1169,7 +1169,7 @@ libxlDomainSuspend(virDomainPtr dom) if (virDomainObjGetState(vm, NULL) != VIR_DOMAIN_PAUSED) { if (libxlDomainPauseWrapper(cfg->ctx, vm->def->id) != 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to suspend domain '%d' with libxenlight"), + _("Failed to suspend domain '%1$d' with libxenlight"), vm->def->id); goto endjob; } @@ -1222,7 +1222,7 @@ libxlDomainResume(virDomainPtr dom) if (virDomainObjGetState(vm, NULL) == VIR_DOMAIN_PAUSED) { if (libxlDomainUnpauseWrapper(cfg->ctx, vm->def->id) != 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to resume domain '%d' with libxenlight"), + _("Failed to resume domain '%1$d' with libxenlight"), vm->def->id); goto endjob; } @@ -1281,7 +1281,7 @@ libxlDomainShutdownFlags(virDomainPtr dom, unsigned int flags) if (ret != ERROR_NOPARAVIRT) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to shutdown domain '%d' with libxenlight"), + _("Failed to shutdown domain '%1$d' with libxenlight"), vm->def->id); ret = -1; goto cleanup; @@ -1296,7 +1296,7 @@ libxlDomainShutdownFlags(virDomainPtr dom, unsigned int flags) goto cleanup; virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to shutdown domain '%d' with libxenlight"), + _("Failed to shutdown domain '%1$d' with libxenlight"), vm->def->id); ret = -1; } @@ -1343,7 +1343,7 @@ libxlDomainReboot(virDomainPtr dom, unsigned int flags) goto cleanup; virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to reboot domain '%d' with libxenlight"), + _("Failed to reboot domain '%1$d' with libxenlight"), vm->def->id); ret = -1; } @@ -1382,7 +1382,7 @@ libxlDomainDestroyFlags(virDomainPtr dom, if (libxlDomainDestroyInternal(driver, vm) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to destroy domain '%d'"), vm->def->id); + _("Failed to destroy domain '%1$d'"), vm->def->id); goto endjob; } @@ -1430,7 +1430,7 @@ libxlDomainPMSuspendForDuration(virDomainPtr dom, virCheckFlags(0, -1); if (target != VIR_NODE_SUSPEND_TARGET_MEM) { virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, - _("PMSuspend type %d not supported by libxenlight driver"), + _("PMSuspend type %1$d not supported by libxenlight driver"), target); return -1; } @@ -1462,7 +1462,7 @@ libxlDomainPMSuspendForDuration(virDomainPtr dom, if (ret < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to suspend domain '%d'"), vm->def->id); + _("Failed to suspend domain '%1$d'"), vm->def->id); goto endjob; } @@ -1513,7 +1513,7 @@ libxlDomainPMWakeup(virDomainPtr dom, unsigned int flags) priv = vm->privateData; if (libxl_domain_resume(cfg->ctx, vm->def->id, 1, NULL) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to resume domain '%d'"), vm->def->id); + _("Failed to resume domain '%1$d'"), vm->def->id); goto endjob; } virDomainObjSetState(vm, VIR_DOMAIN_RUNNING, VIR_DOMAIN_RUNNING_WAKEUP); @@ -1647,8 +1647,8 @@ libxlDomainSetMemoryFlags(virDomainPtr dom, unsigned long newmem, if (flags & VIR_DOMAIN_MEM_LIVE) { if (libxl_domain_setmaxmem(cfg->ctx, vm->def->id, newmem) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to set maximum memory for domain '%d'" - " with libxenlight"), vm->def->id); + _("Failed to set maximum memory for domain '%1$d' with libxenlight"), + vm->def->id); goto endjob; } } @@ -1680,8 +1680,8 @@ libxlDomainSetMemoryFlags(virDomainPtr dom, unsigned long newmem, virObjectLock(vm); if (res < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to set memory for domain '%d'" - " with libxenlight"), vm->def->id); + _("Failed to set memory for domain '%1$d' with libxenlight"), + vm->def->id); goto endjob; } vm->def->mem.cur_balloon = newmem; @@ -1741,7 +1741,7 @@ libxlDomainGetInfo(virDomainPtr dom, virDomainInfoPtr info) if (libxl_domain_info(cfg->ctx, &d_info, vm->def->id) != 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("libxl_domain_info failed for domain '%d'"), + _("libxl_domain_info failed for domain '%1$d'"), vm->def->id); goto cleanup; } @@ -1805,15 +1805,15 @@ libxlDoDomainSave(libxlDriverPrivate *driver, if (virDomainObjGetState(vm, NULL) == VIR_DOMAIN_PAUSED) { virReportError(VIR_ERR_OPERATION_INVALID, - _("Domain '%d' has to be running because libxenlight will" - " suspend it"), vm->def->id); + _("Domain '%1$d' has to be running because libxenlight will suspend it"), + vm->def->id); goto cleanup; } if ((fd = virFileOpenAs(to, O_CREAT|O_TRUNC|O_WRONLY, S_IRUSR|S_IWUSR, -1, -1, 0)) < 0) { virReportSystemError(-fd, - _("Failed to create domain save file '%s'"), to); + _("Failed to create domain save file '%1$s'"), to); goto cleanup; } @@ -1845,7 +1845,7 @@ libxlDoDomainSave(libxlDriverPrivate *driver, if (ret != 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to save domain '%d' with libxenlight"), + _("Failed to save domain '%1$d' with libxenlight"), vm->def->id); ret = -1; goto cleanup; @@ -1859,7 +1859,7 @@ libxlDoDomainSave(libxlDriverPrivate *driver, if (libxlDomainDestroyInternal(driver, vm) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to destroy domain '%d'"), vm->def->id); + _("Failed to destroy domain '%1$d'"), vm->def->id); goto cleanup; } @@ -2025,8 +2025,7 @@ libxlDomainCoreDump(virDomainPtr dom, const char *to, unsigned int flags) virDomainObjGetState(vm, NULL) == VIR_DOMAIN_RUNNING) { if (libxlDomainPauseWrapper(cfg->ctx, vm->def->id) != 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Before dumping core, failed to suspend domain '%d'" - " with libxenlight"), + _("Before dumping core, failed to suspend domain '%1$d' with libxenlight"), vm->def->id); goto endjob; } @@ -2040,7 +2039,7 @@ libxlDomainCoreDump(virDomainPtr dom, const char *to, unsigned int flags) virObjectLock(vm); if (ret != 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to dump core of domain '%d' with libxenlight"), + _("Failed to dump core of domain '%1$d' with libxenlight"), vm->def->id); ret = -1; goto unpause; @@ -2049,7 +2048,7 @@ libxlDomainCoreDump(virDomainPtr dom, const char *to, unsigned int flags) if (flags & VIR_DUMP_CRASH) { if (libxlDomainDestroyInternal(driver, vm) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to destroy domain '%d'"), vm->def->id); + _("Failed to destroy domain '%1$d'"), vm->def->id); goto unpause; } @@ -2068,8 +2067,8 @@ libxlDomainCoreDump(virDomainPtr dom, const char *to, unsigned int flags) if (virDomainObjIsActive(vm) && paused) { if (libxlDomainUnpauseWrapper(cfg->ctx, vm->def->id) != 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("After dumping core, failed to resume domain '%d' with" - " libxenlight"), vm->def->id); + _("After dumping core, failed to resume domain '%1$d' with libxenlight"), + vm->def->id); } else { virDomainObjSetState(vm, VIR_DOMAIN_RUNNING, VIR_DOMAIN_RUNNING_UNPAUSED); @@ -2234,7 +2233,7 @@ libxlDomainSetVcpusFlags(virDomainPtr dom, unsigned int nvcpus, (flags & (VIR_DOMAIN_VCPU_MAXIMUM | VIR_DOMAIN_VCPU_LIVE)) == (VIR_DOMAIN_VCPU_MAXIMUM | VIR_DOMAIN_VCPU_LIVE)) { virReportError(VIR_ERR_INVALID_ARG, - _("invalid flag combination: (0x%x)"), flags); + _("invalid flag combination: (0x%1$x)"), flags); return -1; } @@ -2275,8 +2274,8 @@ libxlDomainSetVcpusFlags(virDomainPtr dom, unsigned int nvcpus, if (nvcpus > max) { virReportError(VIR_ERR_INVALID_ARG, - _("requested vcpus is greater than max allowable" - " vcpus for the domain: %d > %d"), nvcpus, max); + _("requested vcpus is greater than max allowable vcpus for the domain: %1$d > %2$d"), + nvcpus, max); goto endjob; } @@ -2308,8 +2307,8 @@ libxlDomainSetVcpusFlags(virDomainPtr dom, unsigned int nvcpus, case VIR_DOMAIN_VCPU_LIVE: if (libxlSetVcpuonlineWrapper(cfg->ctx, vm->def->id, &map) != 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to set vcpus for domain '%d'" - " with libxenlight"), vm->def->id); + _("Failed to set vcpus for domain '%1$d' with libxenlight"), + vm->def->id); goto endjob; } if (virDomainDefSetVcpus(vm->def, nvcpus) < 0) @@ -2319,8 +2318,8 @@ libxlDomainSetVcpusFlags(virDomainPtr dom, unsigned int nvcpus, case VIR_DOMAIN_VCPU_LIVE | VIR_DOMAIN_VCPU_CONFIG: if (libxlSetVcpuonlineWrapper(cfg->ctx, vm->def->id, &map) != 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to set vcpus for domain '%d'" - " with libxenlight"), vm->def->id); + _("Failed to set vcpus for domain '%1$d' with libxenlight"), + vm->def->id); goto endjob; } if (virDomainDefSetVcpus(vm->def, nvcpus) < 0 || @@ -2388,7 +2387,7 @@ libxlDomainGetVcpusFlags(virDomainPtr dom, unsigned int flags) } if ((flags & VIR_DOMAIN_VCPU_LIVE) && (flags & VIR_DOMAIN_VCPU_CONFIG)) { virReportError(VIR_ERR_INVALID_ARG, - _("invalid flag combination: (0x%x)"), flags); + _("invalid flag combination: (0x%1$x)"), flags); return -1; } @@ -2464,7 +2463,7 @@ libxlDomainPinVcpuFlags(virDomainPtr dom, unsigned int vcpu, if (!(vcpuinfo = virDomainDefGetVcpu(targetDef, vcpu)) || !vcpuinfo->online) { virReportError(VIR_ERR_INVALID_ARG, - _("vcpu '%u' is not active"), vcpu); + _("vcpu '%1$u' is not active"), vcpu); goto endjob; } @@ -2472,7 +2471,7 @@ libxlDomainPinVcpuFlags(virDomainPtr dom, unsigned int vcpu, libxl_bitmap map = { .size = maplen, .map = cpumap }; if (libxl_set_vcpuaffinity(cfg->ctx, vm->def->id, vcpu, &map, NULL) != 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to pin vcpu '%d' with libxenlight"), + _("Failed to pin vcpu '%1$d' with libxenlight"), vcpu); goto endjob; } @@ -2571,7 +2570,7 @@ libxlDomainGetVcpus(virDomainPtr dom, virVcpuInfoPtr info, int maxinfo, if ((vcpuinfo = libxl_list_vcpu(cfg->ctx, vm->def->id, &maxcpu, &hostcpus)) == NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to list vcpus for domain '%d' with libxenlight"), + _("Failed to list vcpus for domain '%1$d' with libxenlight"), vm->def->id); goto cleanup; } @@ -2676,7 +2675,7 @@ libxlConnectDomainXMLFromNative(virConnectPtr conn, goto cleanup; } else { virReportError(VIR_ERR_INVALID_ARG, - _("unsupported config type %s"), nativeFormat); + _("unsupported config type %1$s"), nativeFormat); goto cleanup; } @@ -2719,7 +2718,7 @@ libxlConnectDomainXMLToNative(virConnectPtr conn, const char * nativeFormat, } else { virReportError(VIR_ERR_INVALID_ARG, - _("unsupported config type %s"), nativeFormat); + _("unsupported config type %1$s"), nativeFormat); goto cleanup; } @@ -2958,14 +2957,14 @@ libxlDomainChangeEjectableMedia(virDomainObj *vm, virDomainDiskDef *disk) if (!origdisk) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("No device with bus '%s' and target '%s'"), + _("No device with bus '%1$s' and target '%2$s'"), virDomainDiskBusTypeToString(disk->bus), disk->dst); goto cleanup; } if (origdisk->device != VIR_DOMAIN_DISK_DEVICE_CDROM) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Removable media not supported for %s device"), + _("Removable media not supported for %1$s device"), virDomainDiskDeviceTypeToString(disk->device)); goto cleanup; } @@ -2975,7 +2974,7 @@ libxlDomainChangeEjectableMedia(virDomainObj *vm, virDomainDiskDef *disk) if ((ret = libxl_cdrom_insert(cfg->ctx, vm->def->id, &x_disk, NULL)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("libxenlight failed to change media for disk '%s'"), + _("libxenlight failed to change media for disk '%1$s'"), disk->dst); goto cleanup; } @@ -3010,7 +3009,7 @@ libxlDomainAttachDeviceDiskLive(virDomainObj *vm, virDomainDeviceDef *dev) if (l_disk->bus == VIR_DOMAIN_DISK_BUS_XEN) { if (virDomainDiskIndexByName(vm->def, l_disk->dst, true) >= 0) { virReportError(VIR_ERR_OPERATION_FAILED, - _("target %s already exists"), l_disk->dst); + _("target %1$s already exists"), l_disk->dst); goto cleanup; } @@ -3031,7 +3030,7 @@ libxlDomainAttachDeviceDiskLive(virDomainObj *vm, virDomainDeviceDef *dev) if ((ret = libxl_device_disk_add(cfg->ctx, vm->def->id, &x_disk, NULL)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("libxenlight failed to attach disk '%s'"), + _("libxenlight failed to attach disk '%1$s'"), l_disk->dst); if (virDomainLockImageDetach(libxl_driver->lockManager, vm, l_disk->src) < 0) { @@ -3046,7 +3045,7 @@ libxlDomainAttachDeviceDiskLive(virDomainObj *vm, virDomainDeviceDef *dev) } else { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("disk bus '%s' cannot be hotplugged."), + _("disk bus '%1$s' cannot be hotplugged."), virDomainDiskBusTypeToString(l_disk->bus)); } break; @@ -3055,7 +3054,7 @@ libxlDomainAttachDeviceDiskLive(virDomainObj *vm, virDomainDeviceDef *dev) case VIR_DOMAIN_DISK_DEVICE_LAST: default: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("disk device type '%s' cannot be hotplugged"), + _("disk device type '%1$s' cannot be hotplugged"), virDomainDiskDeviceTypeToString(l_disk->device)); break; } @@ -3136,7 +3135,7 @@ libxlDomainAttachControllerDevice(libxlDriverPrivate *driver, if (controller->type != VIR_DOMAIN_CONTROLLER_TYPE_USB) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, - _("'%s' controller cannot be hot plugged."), + _("'%1$s' controller cannot be hot plugged."), type); goto cleanup; } @@ -3150,7 +3149,7 @@ libxlDomainAttachControllerDevice(libxlDriverPrivate *driver, if (virDomainControllerFind(vm->def, controller->type, controller->idx) >= 0) { virReportError(VIR_ERR_OPERATION_FAILED, - _("target %s:%d already exists"), + _("target %1$s:%2$d already exists"), type, controller->idx); goto cleanup; } @@ -3234,7 +3233,7 @@ libxlDomainAttachHostUSBDevice(libxlDriverPrivate *driver, if (libxl_device_usbdev_add(cfg->ctx, vm->def->id, &usbdev, 0) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("libxenlight failed to attach usb device Busnum:%3x, Devnum:%3x"), + _("libxenlight failed to attach usb device Busnum:%1$3x, Devnum:%2$3x"), hostdev->source.subsys.u.usb.bus, hostdev->source.subsys.u.usb.device); goto reattach; @@ -3261,7 +3260,7 @@ libxlDomainAttachHostDevice(libxlDriverPrivate *driver, { if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("hostdev mode '%s' not supported"), + _("hostdev mode '%1$s' not supported"), virDomainHostdevModeTypeToString(hostdev->mode)); return -1; } @@ -3279,7 +3278,7 @@ libxlDomainAttachHostDevice(libxlDriverPrivate *driver, default: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("hostdev subsys type '%s' not supported"), + _("hostdev subsys type '%1$s' not supported"), virDomainHostdevSubsysTypeToString(hostdev->source.subsys.type)); return -1; } @@ -3305,7 +3304,7 @@ libxlDomainDetachDeviceDiskLive(virDomainObj *vm, virDomainDeviceDef *dev) dev->data.disk->dst, false)) < 0) { virReportError(VIR_ERR_OPERATION_FAILED, - _("disk %s not found"), dev->data.disk->dst); + _("disk %1$s not found"), dev->data.disk->dst); goto cleanup; } @@ -3317,7 +3316,7 @@ libxlDomainDetachDeviceDiskLive(virDomainObj *vm, virDomainDeviceDef *dev) if ((ret = libxl_device_disk_remove(cfg->ctx, vm->def->id, &x_disk, NULL)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("libxenlight failed to detach disk '%s'"), + _("libxenlight failed to detach disk '%1$s'"), l_disk->dst); goto cleanup; } @@ -3332,7 +3331,7 @@ libxlDomainDetachDeviceDiskLive(virDomainObj *vm, virDomainDeviceDef *dev) } else { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("disk bus '%s' cannot be hot unplugged."), + _("disk bus '%1$s' cannot be hot unplugged."), virDomainDiskBusTypeToString(dev->data.disk->bus)); } break; @@ -3342,7 +3341,7 @@ libxlDomainDetachDeviceDiskLive(virDomainObj *vm, virDomainDeviceDef *dev) case VIR_DOMAIN_DISK_DEVICE_LAST: default: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("device type '%s' cannot hot unplugged"), + _("device type '%1$s' cannot hot unplugged"), virDomainDiskDeviceTypeToString(dev->data.disk->device)); break; } @@ -3390,7 +3389,7 @@ libxlDomainAttachNetDevice(libxlDriverPrivate *driver, if (virDomainHasNet(vm->def, net)) { virReportError(VIR_ERR_INVALID_ARG, - _("network device with mac %s already exists"), + _("network device with mac %1$s already exists"), virMacAddrFormat(&net->mac, mac)); goto cleanup; } @@ -3501,7 +3500,7 @@ libxlDomainAttachDeviceLive(libxlDriverPrivate *driver, case VIR_DOMAIN_DEVICE_AUDIO: case VIR_DOMAIN_DEVICE_CRYPTO: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("device type '%s' cannot be attached"), + _("device type '%1$s' cannot be attached"), virDomainDeviceTypeToString(dev->type)); break; } @@ -3524,7 +3523,7 @@ libxlDomainAttachDeviceConfig(virDomainDef *vmdef, virDomainDeviceDef *dev) disk = dev->data.disk; if (virDomainDiskIndexByName(vmdef, disk->dst, true) >= 0) { virReportError(VIR_ERR_INVALID_ARG, - _("target %s already exists."), disk->dst); + _("target %1$s already exists."), disk->dst); return -1; } virDomainDiskInsert(vmdef, disk); @@ -3550,7 +3549,7 @@ libxlDomainAttachDeviceConfig(virDomainDef *vmdef, virDomainDeviceDef *dev) net = dev->data.net; if (virDomainHasNet(vmdef, net)) { virReportError(VIR_ERR_INVALID_ARG, - _("network device with mac %s already exists"), + _("network device with mac %1$s already exists"), virMacAddrFormat(&net->mac, mac)); return -1; } @@ -3721,7 +3720,7 @@ libxlDomainDetachControllerDevice(libxlDriverPrivate *driver, if (controller->type != VIR_DOMAIN_CONTROLLER_TYPE_USB) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, - _("'%s' controller cannot be hot plugged."), + _("'%1$s' controller cannot be hot plugged."), type); goto cleanup; } @@ -3730,7 +3729,7 @@ libxlDomainDetachControllerDevice(libxlDriverPrivate *driver, controller->type, controller->idx)) < 0) { virReportError(VIR_ERR_OPERATION_FAILED, - _("controller %s:%d not found"), + _("controller %1$s:%2$d not found"), type, controller->idx); goto cleanup; } @@ -3779,7 +3778,7 @@ libxlDomainDetachHostUSBDevice(libxlDriverPrivate *driver, idx = virDomainHostdevFind(vm->def, hostdev, &detach); if (idx < 0) { virReportError(VIR_ERR_OPERATION_FAILED, - _("host USB device Busnum: %3x, Devnum: %3x not found"), + _("host USB device Busnum: %1$3x, Devnum: %2$3x not found"), usbsrc->bus, usbsrc->device); goto cleanup; } @@ -3797,15 +3796,14 @@ libxlDomainDetachHostUSBDevice(libxlDriverPrivate *driver, if (!found) { virReportError(VIR_ERR_OPERATION_FAILED, - _("host USB device Busnum: %3x, Devnum: %3x not found"), + _("host USB device Busnum: %1$3x, Devnum: %2$3x not found"), usbsrc->bus, usbsrc->device); goto cleanup; } if (libxl_device_usbdev_remove(cfg->ctx, vm->def->id, &usbdev, 0) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("libxenlight failed to detach USB device " - "Busnum: %3x, Devnum: %3x"), + _("libxenlight failed to detach USB device Busnum: %1$3x, Devnum: %2$3x"), usbsrc->bus, usbsrc->device); goto cleanup; } @@ -3833,7 +3831,7 @@ libxlDomainDetachHostDevice(libxlDriverPrivate *driver, if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("hostdev mode '%s' not supported"), + _("hostdev mode '%1$s' not supported"), virDomainHostdevModeTypeToString(hostdev->mode)); return -1; } @@ -3847,7 +3845,7 @@ libxlDomainDetachHostDevice(libxlDriverPrivate *driver, default: virReportError(VIR_ERR_INTERNAL_ERROR, - _("unexpected hostdev type %d"), subsys->type); + _("unexpected hostdev type %1$d"), subsys->type); break; } @@ -3973,7 +3971,7 @@ libxlDomainDetachDeviceLive(libxlDriverPrivate *driver, case VIR_DOMAIN_DEVICE_AUDIO: case VIR_DOMAIN_DEVICE_CRYPTO: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("device type '%s' cannot be detached"), + _("device type '%1$s' cannot be detached"), virDomainDeviceTypeToString(dev->type)); break; } @@ -3999,7 +3997,7 @@ libxlDomainDetachDeviceConfig(virDomainDef *vmdef, virDomainDeviceDef *dev) disk = dev->data.disk; if (!(detach = virDomainDiskRemoveByName(vmdef, disk->dst))) { virReportError(VIR_ERR_INVALID_ARG, - _("no target device %s"), disk->dst); + _("no target device %1$s"), disk->dst); return -1; } virDomainDiskDefFree(detach); @@ -4091,7 +4089,7 @@ libxlDomainUpdateDeviceLive(virDomainObj *vm, virDomainDeviceDef *dev) case VIR_DOMAIN_DISK_DEVICE_LAST: default: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("disk bus '%s' cannot be updated."), + _("disk bus '%1$s' cannot be updated."), virDomainDiskBusTypeToString(disk->bus)); break; } @@ -4125,7 +4123,7 @@ libxlDomainUpdateDeviceLive(virDomainObj *vm, virDomainDeviceDef *dev) case VIR_DOMAIN_DEVICE_AUDIO: case VIR_DOMAIN_DEVICE_CRYPTO: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("device type '%s' cannot be updated"), + _("device type '%1$s' cannot be updated"), virDomainDeviceTypeToString(dev->type)); break; } @@ -4144,7 +4142,7 @@ libxlDomainUpdateDeviceConfig(virDomainDef *vmdef, virDomainDeviceDef *dev) disk = dev->data.disk; if (!(orig = virDomainDiskByTarget(vmdef, disk->dst))) { virReportError(VIR_ERR_INVALID_ARG, - _("target %s doesn't exist."), disk->dst); + _("target %1$s doesn't exist."), disk->dst); return -1; } if (!(orig->device == VIR_DOMAIN_DISK_DEVICE_CDROM)) { @@ -4526,7 +4524,7 @@ libxlNodeGetCellsFreeMemory(virConnectPtr conn, /* Check/sanitize the cell range */ if (startCell >= nr_nodes) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("start cell %d out of range (0-%d)"), + _("start cell %1$d out of range (0-%2$d)"), startCell, nr_nodes - 1); goto cleanup; } @@ -4644,21 +4642,21 @@ libxlDomainSetAutostart(virDomainPtr dom, int autostart) if (autostart) { if (g_mkdir_with_parents(cfg->autostartDir, 0777) < 0) { virReportSystemError(errno, - _("cannot create autostart directory %s"), + _("cannot create autostart directory %1$s"), cfg->autostartDir); goto endjob; } if (symlink(configFile, autostartLink) < 0) { virReportSystemError(errno, - _("Failed to create symlink '%s to '%s'"), + _("Failed to create symlink '%1$s to '%2$s'"), autostartLink, configFile); goto endjob; } } else { if (unlink(autostartLink) < 0 && errno != ENOENT && errno != ENOTDIR) { virReportSystemError(errno, - _("Failed to delete symlink '%s'"), + _("Failed to delete symlink '%1$s'"), autostartLink); goto endjob; } @@ -4719,8 +4717,8 @@ libxlDomainGetSchedulerType(virDomainPtr dom, int *nparams) break; default: virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to get scheduler id for domain '%d'" - " with libxenlight"), vm->def->id); + _("Failed to get scheduler id for domain '%1$d' with libxenlight"), + vm->def->id); goto cleanup; } @@ -4769,8 +4767,8 @@ libxlDomainGetSchedulerParametersFlags(virDomainPtr dom, if (libxl_domain_sched_params_get(cfg->ctx, vm->def->id, &sc_info) != 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to get scheduler parameters for domain '%d'" - " with libxenlight"), vm->def->id); + _("Failed to get scheduler parameters for domain '%1$d' with libxenlight"), + vm->def->id); goto cleanup; } @@ -4846,8 +4844,8 @@ libxlDomainSetSchedulerParametersFlags(virDomainPtr dom, if (libxl_domain_sched_params_get(cfg->ctx, vm->def->id, &sc_info) != 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to get scheduler parameters for domain '%d'" - " with libxenlight"), vm->def->id); + _("Failed to get scheduler parameters for domain '%1$d' with libxenlight"), + vm->def->id); goto endjob; } @@ -4862,8 +4860,8 @@ libxlDomainSetSchedulerParametersFlags(virDomainPtr dom, if (libxl_domain_sched_params_set(cfg->ctx, vm->def->id, &sc_info) != 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to set scheduler parameters for domain '%d'" - " with libxenlight"), vm->def->id); + _("Failed to set scheduler parameters for domain '%1$d' with libxenlight"), + vm->def->id); goto endjob; } @@ -4921,14 +4919,14 @@ libxlDomainOpenConsole(virDomainPtr dom, if (!chr) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("cannot find character device %s"), + _("cannot find character device %1$s"), NULLSTR(dev_name)); goto cleanup; } if (chr->source->type != VIR_DOMAIN_CHR_TYPE_PTY) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("character device %s is not using a PTY"), + _("character device %1$s is not using a PTY"), dev_name ? dev_name : NULLSTR(chr->info.alias)); goto cleanup; } @@ -5045,7 +5043,7 @@ libxlDomainGetNumaParameters(virDomainPtr dom, libxl_for_each_set_bit(j, nodemap) { if (virBitmapSetBit(nodes, j)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Node %zu out of range"), j); + _("Node %1$zu out of range"), j); goto cleanup; } } @@ -5187,7 +5185,7 @@ libxlDomainGetTotalCPUStats(libxlDriverPrivate *driver, if (libxl_domain_info(cfg->ctx, &d_info, vm->def->id) != 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("libxl_domain_info failed for domain '%d'"), + _("libxl_domain_info failed for domain '%1$d'"), vm->def->id); goto cleanup; } @@ -5227,7 +5225,7 @@ libxlDomainGetPerCPUStats(libxlDriverPrivate *driver, if ((vcpuinfo = libxl_list_vcpu(cfg->ctx, vm->def->id, &maxcpu, &hostcpus)) == NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to list vcpus for domain '%d' with libxenlight"), + _("Failed to list vcpus for domain '%1$d' with libxenlight"), vm->def->id); goto cleanup; } @@ -5322,7 +5320,7 @@ libxlDomainMemoryStats(virDomainPtr dom, if (libxl_domain_info(cfg->ctx, &d_info, vm->def->id) != 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("libxl_domain_info failed for domain '%d'"), + _("libxl_domain_info failed for domain '%1$d'"), vm->def->id); goto endjob; } @@ -5556,7 +5554,7 @@ libxlDomainBlockStatsVBD(virDomainObj *vm, if ((virFileReadAll(name, 256, &val) < 0) || \ (sscanf(val, "%llu", &status) != 1)) { \ virReportError(VIR_ERR_OPERATION_FAILED, \ - _("cannot read %s"), name); \ + _("cannot read %1$s"), name); \ goto cleanup; \ } \ VAR += (status * MUL); \ @@ -5605,7 +5603,7 @@ libxlDomainBlockStatsGatherSingle(virDomainObj *vm, if (!(disk = virDomainDiskByName(vm->def, path, false))) { virReportError(VIR_ERR_OPERATION_INVALID, - _("invalid path: %s"), path); + _("invalid path: %1$s"), path); return ret; } @@ -5616,7 +5614,7 @@ libxlDomainBlockStatsGatherSingle(virDomainObj *vm, if (STREQ(disk_drv, "phy")) { if (disk_fmt != VIR_STORAGE_FILE_RAW) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, - _("unsupported format %s"), + _("unsupported format %1$s"), virStorageFileFormatTypeToString(disk_fmt)); return ret; } @@ -5624,7 +5622,7 @@ libxlDomainBlockStatsGatherSingle(virDomainObj *vm, ret = libxlDomainBlockStatsVBD(vm, disk->dst, stats); } else { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, - _("unsupported disk driver %s"), + _("unsupported disk driver %1$s"), disk_drv); } return ret; @@ -5847,7 +5845,7 @@ libxlConnectSupportsFeature(virConnectPtr conn, int feature) case VIR_DRV_FEATURE_NETWORK_UPDATE_HAS_CORRECT_ORDER: case VIR_DRV_FEATURE_FD_PASSING: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Global feature %d should have already been handled"), + _("Global feature %1$d should have already been handled"), feature); return -1; case VIR_DRV_FEATURE_MIGRATION_V3: @@ -5880,7 +5878,7 @@ libxlNodeDeviceDetachFlags(virNodeDevicePtr dev, if (STRNEQ(driverName, "xen")) { virReportError(VIR_ERR_INVALID_ARG, - _("unsupported driver name '%s'"), driverName); + _("unsupported driver name '%1$s'"), driverName); return -1; } @@ -6164,8 +6162,7 @@ libxlDomainMigrateFinish3Params(virConnectPtr dconn, !(vm = virDomainObjListFindByName(driver->domains, dname))) { /* Migration obviously failed if the domain doesn't exist */ virReportError(VIR_ERR_OPERATION_FAILED, - _("Migration failed. No domain on destination host " - "with matching name '%s'"), + _("Migration failed. No domain on destination host with matching name '%1$s'"), NULLSTR(dname)); return NULL; } @@ -6338,7 +6335,7 @@ libxlDomainInterfaceAddresses(virDomainPtr dom, default: virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, - _("Unsupported IP address data source %d"), + _("Unsupported IP address data source %1$d"), source); break; } @@ -6374,21 +6371,21 @@ libxlConnectGetDomainCapabilities(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_XEN) { 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; } diff --git a/src/libxl/libxl_migration.c b/src/libxl/libxl_migration.c index 0867194d9e..961815f9f7 100644 --- a/src/libxl/libxl_migration.c +++ b/src/libxl/libxl_migration.c @@ -471,7 +471,7 @@ libxlDomainMigrationPrepareAny(virConnectPtr dconn, if ((*mig)->xenMigStreamVer > LIBXL_SAVE_VERSION) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, - _("Xen migration stream version '%d' is not supported on this host"), + _("Xen migration stream version '%1$d' is not supported on this host"), (*mig)->xenMigStreamVer); return -1; } @@ -702,14 +702,14 @@ libxlDomainMigrationDstPrepare(virConnectPtr dconn, if (uri == NULL) { virReportError(VIR_ERR_INVALID_ARG, - _("unable to parse URI: %s"), + _("unable to parse URI: %1$s"), uri_in); goto endjob; } if (uri->server == NULL) { virReportError(VIR_ERR_INVALID_ARG, - _("missing host in migration URI: %s"), + _("missing host in migration URI: %1$s"), uri_in); goto endjob; } diff --git a/src/libxl/xen_common.c b/src/libxl/xen_common.c index f61719adac..d5a0399613 100644 --- a/src/libxl/xen_common.c +++ b/src/libxl/xen_common.c @@ -59,7 +59,7 @@ xenConfigGetBool(virConf *conf, *value = STREQ(val->str, "1") ? 1 : 0; } else { virReportError(VIR_ERR_INTERNAL_ERROR, - _("config value %s was malformed"), name); + _("config value %1$s was malformed"), name); return -1; } return 0; @@ -88,12 +88,12 @@ xenConfigGetULong(virConf *conf, } else if (val->type == VIR_CONF_STRING) { if (virStrToLong_ul(val->str, NULL, 10, value) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("config value %s was malformed"), name); + _("config value %1$s was malformed"), name); return -1; } } else { virReportError(VIR_ERR_INTERNAL_ERROR, - _("config value %s was malformed"), name); + _("config value %1$s was malformed"), name); return -1; } return 0; @@ -122,12 +122,12 @@ xenConfigGetULongLong(virConf *conf, } else if (val->type == VIR_CONF_STRING) { if (virStrToLong_ull(val->str, NULL, 10, value) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("config value %s was malformed"), name); + _("config value %1$s was malformed"), name); return -1; } } else { virReportError(VIR_ERR_INTERNAL_ERROR, - _("config value %s was malformed"), name); + _("config value %1$s was malformed"), name); return -1; } return 0; @@ -150,7 +150,7 @@ xenConfigCopyStringInternal(virConf *conf, if (allowMissing) return 0; virReportError(VIR_ERR_INTERNAL_ERROR, - _("config value %s was missing"), name); + _("config value %1$s was missing"), name); return -1; } @@ -203,13 +203,13 @@ xenConfigGetUUID(virConf *conf, const char *name, unsigned char *uuid) if (!string) { virReportError(VIR_ERR_CONF_SYNTAX, - _("%s can't be empty"), name); + _("%1$s can't be empty"), name); return -1; } if (virUUIDParse(string, uuid) < 0) { virReportError(VIR_ERR_CONF_SYNTAX, - _("%s not parseable"), string); + _("%1$s not parseable"), string); return -1; } @@ -249,7 +249,7 @@ xenConfigSetInt(virConf *conf, const char *setting, long long l) virConfValue *value = NULL; if ((long)l != l) { - virReportError(VIR_ERR_OVERFLOW, _("failed to store %lld to %s"), + virReportError(VIR_ERR_OVERFLOW, _("failed to store %1$lld to %2$s"), l, setting); return -1; } @@ -340,7 +340,7 @@ xenParseEventsActions(virConf *conf, virDomainDef *def) if ((def->onPoweroff = virDomainLifecycleActionTypeFromString(on_poweroff)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unexpected value %s for on_poweroff"), on_poweroff); + _("unexpected value %1$s for on_poweroff"), on_poweroff); return -1; } @@ -349,7 +349,7 @@ xenParseEventsActions(virConf *conf, virDomainDef *def) if ((def->onReboot = virDomainLifecycleActionTypeFromString(on_reboot)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unexpected value %s for on_reboot"), on_reboot); + _("unexpected value %1$s for on_reboot"), on_reboot); return -1; } @@ -358,7 +358,7 @@ xenParseEventsActions(virConf *conf, virDomainDef *def) if ((def->onCrash = virDomainLifecycleActionTypeFromString(on_crash)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unexpected value %s for on_crash"), on_crash); + _("unexpected value %1$s for on_crash"), on_crash); return -1; } @@ -401,7 +401,7 @@ xenParsePCI(char *entry) str = tokens[nexttoken]; if (!(nextstr = strchr(str, '.'))) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Malformed PCI address %s"), str); + _("Malformed PCI address %1$s"), str); return NULL; } *nextstr = '\0'; @@ -427,7 +427,7 @@ xenParsePCI(char *entry) if (!(val = strchr(options[i], '='))) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Malformed PCI options %s"), str); + _("Malformed PCI options %1$s"), str); return NULL; } *val = '\0'; @@ -587,7 +587,7 @@ xenParseHypervisorFeatures(virConf *conf, virDomainDef *def) def->xen_passthrough_mode = VIR_DOMAIN_XEN_PASSTHROUGH_MODE_SHARE_PT; } else { virReportError(VIR_ERR_CONF_SYNTAX, - _("Invalid passthrough mode %s"), passthrough); + _("Invalid passthrough mode %1$s"), passthrough); } } @@ -711,7 +711,7 @@ xenParseVfb(virConf *conf, virDomainDef *def) if (virStrcpyStatic(vfb, *vfbs) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("VFB %s too big for destination"), + _("VFB %1$s too big for destination"), *vfbs); goto cleanup; } @@ -745,7 +745,7 @@ xenParseVfb(virConf *conf, virDomainDef *def) if (virStrToLong_i(key + 11, NULL, 10, &graphics->data.vnc.port) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("invalid vncdisplay value '%s'"), + _("invalid vncdisplay value '%1$s'"), key + 11); goto cleanup; } @@ -826,7 +826,7 @@ xenParseSxprChar(const char *value, } else { if ((def->source->type = virDomainChrTypeFromString(prefix)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unknown chr device type '%s'"), prefix); + _("unknown chr device type '%1$s'"), prefix); goto error; } } @@ -1095,19 +1095,19 @@ xenParseSxprVifRate(const char *rate, unsigned long long *kbytes_per_sec) regex = g_regex_new(vif_bytes_per_sec_re, 0, 0, &err); if (!regex) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to compile regex %s"), err->message); + _("Failed to compile regex %1$s"), err->message); return -1; } if (!g_regex_match(regex, trate, 0, NULL)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Invalid rate '%s' specified"), rate); + _("Invalid rate '%1$s' specified"), rate); return -1; } if (virStrToLong_ull(rate, &suffix, 10, &tmp)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to parse rate '%s'"), rate); + _("Failed to parse rate '%1$s'"), rate); return -1; } @@ -1178,7 +1178,7 @@ xenParseVif(char *entry, const char *vif_typename) if (mac) { if (virMacAddrParse(mac, &net->mac) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("malformed mac address '%s'"), mac); + _("malformed mac address '%1$s'"), mac); goto cleanup; } } @@ -1376,7 +1376,7 @@ xenParseGeneralMeta(virConf *conf, virDomainDef *def, virCaps *caps) def->os.type = VIR_DOMAIN_OSTYPE_HVM; } else { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("type %s is not supported"), str); + _("type %1$s is not supported"), str); return -1; } } else { @@ -1439,7 +1439,7 @@ xenParseConfigCommon(virConf *conf, return -1; } else { virReportError(VIR_ERR_INVALID_ARG, - _("unsupported config type %s"), nativeFormat); + _("unsupported config type %1$s"), nativeFormat); return -1; } @@ -1527,7 +1527,7 @@ xenFormatSxprChr(virDomainChrDef *def, default: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unsupported chr device type '%s'"), type); + _("unsupported chr device type '%1$s'"), type); return -1; } @@ -1657,7 +1657,7 @@ xenFormatNet(virConnectPtr conn, virObjectUnref(network); if (!bridge) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("network %s is not active"), + _("network %1$s is not active"), net->data.network.name); return -1; } @@ -1679,7 +1679,7 @@ xenFormatNet(virConnectPtr conn, case VIR_DOMAIN_NET_TYPE_VDPA: case VIR_DOMAIN_NET_TYPE_NULL: case VIR_DOMAIN_NET_TYPE_VDS: - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unsupported net type '%s'"), + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unsupported net type '%1$s'"), virDomainNetTypeToString(net->type)); return -1; @@ -1859,7 +1859,7 @@ xenFormatTimeOffset(virConf *conf, virDomainDef *def) break; default: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unsupported clock offset='%s'"), + _("unsupported clock offset='%1$s'"), virDomainClockOffsetTypeToString(def->clock.offset)); return -1; } @@ -1876,7 +1876,7 @@ xenFormatTimeOffset(virConf *conf, virDomainDef *def) break; default: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unsupported clock offset='%s'"), + _("unsupported clock offset='%1$s'"), virDomainClockOffsetTypeToString(def->clock.offset)); return -1; } @@ -1896,7 +1896,7 @@ xenFormatEventActions(virConf *conf, virDomainDef *def) if (!(lifecycle = virDomainLifecycleActionTypeToString(def->onPoweroff))) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unexpected lifecycle action %d"), def->onPoweroff); + _("unexpected lifecycle action %1$d"), def->onPoweroff); return -1; } if (xenConfigSetString(conf, "on_poweroff", lifecycle) < 0) @@ -1905,7 +1905,7 @@ xenFormatEventActions(virConf *conf, virDomainDef *def) if (!(lifecycle = virDomainLifecycleActionTypeToString(def->onReboot))) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unexpected lifecycle action %d"), def->onReboot); + _("unexpected lifecycle action %1$d"), def->onReboot); return -1; } if (xenConfigSetString(conf, "on_reboot", lifecycle) < 0) @@ -1914,7 +1914,7 @@ xenFormatEventActions(virConf *conf, virDomainDef *def) if (!(lifecycle = virDomainLifecycleActionTypeToString(def->onCrash))) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unexpected lifecycle action %d"), def->onCrash); + _("unexpected lifecycle action %1$d"), def->onCrash); return -1; } if (xenConfigSetString(conf, "on_crash", lifecycle) < 0) @@ -2122,7 +2122,7 @@ xenFormatHypervisorFeatures(virConf *conf, virDomainDef *def) return -1; } else { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unsupported timer type (name) '%s'"), + _("unsupported timer type (name) '%1$s'"), virDomainTimerNameTypeToString(def->clock.timers[i]->name)); return -1; } @@ -2135,7 +2135,7 @@ xenFormatHypervisorFeatures(virConf *conf, virDomainDef *def) case VIR_DOMAIN_TIMER_NAME_PIT: case VIR_DOMAIN_TIMER_NAME_ARMVTIMER: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unsupported timer type (name) '%s'"), + _("unsupported timer type (name) '%1$s'"), virDomainTimerNameTypeToString(def->clock.timers[i]->name)); return -1; @@ -2284,7 +2284,7 @@ xenFormatSound(virConf *conf, virDomainDef *def) for (i = 0; i < def->nsounds; i++) { if (!(model = virDomainSoundModelTypeToString(def->sounds[i]->model))) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unexpected sound model %d"), + _("unexpected sound model %1$d"), def->sounds[i]->model); return -1; } @@ -2368,7 +2368,7 @@ xenFormatConfigCommon(virConf *conf, return -1; } else { virReportError(VIR_ERR_INVALID_ARG, - _("unsupported config type %s"), nativeFormat); + _("unsupported config type %1$s"), nativeFormat); return -1; } diff --git a/src/libxl/xen_xl.c b/src/libxl/xen_xl.c index cfd56b3b05..d5076f2438 100644 --- a/src/libxl/xen_xl.c +++ b/src/libxl/xen_xl.c @@ -274,7 +274,7 @@ xenParseXLCPUID(virConf *conf, virDomainDef *def) if (STRNEQ(cpuid_pairs[0], "host")) { virReportError(VIR_ERR_CONF_SYNTAX, - _("cpuid starting with %s is not supported, only libxl format is"), + _("cpuid starting with %1$s is not supported, only libxl format is"), cpuid_pairs[0]); return -1; } @@ -285,7 +285,7 @@ xenParseXLCPUID(virConf *conf, virDomainDef *def) return -1; if (!name_and_value[0] || !name_and_value[1]) { virReportError(VIR_ERR_CONF_SYNTAX, - _("Invalid libxl cpuid key=value element: %s"), + _("Invalid libxl cpuid key=value element: %1$s"), cpuid_pairs[i]); return -1; } @@ -301,7 +301,7 @@ xenParseXLCPUID(virConf *conf, virDomainDef *def) policy = VIR_CPU_FEATURE_OPTIONAL; } else { virReportError(VIR_ERR_CONF_SYNTAX, - _("Invalid libxl cpuid value: %s"), + _("Invalid libxl cpuid value: %1$s"), cpuid_pairs[i]); return -1; } @@ -434,7 +434,7 @@ xenParseXLVnuma(virConf *conf, if (!str || !(data = strrchr(str, '='))) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("vnuma vnode invalid format '%s'"), + _("vnuma vnode invalid format '%1$s'"), str); return -1; } @@ -447,7 +447,7 @@ xenParseXLVnuma(virConf *conf, if ((virStrToLong_ui(data, NULL, 10, &cellid) < 0) || (cellid >= nr_nodes)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("vnuma vnode %zu contains invalid pnode value '%s'"), + _("vnuma vnode %1$zu contains invalid pnode value '%2$s'"), vnodeCnt, data); return -1; } @@ -477,7 +477,7 @@ xenParseXLVnuma(virConf *conf, if (ndistances != nr_nodes) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("vnuma pnode %d configured '%s' (count %zu) doesn't fit the number of specified vnodes %zu"), + _("vnuma pnode %1$d configured '%2$s' (count %3$zu) doesn't fit the number of specified vnodes %4$zu"), pnode, str, ndistances, nr_nodes); return -1; } @@ -493,7 +493,7 @@ xenParseXLVnuma(virConf *conf, } else { virReportError(VIR_ERR_CONF_SYNTAX, - _("Invalid vnuma configuration for vnode %zu"), + _("Invalid vnuma configuration for vnode %1$zu"), vnodeCnt); return -1; } @@ -506,7 +506,7 @@ xenParseXLVnuma(virConf *conf, (cpumask == NULL) || (kbsize == 0)) { virReportError(VIR_ERR_CONF_SYNTAX, - _("Incomplete vnuma configuration for vnode %zu"), + _("Incomplete vnuma configuration for vnode %1$zu"), vnodeCnt); return -1; } @@ -520,7 +520,7 @@ xenParseXLVnuma(virConf *conf, if (def->maxvcpus < vcpus) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("vnuma configuration contains %zu vcpus, which is greater than %zu maxvcpus"), + _("vnuma configuration contains %1$zu vcpus, which is greater than %2$zu maxvcpus"), vcpus, def->maxvcpus); return -1; } @@ -693,7 +693,7 @@ xenParseXLDisk(virConf *conf, virDomainDef *def) default: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("disk image format not supported: %s"), + _("disk image format not supported: %1$s"), libxl_disk_format_to_string(libxldisk.format)); goto fail; } @@ -720,7 +720,7 @@ xenParseXLDisk(virConf *conf, virDomainDef *def) #endif default: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("disk backend not supported: %s"), + _("disk backend not supported: %1$s"), libxl_disk_backend_to_string(libxldisk.backend)); goto fail; } @@ -770,7 +770,7 @@ xenParseXLInputDevs(virConf *conf, virDomainDef *def) while (val) { if (val->type != VIR_CONF_STRING) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("config value %s was malformed"), + _("config value %1$s was malformed"), "usbdevice"); return -1; } @@ -1448,14 +1448,14 @@ xenFormatXLDiskSrcNet(virStorageSource *src) case VIR_STORAGE_NET_PROTOCOL_LAST: case VIR_STORAGE_NET_PROTOCOL_NONE: virReportError(VIR_ERR_NO_SUPPORT, - _("Unsupported network block protocol '%s'"), + _("Unsupported network block protocol '%1$s'"), virStorageNetProtocolTypeToString(src->protocol)); return NULL; case VIR_STORAGE_NET_PROTOCOL_RBD: if (strchr(src->path, ':')) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("':' not allowed in RBD source volume name '%s'"), + _("':' not allowed in RBD source volume name '%1$s'"), src->path); return NULL; } diff --git a/src/libxl/xen_xm.c b/src/libxl/xen_xm.c index 334de071ba..0031d6cbc6 100644 --- a/src/libxl/xen_xm.c +++ b/src/libxl/xen_xm.c @@ -186,7 +186,7 @@ xenParseXMDisk(char *entry, int hvm) VIR_FREE(driverType); if (virDomainDiskGetFormat(disk) <= 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unknown driver type %s"), + _("Unknown driver type %1$s"), src); goto error; } @@ -297,7 +297,7 @@ xenFormatXMDisk(virConfValue *list, break; default: virReportError(VIR_ERR_INTERNAL_ERROR, - _("unsupported disk type %s"), + _("unsupported disk type %1$s"), virStorageTypeToString(virDomainDiskGetType(disk))); return -1; } -- 2.39.2

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com&gt; --- src/logging/log_cleaner.c | 2 +- src/logging/log_daemon.c | 26 +++++++++++++------------- src/logging/log_daemon_dispatch.c | 2 +- src/logging/log_handler.c | 4 ++-- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/logging/log_cleaner.c b/src/logging/log_cleaner.c index 38f818f177..4ee91843aa 100644 --- a/src/logging/log_cleaner.c +++ b/src/logging/log_cleaner.c @@ -87,7 +87,7 @@ virLogCleanerParseFilename(const char *path, if (virStrToLong_i(rotated_index_str, NULL, 10, rotated_index) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to parse rotated index from '%s'"), + _("Failed to parse rotated index from '%1$s'"), rotated_index_str); return NULL; } diff --git a/src/logging/log_daemon.c b/src/logging/log_daemon.c index b4db585810..daf7ef4b2f 100644 --- a/src/logging/log_daemon.c +++ b/src/logging/log_daemon.c @@ -190,7 +190,7 @@ virLogDaemonNewServerPostExecRestart(virNetDaemon *dmn, dmn); } else { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unexpected server name '%s' during restart"), + _("Unexpected server name '%1$s' during restart"), name); return NULL; } @@ -336,14 +336,14 @@ virLogDaemonClientNew(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; @@ -518,7 +518,7 @@ virLogDaemonPreExecRestart(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; } @@ -540,7 +540,7 @@ virLogDaemonUsage(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" @@ -559,13 +559,13 @@ virLogDaemonUsage(const char *argv0, bool privileged) " Default paths:\n" "\n" " Configuration file (unless overridden by -f):\n" - " %s/libvirt/virtlogd.conf\n" + " %1$s/libvirt/virtlogd.conf\n" "\n" " Sockets:\n" - " %s/libvirt/virtlogd-sock\n" + " %2$s/libvirt/virtlogd-sock\n" "\n" " PID file (unless overridden by -p):\n" - " %s/virtlogd.pid\n" + " %3$s/virtlogd.pid\n" "\n"), SYSCONFDIR, RUNSTATEDIR, @@ -625,7 +625,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); } @@ -705,7 +705,7 @@ int main(int argc, char **argv) { /* Read the config file if it exists */ if (remote_config_file && virLogDaemonConfigLoadFile(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); } @@ -764,7 +764,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); @@ -790,13 +790,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/logging/log_daemon_dispatch.c b/src/logging/log_daemon_dispatch.c index f7448155fc..f1c8163cca 100644 --- a/src/logging/log_daemon_dispatch.c +++ b/src/logging/log_daemon_dispatch.c @@ -117,7 +117,7 @@ virLogManagerProtocolDispatchDomainReadLogFile(virNetServer *server G_GNUC_UNUSE if (args->maxlen > VIR_LOG_MANAGER_PROTOCOL_STRING_MAX) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Requested data len %llu is larger than maximum %d"), + _("Requested data len %1$llu is larger than maximum %2$d"), (unsigned long long)args->maxlen, VIR_LOG_MANAGER_PROTOCOL_STRING_MAX); goto cleanup; diff --git a/src/logging/log_handler.c b/src/logging/log_handler.c index a739211c7c..71517bbbe5 100644 --- a/src/logging/log_handler.c +++ b/src/logging/log_handler.c @@ -354,7 +354,7 @@ virLogHandlerDomainOpenLogFile(virLogHandler *handler, if (STREQ(virRotatingFileWriterGetPath(handler->files[i]->file), path)) { virReportSystemError(EBUSY, - _("Cannot open log file: '%s'"), + _("Cannot open log file: '%1$s'"), path); goto error; } @@ -471,7 +471,7 @@ virLogHandlerDomainGetLogFilePosition(virLogHandler *handler, if (!file) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("No open log file %s"), + _("No open log file %1$s"), path); goto cleanup; } -- 2.39.2

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com&gt; --- src/network/bridge_driver.c | 188 +++++++++++------------------- src/network/bridge_driver_conf.c | 2 +- src/network/bridge_driver_linux.c | 12 +- src/network/leaseshelper.c | 12 +- 4 files changed, 81 insertions(+), 133 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 3fa56bfc09..97e099880b 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -248,7 +248,7 @@ networkObjFromNetwork(virNetworkPtr net) if (!obj) { virUUIDFormat(net->uuid, uuidstr); virReportError(VIR_ERR_NO_NETWORK, - _("no network with matching uuid '%s' (%s)"), + _("no network with matching uuid '%1$s' (%2$s)"), uuidstr, net->name); } @@ -827,7 +827,7 @@ networkConnectSupportsFeature(virConnectPtr conn, int feature) case VIR_DRV_FEATURE_NETWORK_UPDATE_HAS_CORRECT_ORDER: case VIR_DRV_FEATURE_FD_PASSING: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Global feature %d should have already been handled"), + _("Global feature %1$d should have already been handled"), feature); return -1; case VIR_DRV_FEATURE_MIGRATION_V2: @@ -937,8 +937,7 @@ networkDnsmasqConfLocalPTRs(virBuffer *buf, if (rc == -2) { int family = VIR_SOCKET_ADDR_FAMILY(&ip->address); virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("PTR domain for %s network with prefix %u " - "cannot be automatically created"), + _("PTR domain for %1$s network with prefix %2$u cannot be automatically created"), (family == AF_INET) ? "IPv4" : "IPv6", virNetworkIPDefPrefix(ip)); } @@ -968,7 +967,7 @@ networkDnsmasqConfDHCP(virBuffer *buf, prefix = virNetworkIPDefPrefix(ipdef); if (prefix < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("bridge '%s' has an invalid prefix"), + _("bridge '%1$s' has an invalid prefix"), bridge); return -1; } @@ -993,8 +992,7 @@ networkDnsmasqConfDHCP(virBuffer *buf, if (virSocketAddrPrefixToNetmask(prefix, &netmask, AF_INET) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to translate bridge '%s' " - "prefix %d to netmask"), + _("Failed to translate bridge '%1$s' prefix %2$d to netmask"), bridge, prefix); return -1; } @@ -1247,15 +1245,13 @@ networkDnsmasqConfContents(virNetworkObj *obj, */ if (!dns->srvs[i].service) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Missing required 'service' " - "attribute in SRV record of network '%s'"), + _("Missing required 'service' attribute in SRV record of network '%1$s'"), def->name); return -1; } if (!dns->srvs[i].protocol) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Missing required 'service' " - "attribute in SRV record of network '%s'"), + _("Missing required 'service' attribute in SRV record of network '%1$s'"), def->name); return -1; } @@ -1433,7 +1429,7 @@ networkBuildDhcpDaemonCommandLine(virNetworkDriverState *driver, /* Write the file */ if (virFileWriteStr(configfile, configstr, 0600) < 0) { virReportSystemError(errno, - _("couldn't write dnsmasq config file '%s'"), + _("couldn't write dnsmasq config file '%1$s'"), configfile); return -1; } @@ -1487,7 +1483,7 @@ networkStartDhcpDaemon(virNetworkDriverState *driver, return 0; if (g_mkdir_with_parents(cfg->pidDir, 0777) < 0) { - virReportSystemError(errno, _("cannot create directory %s"), cfg->pidDir); + virReportSystemError(errno, _("cannot create directory %1$s"), cfg->pidDir); return -1; } @@ -1496,7 +1492,7 @@ networkStartDhcpDaemon(virNetworkDriverState *driver, if (g_mkdir_with_parents(cfg->dnsmasqStateDir, 0777) < 0) { virReportSystemError(errno, - _("cannot create directory %s"), + _("cannot create directory %1$s"), cfg->dnsmasqStateDir); return -1; } @@ -1778,7 +1774,7 @@ networkSetIPv6Sysctl(const char *bridge, if (virFileWriteStr(field, sysctl_setting, 0) < 0) { virReportSystemError(errno, - _("cannot write to '%s' on bridge '%s'"), + _("cannot write to '%1$s' on bridge '%2$s'"), field, bridge); return -1; } @@ -1839,7 +1835,7 @@ networkAddAddrToBridge(virNetworkObj *obj, if (prefix < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("bridge '%s' has an invalid netmask or IP address"), + _("bridge '%1$s' has an invalid netmask or IP address"), def->bridge); return -1; } @@ -1879,8 +1875,7 @@ networkAddRouteToBridge(virNetworkObj *obj, if (prefix < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("network '%s' has an invalid netmask " - "or IP address in route definition"), + _("network '%1$s' has an invalid netmask or IP address in route definition"), def->name); return -1; } @@ -1922,7 +1917,7 @@ networkStartNetworkVirtual(virNetworkDriverState *driver, * conscience, log an error and fail at this point. */ virReportError(VIR_ERR_INTERNAL_ERROR, - _("network '%s' has no bridge name defined"), + _("network '%1$s' has no bridge name defined"), def->name); return -1; } @@ -2148,7 +2143,7 @@ networkCreateInterfacePool(virNetworkDef *netdef) if (virNetDevGetVirtualFunctions(netdef->forward.pfs->dev, &vfs) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not get Virtual functions on %s"), + _("Could not get Virtual functions on %1$s"), netdef->forward.pfs->dev); goto cleanup; } @@ -2207,7 +2202,7 @@ networkCreateInterfacePool(virNetworkDef *netdef) * failure */ virReportError(VIR_ERR_INTERNAL_ERROR, - _("No usable Vf's present on SRIOV PF %s"), + _("No usable Vf's present on SRIOV PF %1$s"), netdef->forward.pfs->dev); goto cleanup; } @@ -2431,7 +2426,7 @@ networkLookupByUUID(virConnectPtr conn, char uuidstr[VIR_UUID_STRING_BUFLEN]; virUUIDFormat(uuid, uuidstr); virReportError(VIR_ERR_NO_NETWORK, - _("no network with matching uuid '%s'"), + _("no network with matching uuid '%1$s'"), uuidstr); goto cleanup; } @@ -2460,7 +2455,7 @@ networkLookupByName(virConnectPtr conn, obj = virNetworkObjFindByName(driver->networks, name); if (!obj) { virReportError(VIR_ERR_NO_NETWORK, - _("no network with matching name '%s'"), name); + _("no network with matching name '%1$s'"), name); goto cleanup; } def = virNetworkObjGetDef(obj); @@ -2670,7 +2665,7 @@ networkFindUnusedBridgeName(virNetworkObjList *nets, } while (++id <= MAX_BRIDGE_ID); virReportError(VIR_ERR_INTERNAL_ERROR, - _("Bridge generation exceeded max id %d"), + _("Bridge generation exceeded max id %1$d"), MAX_BRIDGE_ID); return -1; } @@ -2692,7 +2687,7 @@ networkBridgeNameValidate(virNetworkObjList *nets, if (def->bridge && !strstr(def->bridge, "%d")) { if (virNetworkObjBridgeInUse(nets, def->bridge, def->name)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("bridge name '%s' already in use."), + _("bridge name '%1$s' already in use."), def->bridge); return -1; } @@ -2755,32 +2750,28 @@ networkValidate(virNetworkDriverState *driver, */ if (def->mac_specified) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Unsupported <mac> element in network %s " - "with forward mode='%s'"), + _("Unsupported <mac> element in network %1$s with forward mode='%2$s'"), def->name, virNetworkForwardTypeToString(def->forward.type)); return -1; } if (virNetworkDefGetIPByIndex(def, AF_UNSPEC, 0)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Unsupported <ip> element in network %s " - "with forward mode='%s'"), + _("Unsupported <ip> element in network %1$s with forward mode='%2$s'"), def->name, virNetworkForwardTypeToString(def->forward.type)); return -1; } if (def->dns.ntxts || def->dns.nhosts || def->dns.nsrvs) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Unsupported <dns> element in network %s " - "with forward mode='%s'"), + _("Unsupported <dns> element in network %1$s with forward mode='%2$s'"), def->name, virNetworkForwardTypeToString(def->forward.type)); return -1; } if (def->domain) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Unsupported <domain> element in network %s " - "with forward mode='%s'"), + _("Unsupported <domain> element in network %1$s with forward mode='%2$s'"), def->name, virNetworkForwardTypeToString(def->forward.type)); return -1; @@ -2796,8 +2787,7 @@ networkValidate(virNetworkDriverState *driver, if (def->bandwidth && !bandwidthAllowed) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Unsupported network-wide <bandwidth> element " - "in network %s with forward mode='%s'"), + _("Unsupported network-wide <bandwidth> element in network %1$s with forward mode='%2$s'"), def->name, virNetworkForwardTypeToString(def->forward.type)); return -1; @@ -2825,11 +2815,7 @@ networkValidate(virNetworkDriverState *driver, if (def->forward.type == VIR_NETWORK_FORWARD_HOSTDEV) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("hostdev network '%s' lists '%s' " - "in the device pool, but hostdev " - "networks require all devices to " - "be listed by PCI address, not " - "network device name"), + _("hostdev network '%1$s' lists '%2$s' in the device pool, but hostdev networks require all devices to be listed by PCI address, not network device name"), def->name, iface->device.dev); return -1; } @@ -2840,11 +2826,7 @@ networkValidate(virNetworkDriverState *driver, if (def->forward.type != VIR_NETWORK_FORWARD_HOSTDEV) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("network '%s' has forward mode '%s' " - " but lists a device by PCI address " - "in the device pool. This is only " - "supported for networks with forward " - "mode 'hostdev'"), + _("network '%1$s' has forward mode '%2$s' but lists a device by PCI address in the device pool. This is only supported for networks with forward mode 'hostdev'"), def->name, virNetworkForwardTypeToString(def->forward.type)); return -1; @@ -2855,8 +2837,7 @@ networkValidate(virNetworkDriverState *driver, if (!virPCIIsVirtualFunction(sysfs_path)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("device '%s' in network '%s' is not " - "an SR-IOV Virtual Function"), + _("device '%1$s' in network '%2$s' is not an SR-IOV Virtual Function"), sysfs_path, def->name); return -1; } @@ -2870,8 +2851,7 @@ networkValidate(virNetworkDriverState *driver, } if ((def->forward.npfs > 0) + usesInterface + usesAddress > 1) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("<address>, <interface>, and <pf> elements of " - "<forward> in network %s are mutually exclusive"), + _("<address>, <interface>, and <pf> elements of <forward> in network %1$s are mutually exclusive"), def->name); return -1; } @@ -2944,9 +2924,7 @@ networkValidate(virNetworkDriverState *driver, if (def->portGroups[i].isDefault) { if (defaultPortGroup) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("network '%s' has multiple default " - "<portgroup> elements (%s and %s), " - "but only one default is allowed"), + _("network '%1$s' has multiple default <portgroup> elements (%2$s and %3$s), but only one default is allowed"), def->name, defaultPortGroup->name, def->portGroups[i].name); return -1; @@ -2956,16 +2934,14 @@ networkValidate(virNetworkDriverState *driver, for (j = i + 1; j < def->nPortGroups; j++) { if (STREQ(def->portGroups[i].name, def->portGroups[j].name)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("multiple <portgroup> elements with the " - "same name (%s) in network '%s'"), + _("multiple <portgroup> elements with the same name (%1$s) in network '%2$s'"), def->portGroups[i].name, def->name); return -1; } } if (def->portGroups[i].bandwidth && !bandwidthAllowed) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Unsupported <bandwidth> element in network '%s' " - "in portgroup '%s' with forward mode='%s'"), + _("Unsupported <bandwidth> element in network '%1$s' in portgroup '%2$s' with forward mode='%3$s'"), def->name, def->portGroups[i].name, virNetworkForwardTypeToString(def->forward.type)); return -1; @@ -2979,8 +2955,7 @@ networkValidate(virNetworkDriverState *driver, * checks were done in the loop above. */ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("<vlan> element specified for network %s, " - "whose type doesn't support vlan configuration"), + _("<vlan> element specified for network %1$s, whose type doesn't support vlan configuration"), def->name); return -1; } @@ -2989,9 +2964,7 @@ networkValidate(virNetworkDriverState *driver, for (i = 0; i < def->nPortGroups; i++) { if (def->portGroups[i].bandwidth) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unsupported <bandwidth> element " - "in <portgroup name='%s'> of " - "network '%s' with forward mode='%s'"), + _("unsupported <bandwidth> element in <portgroup name='%1$s'> of network '%2$s' with forward mode='%3$s'"), def->portGroups[i].name, def->name, virNetworkForwardTypeToString(def->forward.type)); return -1; @@ -3433,7 +3406,7 @@ networkDestroy(virNetworkPtr net) if (!virNetworkObjIsActive(obj)) { virReportError(VIR_ERR_OPERATION_INVALID, - _("network '%s' is not active"), + _("network '%1$s' is not active"), def->name); goto cleanup; } @@ -3513,7 +3486,7 @@ networkGetBridgeName(virNetworkPtr net) if (!(def->bridge)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("network '%s' does not have a bridge name."), + _("network '%1$s' does not have a bridge name."), def->name); goto cleanup; } @@ -3588,21 +3561,21 @@ networkSetAutostart(virNetworkPtr net, if (new_autostart) { if (g_mkdir_with_parents(cfg->networkAutostartDir, 0777) < 0) { virReportSystemError(errno, - _("cannot create autostart directory '%s'"), + _("cannot create autostart directory '%1$s'"), cfg->networkAutostartDir); 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; } @@ -3671,7 +3644,7 @@ networkGetDHCPLeases(virNetworkPtr net, rv = 0; } else { virReportSystemError(errno, - _("Unable to read leases file: %s"), + _("Unable to read leases file: %1$s"), custom_lease_file); } goto cleanup; @@ -3684,7 +3657,7 @@ networkGetDHCPLeases(virNetworkPtr net, if (!(leases_array = virJSONValueFromString(lease_entries))) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("invalid json in file: %s"), custom_lease_file); + _("invalid json in file: %1$s"), custom_lease_file); goto cleanup; } @@ -3868,7 +3841,7 @@ networkAllocatePort(virNetworkObj *obj, if (!virNetworkObjIsActive(obj)) { virReportError(VIR_ERR_OPERATION_INVALID, - _("network '%s' is not active"), + _("network '%1$s' is not active"), netdef->name); return -1; } @@ -3940,8 +3913,7 @@ networkAllocatePort(virNetworkObj *obj, if (port->virtPortProfile) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("<virtualport type='%s'> not supported for network " - "'%s' which uses IP forwarding"), + _("<virtualport type='%1$s'> not supported for network '%2$s' which uses IP forwarding"), virNetDevVPortTypeToString(port->virtPortProfile->virtPortType), netdef->name); return -1; @@ -3964,8 +3936,7 @@ networkAllocatePort(virNetworkObj *obj, } if (!dev) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("network '%s' requires exclusive access " - "to interfaces, but none are available"), + _("network '%1$s' requires exclusive access to interfaces, but none are available"), netdef->name); return -1; } @@ -3978,9 +3949,7 @@ networkAllocatePort(virNetworkObj *obj, if (port->virtPortProfile->virtPortType != VIR_NETDEV_VPORT_PROFILE_8021QBG && port->virtPortProfile->virtPortType != VIR_NETDEV_VPORT_PROFILE_8021QBH) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("<virtualport type='%s'> not supported for network " - "'%s' which uses an SR-IOV Virtual Function " - "via PCI passthrough"), + _("<virtualport type='%1$s'> not supported for network '%2$s' which uses an SR-IOV Virtual Function via PCI passthrough"), virNetDevVPortTypeToString(port->virtPortProfile->virtPortType), netdef->name); return -1; @@ -4003,8 +3972,7 @@ networkAllocatePort(virNetworkObj *obj, /* only type='openvswitch' is allowed for bridges */ if (port->virtPortProfile->virtPortType != VIR_NETDEV_VPORT_PROFILE_OPENVSWITCH) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("<virtualport type='%s'> not supported for network " - "'%s' which uses a bridge device"), + _("<virtualport type='%1$s'> not supported for network '%2$s' which uses a bridge device"), virNetDevVPortTypeToString(port->virtPortProfile->virtPortType), netdef->name); return -1; @@ -4040,8 +4008,7 @@ networkAllocatePort(virNetworkObj *obj, if (port->virtPortProfile->virtPortType != VIR_NETDEV_VPORT_PROFILE_8021QBG && port->virtPortProfile->virtPortType != VIR_NETDEV_VPORT_PROFILE_8021QBH) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("<virtualport type='%s'> not supported for network " - "'%s' which uses a macvtap device"), + _("<virtualport type='%1$s'> not supported for network '%2$s' which uses a macvtap device"), virNetDevVPortTypeToString(port->virtPortProfile->virtPortType), netdef->name); return -1; @@ -4053,8 +4020,7 @@ networkAllocatePort(virNetworkObj *obj, */ if ((netdef->forward.nifs <= 0) && (netdef->forward.npfs <= 0)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("network '%s' uses a direct mode, but " - "has no forward dev and no interface pool"), + _("network '%1$s' uses a direct mode, but has no forward dev and no interface pool"), netdef->name); return -1; } else { @@ -4093,8 +4059,7 @@ networkAllocatePort(virNetworkObj *obj, /* dev points at the physical device we want to use */ if (!dev) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("network '%s' requires exclusive access " - "to interfaces, but none are available"), + _("network '%1$s' requires exclusive access to interfaces, but none are available"), netdef->name); return -1; } @@ -4162,7 +4127,7 @@ networkNotifyPort(virNetworkObj *obj, if (!virNetworkObjIsActive(obj)) { virReportError(VIR_ERR_OPERATION_INVALID, - _("network '%s' is not active"), + _("network '%1$s' is not active"), netdef->name); return -1; } @@ -4200,8 +4165,7 @@ networkNotifyPort(virNetworkObj *obj, /* dev points at the physical device we want to use */ if (!dev) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("network '%s' doesn't have dev='%s' " - "in use by network port '%s'"), + _("network '%1$s' doesn't have dev='%2$s' in use by network port '%3$s'"), netdef->name, port->plug.direct.linkdev, port->uuid); return -1; @@ -4217,8 +4181,7 @@ networkNotifyPort(virNetworkObj *obj, port->virtPortProfile && (port->virtPortProfile->virtPortType == VIR_NETDEV_VPORT_PROFILE_8021QBH)))) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("network '%s' claims dev='%s' is already in " - "use by a different port"), + _("network '%1$s' claims dev='%2$s' is already in use by a different port"), netdef->name, port->plug.direct.linkdev); return -1; } @@ -4242,8 +4205,7 @@ networkNotifyPort(virNetworkObj *obj, /* dev points at the physical device we want to use */ if (!dev) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("network '%s' doesn't have " - "PCI device %04x:%02x:%02x.%x in use by network port"), + _("network '%1$s' doesn't have PCI device %2$04x:%3$02x:%4$02x.%5$x in use by network port"), netdef->name, port->plug.hostdevpci.addr.domain, port->plug.hostdevpci.addr.bus, @@ -4259,9 +4221,7 @@ networkNotifyPort(virNetworkObj *obj, if ((dev->connections > 0) && netdef->forward.type == VIR_NETWORK_FORWARD_HOSTDEV) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("network '%s' claims the PCI device at " - "domain=%d bus=%d slot=%d function=%d " - "is already in use by a different network port"), + _("network '%1$s' claims the PCI device at domain=%2$d bus=%3$d slot=%4$d function=%5$d is already in use by a different network port"), netdef->name, dev->device.pci.domain, dev->device.pci.bus, dev->device.pci.slot, dev->device.pci.function); @@ -4332,8 +4292,7 @@ networkReleasePort(virNetworkObj *obj, case VIR_NETWORK_PORT_PLUG_TYPE_DIRECT: if (netdef->forward.nifs == 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("network '%s' uses a direct mode, but " - "has no forward dev and no interface pool"), + _("network '%1$s' uses a direct mode, but has no forward dev and no interface pool"), netdef->name); return -1; } @@ -4349,8 +4308,7 @@ networkReleasePort(virNetworkObj *obj, if (!dev) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("network '%s' doesn't have dev='%s' " - "in use by domain"), + _("network '%1$s' doesn't have dev='%2$s' in use by domain"), netdef->name, port->plug.direct.linkdev); return -1; } @@ -4359,8 +4317,7 @@ networkReleasePort(virNetworkObj *obj, case VIR_NETWORK_PORT_PLUG_TYPE_HOSTDEV_PCI: if (netdef->forward.nifs == 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("network '%s' uses a hostdev mode, but " - "has no forward dev and no interface pool"), + _("network '%1$s' uses a hostdev mode, but has no forward dev and no interface pool"), netdef->name); return -1; } @@ -4377,8 +4334,7 @@ networkReleasePort(virNetworkObj *obj, if (!dev) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("network '%s' doesn't have " - "PCI device %04x:%02x:%02x.%x in use by domain"), + _("network '%1$s' doesn't have PCI device %2$04x:%3$02x:%4$02x.%5$x in use by domain"), netdef->name, port->plug.hostdevpci.addr.domain, port->plug.hostdevpci.addr.bus, @@ -4446,8 +4402,7 @@ networkCheckBandwidth(virNetworkObj *obj, if (virNetDevBandwidthHasFloor(ifaceBand) && !virNetDevBandwidthSupportsFloor(def->forward.type)) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, - _("Invalid use of 'floor' on interface with MAC address %s " - "- 'floor' is only supported for interface type 'network' with forward type 'nat', 'route', 'open' or none"), + _("Invalid use of 'floor' on interface with MAC address %1$s - 'floor' is only supported for interface type 'network' with forward type 'nat', 'route', 'open' or none"), ifmac); return -1; } @@ -4455,8 +4410,7 @@ networkCheckBandwidth(virNetworkObj *obj, if (virNetDevBandwidthHasFloor(ifaceBand) && !(netBand && netBand->in)) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, - _("Invalid use of 'floor' on interface with MAC " - "address %s - network '%s' has no inbound QoS set"), + _("Invalid use of 'floor' on interface with MAC address %1$s - network '%2$s' has no inbound QoS set"), ifmac, def->name); return -1; } @@ -4485,9 +4439,7 @@ networkCheckBandwidth(virNetworkObj *obj, tmp_new_rate = netBand->in->peak; if (tmp_floor_sum > netBand->in->peak) { virReportError(VIR_ERR_OPERATION_INVALID, - _("Cannot plug '%s' interface into '%s' because " - "new combined inbound floor=%llu would overcommit " - "peak=%llu on network '%s'"), + _("Cannot plug '%1$s' interface into '%2$s' because new combined inbound floor=%3$llu would overcommit peak=%4$llu on network '%5$s'"), ifmac, def->bridge, tmp_floor_sum, @@ -4499,9 +4451,7 @@ networkCheckBandwidth(virNetworkObj *obj, /* tmp_floor_sum can be between 'average' and 'peak' iff 'peak' is set. * Otherwise, tmp_floor_sum must be below 'average'. */ virReportError(VIR_ERR_OPERATION_INVALID, - _("Cannot plug '%s' interface into '%s' because " - "new combined inbound floor=%llu would overcommit " - "average=%llu on network '%s'"), + _("Cannot plug '%1$s' interface into '%2$s' because new combined inbound floor=%3$llu would overcommit average=%4$llu on network '%5$s'"), ifmac, def->bridge, tmp_floor_sum, @@ -4809,7 +4759,7 @@ networkPortLookupByUUID(virNetworkPtr net, if (!virNetworkObjIsActive(obj)) { virReportError(VIR_ERR_OPERATION_INVALID, - _("network '%s' is not active"), + _("network '%1$s' is not active"), def->name); goto cleanup; } @@ -4851,7 +4801,7 @@ networkPortCreateXML(virNetworkPtr net, if (!virNetworkObjIsActive(obj)) { virReportError(VIR_ERR_OPERATION_INVALID, - _("network '%s' is not active"), + _("network '%1$s' is not active"), def->name); goto cleanup; } @@ -4919,7 +4869,7 @@ networkPortGetXMLDesc(virNetworkPortPtr port, if (!virNetworkObjIsActive(obj)) { virReportError(VIR_ERR_OPERATION_INVALID, - _("network '%s' is not active"), + _("network '%1$s' is not active"), def->name); goto cleanup; } @@ -4959,7 +4909,7 @@ networkPortDelete(virNetworkPortPtr port, if (!virNetworkObjIsActive(obj)) { virReportError(VIR_ERR_OPERATION_INVALID, - _("network '%s' is not active"), + _("network '%1$s' is not active"), def->name); goto cleanup; } @@ -5007,7 +4957,7 @@ networkPortSetParameters(virNetworkPortPtr port, if (!virNetworkObjIsActive(obj)) { virReportError(VIR_ERR_OPERATION_INVALID, - _("network '%s' is not active"), + _("network '%1$s' is not active"), def->name); goto cleanup; } @@ -5098,7 +5048,7 @@ networkPortGetParameters(virNetworkPortPtr port, if (!virNetworkObjIsActive(obj)) { virReportError(VIR_ERR_OPERATION_INVALID, - _("network '%s' is not active"), + _("network '%1$s' is not active"), def->name); goto cleanup; } @@ -5160,7 +5110,7 @@ networkListAllPorts(virNetworkPtr net, if (!virNetworkObjIsActive(obj)) { virReportError(VIR_ERR_OPERATION_INVALID, - _("network '%s' is not active"), + _("network '%1$s' is not active"), def->name); goto cleanup; } diff --git a/src/network/bridge_driver_conf.c b/src/network/bridge_driver_conf.c index 664e42bf99..a2edafa837 100644 --- a/src/network/bridge_driver_conf.c +++ b/src/network/bridge_driver_conf.c @@ -118,7 +118,7 @@ virNetworkDriverConfigNew(bool privileged) return NULL; if (g_mkdir_with_parents(cfg->stateDir, 0777) < 0) { - virReportSystemError(errno, _("cannot create directory %s"), cfg->stateDir); + virReportSystemError(errno, _("cannot create directory %1$s"), cfg->stateDir); return NULL; } diff --git a/src/network/bridge_driver_linux.c b/src/network/bridge_driver_linux.c index d9597d91be..860793fba6 100644 --- a/src/network/bridge_driver_linux.c +++ b/src/network/bridge_driver_linux.c @@ -266,7 +266,7 @@ int networkCheckRouteCollision(virNetworkDef *def) if ((net_dest == addr_val) && (netmask.data.inet4.sin_addr.s_addr == mask_val)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Network is already in use by interface %s"), + _("Network is already in use by interface %1$s"), iface); return -1; } @@ -291,8 +291,7 @@ int networkCheckRouteCollision(virNetworkDef *def) if (!addr_str) virResetLastError(); virReportError(VIR_ERR_INTERNAL_ERROR, - _("Route address '%s' conflicts " - "with IP address for '%s'"), + _("Route address '%1$s' conflicts with IP address for '%2$s'"), NULLSTR(addr_str), iface); return -1; } @@ -317,7 +316,7 @@ networkAddMasqueradingFirewallRules(virFirewall *fw, if (prefix < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Invalid prefix or netmask for '%s'"), + _("Invalid prefix or netmask for '%1$s'"), def->bridge); return -1; } @@ -506,7 +505,7 @@ networkAddRoutingFirewallRules(virFirewall *fw, if (prefix < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Invalid prefix or netmask for '%s'"), + _("Invalid prefix or netmask for '%1$s'"), def->bridge); return -1; } @@ -833,8 +832,7 @@ int networkAddFirewallRules(virNetworkDef *def) */ if (virFirewallDIsRegistered() < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("zone %s requested for network %s " - "but firewalld is not active"), + _("zone %1$s requested for network %2$s but firewalld is not active"), def->bridgeZone, def->name); return -1; } diff --git a/src/network/leaseshelper.c b/src/network/leaseshelper.c index 9ee42045d9..e1c0e81828 100644 --- a/src/network/leaseshelper.c +++ b/src/network/leaseshelper.c @@ -49,9 +49,9 @@ G_GNUC_NORETURN static void usage(int status) { if (status) { - fprintf(stderr, _("%s: try --help for more details\n"), program_name); + fprintf(stderr, _("%1$s: try --help for more details\n"), program_name); } else { - printf(_("Usage: %s add|old|del|init mac|clientid ip [hostname]\n" + printf(_("Usage: %1$s add|old|del|init mac|clientid ip [hostname]\n" "Designed for use with 'dnsmasq --dhcp-script'\n" "Refer to man page of dnsmasq for more details'\n"), program_name); @@ -103,7 +103,7 @@ main(int argc, char **argv) if (virGettextInitialize() < 0 || virErrorInitialize() < 0) { - fprintf(stderr, _("%s: initialization failed\n"), program_name); + fprintf(stderr, _("%1$s: initialization failed\n"), program_name); exit(EXIT_FAILURE); } @@ -137,7 +137,7 @@ main(int argc, char **argv) mac = argv[2]; if ((action = virLeaseActionTypeFromString(argv[1])) < 0) { - fprintf(stderr, _("Unsupported action: %s\n"), argv[1]); + fprintf(stderr, _("Unsupported action: %1$s\n"), argv[1]); exit(EXIT_FAILURE); } @@ -161,7 +161,7 @@ main(int argc, char **argv) /* Try to claim the pidfile, exiting if we can't */ if ((pid_file_fd = virPidFileAcquirePathFull(pid_file, true, false, getpid())) < 0) { fprintf(stderr, - _("Unable to acquire PID file: %s\n errno=%d"), + _("Unable to acquire PID file: %1$s\n errno=%2$d"), pid_file, errno); goto cleanup; } @@ -170,7 +170,7 @@ main(int argc, char **argv) * corresponding custom lease file exists. If not, 'touch' it */ if (virFileTouch(custom_lease_file, 0644) < 0) { fprintf(stderr, - _("Unable to create: %s\n errno=%d"), + _("Unable to create: %1$s\n errno=%2$d"), custom_lease_file, errno); goto cleanup; } -- 2.39.2

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com&gt; --- src/nwfilter/nwfilter_dhcpsnoop.c | 67 +++++++++++------------ src/nwfilter/nwfilter_driver.c | 18 +++--- src/nwfilter/nwfilter_ebiptables_driver.c | 16 +++--- src/nwfilter/nwfilter_gentech_driver.c | 19 +++---- src/nwfilter/nwfilter_learnipaddr.c | 9 ++- 5 files changed, 60 insertions(+), 69 deletions(-) diff --git a/src/nwfilter/nwfilter_dhcpsnoop.c b/src/nwfilter/nwfilter_dhcpsnoop.c index 20afc1b2d4..3dc0b777e9 100644 --- a/src/nwfilter/nwfilter_dhcpsnoop.c +++ b/src/nwfilter/nwfilter_dhcpsnoop.c @@ -485,8 +485,7 @@ virNWFilterSnoopReqNew(const char *ifkey) if (ifkey == NULL || strlen(ifkey) != VIR_IFKEY_LEN - 1) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("virNWFilterSnoopReqNew called with invalid " - "key \"%s\" (%zu)"), + _("virNWFilterSnoopReqNew called with invalid key \"%1$s\" (%2$zu)"), NULLSTR_EMPTY(ifkey), ifkey ? strlen(ifkey) : 0); return NULL; @@ -955,26 +954,26 @@ virNWFilterSnoopDHCPOpen(const char *ifname, virMacAddr *mac, pcap_set_immediate_mode(handle, 1) < 0 || pcap_activate(handle) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("setup of pcap handle failed: %s"), + _("setup of pcap handle failed: %1$s"), pcap_geterr(handle)); goto cleanup; } if (pcap_compile(handle, &fp, ext_filter, 1, PCAP_NETMASK_UNKNOWN) != 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("pcap_compile: %s"), pcap_geterr(handle)); + _("pcap_compile: %1$s"), pcap_geterr(handle)); goto cleanup; } if (pcap_setfilter(handle, &fp) != 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("pcap_setfilter: %s"), pcap_geterr(handle)); + _("pcap_setfilter: %1$s"), pcap_geterr(handle)); goto cleanup_freecode; } if (pcap_setdirection(handle, dir) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("pcap_setdirection: %s"), + _("pcap_setdirection: %1$s"), pcap_geterr(handle)); goto cleanup_freecode; } @@ -1004,8 +1003,8 @@ static void virNWFilterDHCPDecodeWorker(void *jobdata, void *opaque) req->jobCompletionStatus = -1; virReportError(VIR_ERR_INTERNAL_ERROR, - _("Instantiation of rules failed on " - "interface '%s'"), req->binding->portdevname); + _("Instantiation of rules failed on interface '%1$s'"), + req->binding->portdevname); } ignore_value(!!g_atomic_int_dec_and_test(job->qCtr)); } @@ -1306,7 +1305,7 @@ virNWFilterDHCPSnoopThread(void *req0) /* protect req->binding->portdevname */ VIR_WITH_MUTEX_LOCK_GUARD(&req->lock) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("interface '%s' failing; reopening"), + _("interface '%1$s' failing; reopening"), req->binding->portdevname); if (req->binding->portdevname) pcapConf[i].handle = @@ -1359,8 +1358,8 @@ virNWFilterDHCPSnoopThread(void *req0) pcapConf[i].dir, &pcapConf[i].qCtr) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Job submission failed on " - "interface '%s'"), req->binding->portdevname); + _("Job submission failed on interface '%1$s'"), + req->binding->portdevname); error = true; break; } @@ -1468,8 +1467,8 @@ virNWFilterDHCPSnoopReq(virNWFilterTechDriver *techdriver, req->binding->portdevname, req->ifkey) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("virNWFilterDHCPSnoopReq ifname map failed" - " on interface \"%s\" key \"%s\""), binding->portdevname, + _("virNWFilterDHCPSnoopReq ifname map failed on interface \"%1$s\" key \"%2$s\""), + binding->portdevname, ifkey); goto exit_snoopunlock; } @@ -1477,8 +1476,8 @@ virNWFilterDHCPSnoopReq(virNWFilterTechDriver *techdriver, if (isnewreq && virHashAddEntry(virNWFilterSnoopState.snoopReqs, ifkey, req) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("virNWFilterDHCPSnoopReq req add failed on" - " interface \"%s\" ifkey \"%s\""), binding->portdevname, + _("virNWFilterDHCPSnoopReq req add failed on interface \"%1$s\" ifkey \"%2$s\""), + binding->portdevname, ifkey); goto exit_rem_ifnametokey; } @@ -1489,8 +1488,8 @@ virNWFilterDHCPSnoopReq(virNWFilterTechDriver *techdriver, if (virThreadCreateFull(&thread, false, virNWFilterDHCPSnoopThread, "dhcp-snoop", false, req) != 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("virNWFilterDHCPSnoopReq virThreadCreate " - "failed on interface '%s'"), binding->portdevname); + _("virNWFilterDHCPSnoopReq virThreadCreate failed on interface '%1$s'"), + binding->portdevname); goto exit_snoopreq_unlock; } @@ -1501,15 +1500,15 @@ virNWFilterDHCPSnoopReq(virNWFilterTechDriver *techdriver, req->threadkey = virNWFilterSnoopActivate(req); if (!req->threadkey) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Activation of snoop request failed on " - "interface '%s'"), req->binding->portdevname); + _("Activation of snoop request failed on interface '%1$s'"), + req->binding->portdevname); goto exit_snoopreq_unlock; } if (virNWFilterSnoopReqRestore(req) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Restoring of leases failed on " - "interface '%s'"), req->binding->portdevname); + _("Restoring of leases failed on interface '%1$s'"), + req->binding->portdevname); goto exit_snoop_cancel; } @@ -1677,17 +1676,17 @@ virNWFilterSnoopLeaseFileRefresh(void) int tfd; if (g_mkdir_with_parents(LEASEFILE_DIR, 0700) < 0) { - virReportError(errno, _("mkdir(\"%s\")"), LEASEFILE_DIR); + virReportError(errno, _("mkdir(\"%1$s\")"), LEASEFILE_DIR); return; } if (unlink(TMPLEASEFILE) < 0 && errno != ENOENT) - virReportSystemError(errno, _("unlink(\"%s\")"), TMPLEASEFILE); + virReportSystemError(errno, _("unlink(\"%1$s\")"), TMPLEASEFILE); /* lease file loaded, delete old one */ tfd = open(TMPLEASEFILE, O_CREAT|O_RDWR|O_TRUNC|O_EXCL, 0644); if (tfd < 0) { - virReportSystemError(errno, _("open(\"%s\")"), TMPLEASEFILE); + virReportSystemError(errno, _("open(\"%1$s\")"), TMPLEASEFILE); return; } @@ -1701,13 +1700,13 @@ virNWFilterSnoopLeaseFileRefresh(void) } if (VIR_CLOSE(tfd) < 0) { - virReportSystemError(errno, _("unable to close %s"), TMPLEASEFILE); + virReportSystemError(errno, _("unable to close %1$s"), TMPLEASEFILE); /* assuming the old lease file is still better, skip the renaming */ goto cleanup; } if (rename(TMPLEASEFILE, LEASEFILE) < 0) { - virReportSystemError(errno, _("rename(\"%s\", \"%s\")"), + virReportSystemError(errno, _("rename(\"%1$s\", \"%2$s\")"), TMPLEASEFILE, LEASEFILE); unlink(TMPLEASEFILE); } @@ -1737,8 +1736,8 @@ virNWFilterSnoopLeaseFileLoad(void) if (line[strlen(line)-1] != '\n') { virReportError(VIR_ERR_INTERNAL_ERROR, - _("virNWFilterSnoopLeaseFileLoad lease file " - "line %d corrupt"), ln); + _("virNWFilterSnoopLeaseFileLoad lease file line %1$d corrupt"), + ln); break; } ln++; @@ -1746,8 +1745,8 @@ virNWFilterSnoopLeaseFileLoad(void) if (sscanf(line, "%llu %54s %15s %15s", &timeout, ifkey, ipstr, srvstr) < 4) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("virNWFilterSnoopLeaseFileLoad lease file " - "line %d corrupt"), ln); + _("virNWFilterSnoopLeaseFileLoad lease file line %1$d corrupt"), + ln); break; } ipl.timeout = timeout; @@ -1764,15 +1763,15 @@ virNWFilterSnoopLeaseFileLoad(void) if (tmp < 0) { virNWFilterSnoopReqPut(req); virReportError(VIR_ERR_INTERNAL_ERROR, - _("virNWFilterSnoopLeaseFileLoad req add" - " failed on interface \"%s\""), ifkey); + _("virNWFilterSnoopLeaseFileLoad req add failed on interface \"%1$s\""), + ifkey); continue; } } if (virSocketAddrParseIPv4(&ipl.ipAddress, ipstr) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("line %d corrupt ipaddr \"%s\""), + _("line %1$d corrupt ipaddr \"%2$s\""), ln, ipstr); virNWFilterSnoopReqPut(req); continue; @@ -1917,7 +1916,7 @@ virNWFilterDHCPSnoopEnd(const char *ifname) req = virNWFilterSnoopReqGetByIFKey(ifkey); if (!req) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("ifkey \"%s\" has no req"), ifkey); + _("ifkey \"%1$s\" has no req"), ifkey); return; } diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c index 3803850e26..09719edd75 100644 --- a/src/nwfilter/nwfilter_driver.c +++ b/src/nwfilter/nwfilter_driver.c @@ -248,7 +248,7 @@ nwfilterStateInitialize(bool privileged, driver->stateDir = g_strdup(RUNSTATEDIR "/libvirt/nwfilter"); 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; } @@ -282,7 +282,7 @@ nwfilterStateInitialize(bool privileged, driver->configDir = g_strdup(SYSCONFDIR "/libvirt/nwfilter"); if (g_mkdir_with_parents(driver->configDir, S_IRWXU) < 0) { - virReportSystemError(errno, _("cannot create config directory '%s'"), + virReportSystemError(errno, _("cannot create config directory '%1$s'"), driver->configDir); goto error; } @@ -290,7 +290,7 @@ nwfilterStateInitialize(bool privileged, driver->bindingDir = g_strdup(RUNSTATEDIR "/libvirt/nwfilter-binding"); if (g_mkdir_with_parents(driver->bindingDir, S_IRWXU) < 0) { - virReportSystemError(errno, _("cannot create config directory '%s'"), + virReportSystemError(errno, _("cannot create config directory '%1$s'"), driver->bindingDir); goto error; } @@ -359,7 +359,7 @@ nwfilterConnectOpen(virConnectPtr conn, if (STRNEQ(conn->uri->path, "/system")) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unexpected nwfilter URI path '%s', try nwfilter:///system"), + _("unexpected nwfilter URI path '%1$s', try nwfilter:///system"), conn->uri->path); return VIR_DRV_OPEN_ERROR; } @@ -405,7 +405,7 @@ nwfilterObjFromNWFilter(const unsigned char *uuid) if (!(obj = virNWFilterObjListFindByUUID(driver->nwfilters, uuid))) { virUUIDFormat(uuid, uuidstr); virReportError(VIR_ERR_NO_NWFILTER, - _("no nwfilter with matching uuid '%s'"), uuidstr); + _("no nwfilter with matching uuid '%1$s'"), uuidstr); } return obj; } @@ -452,7 +452,7 @@ nwfilterLookupByName(virConnectPtr conn, if (!obj) { virReportError(VIR_ERR_NO_NWFILTER, - _("no nwfilter with matching name '%s'"), name); + _("no nwfilter with matching name '%1$s'"), name); return NULL; } def = virNWFilterObjGetDef(obj); @@ -661,7 +661,7 @@ nwfilterBindingLookupByPortDev(virConnectPtr conn, portdev); if (!obj) { virReportError(VIR_ERR_NO_NWFILTER_BINDING, - _("no nwfilter binding for port dev '%s'"), portdev); + _("no nwfilter binding for port dev '%1$s'"), portdev); goto cleanup; } @@ -706,7 +706,7 @@ nwfilterBindingGetXMLDesc(virNWFilterBindingPtr binding, binding->portdev); if (!obj) { virReportError(VIR_ERR_NO_NWFILTER_BINDING, - _("no nwfilter binding for port dev '%s'"), binding->portdev); + _("no nwfilter binding for port dev '%1$s'"), binding->portdev); goto cleanup; } @@ -790,7 +790,7 @@ nwfilterBindingDelete(virNWFilterBindingPtr binding) obj = virNWFilterBindingObjListFindByPortDev(driver->bindings, binding->portdev); if (!obj) { virReportError(VIR_ERR_NO_NWFILTER_BINDING, - _("no nwfilter binding for port dev '%s'"), binding->portdev); + _("no nwfilter binding for port dev '%1$s'"), binding->portdev); return -1; } diff --git a/src/nwfilter/nwfilter_ebiptables_driver.c b/src/nwfilter/nwfilter_ebiptables_driver.c index 24c0db5bde..99a74a60e5 100644 --- a/src/nwfilter/nwfilter_ebiptables_driver.c +++ b/src/nwfilter/nwfilter_ebiptables_driver.c @@ -153,8 +153,8 @@ printVar(virNWFilterVarCombIter *vars, varName = virNWFilterVarAccessGetVarName(item->varAccess); virReportError(VIR_ERR_INTERNAL_ERROR, - _("Buffer too small to print variable " - "'%s' into"), varName); + _("Buffer too small to print variable '%1$s' into"), + varName); return -1; } @@ -295,7 +295,7 @@ _printDataType(virNWFilterVarCombIter *vars, case DATATYPE_STRINGCOPY: case DATATYPE_BOOLEAN: virReportError(VIR_ERR_INTERNAL_ERROR, - _("Cannot print data type %x"), item->datatype); + _("Cannot print data type %1$x"), item->datatype); return -1; case DATATYPE_LAST: default: @@ -1441,7 +1441,7 @@ _iptablesCreateRuleInstance(virFirewall *fw, default: virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unexpected protocol %d"), + _("Unexpected protocol %1$d"), rule->prtclType); return -1; } @@ -1846,8 +1846,7 @@ ebtablesCreateRuleInstance(virFirewall *fw, if (reverse && HAS_ENTRY_ITEM(&rule->p.stpHdrFilter.ethHdr.dataSrcMACAddr)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("STP filtering in %s direction with " - "source MAC address set is not supported"), + _("STP filtering in %1$s direction with source MAC address set is not supported"), virNWFilterRuleDirectionTypeToString( VIR_NWFILTER_RULE_DIRECTION_INOUT)); return -1; @@ -2351,7 +2350,7 @@ ebtablesCreateRuleInstance(virFirewall *fw, default: virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unexpected rule protocol %d"), + _("Unexpected rule protocol %1$d"), rule->prtclType); return -1; } @@ -3126,8 +3125,7 @@ iptablesCheckBridgeNFCallEnabled(bool isIPv6) if (buffer[0] == '0') { char msg[256]; g_snprintf(msg, sizeof(msg), - _("To enable ip%stables filtering for the VM do " - "'echo 1 > %s'"), + _("To enable ip%1$stables filtering for the VM do 'echo 1 > %2$s'"), isIPv6 ? "6" : "", pathname); VIR_WARN("%s", msg); diff --git a/src/nwfilter/nwfilter_gentech_driver.c b/src/nwfilter/nwfilter_gentech_driver.c index 979b13fa2c..72e24e2f08 100644 --- a/src/nwfilter/nwfilter_gentech_driver.c +++ b/src/nwfilter/nwfilter_gentech_driver.c @@ -514,8 +514,7 @@ virNWFilterDoInstantiate(virNWFilterTechDriver *techdriver, } else { rc = -1; virReportError(VIR_ERR_PARSE_FAILED, - _("filter '%s' " - "learning value '%s' invalid."), + _("filter '%1$s' learning value '%2$s' invalid."), filter->name, learning); goto error; } @@ -576,8 +575,8 @@ virNWFilterDoInstantiate(virNWFilterTechDriver *techdriver, buf = virNWFilterPrintVars(missing_vars, ", ", false, reportIP); if (buf) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Cannot instantiate filter due to unresolvable " - "variables or unavailable list elements: %s"), buf); + _("Cannot instantiate filter due to unresolvable variables or unavailable list elements: %1$s"), + buf); } rc = -1; @@ -632,8 +631,7 @@ virNWFilterInstantiateFilterUpdate(virNWFilterDriverState *driver, if (!techdriver) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not get access to ACL tech " - "driver '%s'"), + _("Could not get access to ACL tech driver '%1$s'"), drvname); return -1; } @@ -779,8 +777,7 @@ virNWFilterRollbackUpdateFilter(virNWFilterBindingDef *binding) techdriver = virNWFilterTechDriverForName(drvname); if (!techdriver) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not get access to ACL tech " - "driver '%s'"), + _("Could not get access to ACL tech driver '%1$s'"), drvname); return -1; } @@ -805,8 +802,7 @@ virNWFilterTearOldFilter(virNWFilterBindingDef *binding) techdriver = virNWFilterTechDriverForName(drvname); if (!techdriver) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not get access to ACL tech " - "driver '%s'"), + _("Could not get access to ACL tech driver '%1$s'"), drvname); return -1; } @@ -830,8 +826,7 @@ _virNWFilterTeardownFilter(const char *ifname) if (!techdriver) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not get access to ACL tech " - "driver '%s'"), + _("Could not get access to ACL tech driver '%1$s'"), drvname); return -1; } diff --git a/src/nwfilter/nwfilter_learnipaddr.c b/src/nwfilter/nwfilter_learnipaddr.c index 0f3042a893..90e9a21a4e 100644 --- a/src/nwfilter/nwfilter_learnipaddr.c +++ b/src/nwfilter/nwfilter_learnipaddr.c @@ -155,7 +155,7 @@ virNWFilterLockIface(const char *ifname) if (virStrcpyStatic(ifaceLock->ifname, ifname) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("interface name %s does not fit into buffer"), + _("interface name %1$s does not fit into buffer"), ifaceLock->ifname); g_free(ifaceLock); return -1; @@ -607,8 +607,8 @@ learnIPAddressThread(void *arg) if ((inetaddr = virSocketAddrFormat(&sa)) != NULL) { if (virNWFilterIPAddrMapAddIPAddr(req->binding->portdevname, inetaddr) < 0) { - VIR_ERROR(_("Failed to add IP address %s to IP address " - "cache for interface %s"), inetaddr, req->binding->portdevname); + VIR_ERROR(_("Failed to add IP address %1$s to IP address cache for interface %2$s"), + inetaddr, req->binding->portdevname); } ret = virNWFilterInstantiateFilterLate(req->driver, @@ -620,8 +620,7 @@ learnIPAddressThread(void *arg) } else { if (showError) virReportSystemError(req->status, - _("encountered an error on interface %s " - "index %d"), + _("encountered an error on interface %1$s index %2$d"), req->binding->portdevname, req->ifindex); techdriver->applyDropAllRules(req->binding->portdevname); -- 2.39.2

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com&gt; --- src/qemu/qemu_command.c | 82 ++++++++++++++++++++--------------------- 1 file changed, 40 insertions(+), 42 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 929bcc0be1..843dd103c7 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -357,7 +357,7 @@ qemuBuildDeviceAddressPCIGetBus(const virDomainDef *domainDef, if (!contAlias) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Device alias was not set for PCI controller with index '%u' required for device at address '%s'"), + _("Device alias was not set for PCI controller with index '%1$u' required for device at address '%2$s'"), info->addr.pci.bus, devStr); return NULL; } @@ -382,7 +382,7 @@ qemuBuildDeviceAddressPCIGetBus(const virDomainDef *domainDef, if (!contAlias) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not find PCI controller with index '%u' required for device at address '%s'"), + _("Could not find PCI controller with index '%1$u' required for device at address '%2$s'"), info->addr.pci.bus, devStr); return NULL; } @@ -467,7 +467,7 @@ qemuBuildDeviceAddresDriveProps(virJSONValue *props, case VIR_DOMAIN_DISK_BUS_SCSI: if (!(controller = virDomainDeviceFindSCSIController(domainDef, &info->addr.drive))) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unable to find a SCSI controller for idx=%d"), + _("unable to find a SCSI controller for idx=%1$d"), info->addr.drive.controller); return -1; } @@ -511,7 +511,7 @@ qemuBuildDeviceAddresDriveProps(virJSONValue *props, case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_DEFAULT: case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LAST: virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unexpected SCSI controller model %d"), + _("Unexpected SCSI controller model %1$d"), controller->model); return -1; } @@ -527,7 +527,7 @@ qemuBuildDeviceAddresDriveProps(virJSONValue *props, case VIR_DOMAIN_DISK_BUS_LAST: default: virReportError(VIR_ERR_INTERNAL_ERROR, - _("address type drive is not supported for bus '%s'"), + _("address type drive is not supported for bus '%1$s'"), NULLSTR(virDomainDiskBusTypeToString(info->addr.drive.diskbus))); return -1; } @@ -778,7 +778,7 @@ qemuDeviceVideoGetModel(virQEMUCaps *qemuCaps, if (!model || STREQ(model, "")) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("invalid model for video type '%s'"), + _("invalid model for video type '%1$s'"), virDomainVideoTypeToString(video->type)); return NULL; } @@ -1003,7 +1003,7 @@ qemuBuildVirtioDevGetConfig(const virDomainDeviceDef *device, case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_ISA: case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DIMM: virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unexpected address type for '%s'"), baseName); + _("Unexpected address type for '%1$s'"), baseName); return -1; case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE: @@ -1020,8 +1020,7 @@ qemuBuildVirtioDevGetConfig(const virDomainDeviceDef *device, if (has_tmodel || has_ntmodel) { if (info->type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("virtio (non-)transitional models are not " - "supported for address type=%s"), + _("virtio (non-)transitional models are not supported for address type=%1$s"), virDomainDeviceAddressTypeToString(info->type)); } @@ -1532,7 +1531,7 @@ qemuBuildChardevCommand(virCommand *cmd, case VIR_DOMAIN_CHR_TYPE_LAST: default: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unsupported chardev '%s'"), + _("unsupported chardev '%1$s'"), virDomainChrTypeToString(dev->type)); return -1; } @@ -1860,7 +1859,7 @@ qemuBuildDiskDeviceProps(const virDomainDef *def, case VIR_DOMAIN_DISK_BUS_LAST: default: virReportError(VIR_ERR_INTERNAL_ERROR, - _("unsupported disk bus '%s' with device setup"), + _("unsupported disk bus '%1$s' with device setup"), NULLSTR(virDomainDiskBusTypeToString(disk->bus))); return NULL; } @@ -1897,7 +1896,7 @@ qemuBuildDiskDeviceProps(const virDomainDef *def, if (virStrToLong_ull(disk->wwn, NULL, 16, &w) < 0) { virReportError(VIR_ERR_INVALID_ARG, - _("Failed to parse wwn '%s' as number"), disk->wwn); + _("Failed to parse wwn '%1$s' as number"), disk->wwn); return NULL; } @@ -2493,7 +2492,7 @@ qemuValidateDomainDeviceDefControllerUSB(const virDomainControllerDef *def, if (!virQEMUCapsGet(qemuCaps, qemuControllerModelUSBToCaps(def->model))) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("USB controller model '%s' not supported in this QEMU binary"), + _("USB controller model '%1$s' not supported in this QEMU binary"), virDomainControllerModelUSBTypeToString(def->model)); return -1; } @@ -2502,7 +2501,7 @@ qemuValidateDomainDeviceDefControllerUSB(const virDomainControllerDef *def, if (def->model != VIR_DOMAIN_CONTROLLER_MODEL_USB_NEC_XHCI && def->model != VIR_DOMAIN_CONTROLLER_MODEL_USB_QEMU_XHCI) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("usb controller type '%s' doesn't support 'ports' with this QEMU binary"), + _("usb controller type '%1$s' doesn't support 'ports' with this QEMU binary"), virDomainControllerModelUSBTypeToString(def->model)); return -1; } @@ -2637,13 +2636,13 @@ qemuBuildControllerSCSIDevProps(virDomainControllerDef *def, case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_BUSLOGIC: case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_NCR53C90: /* It is built-in dev */ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Unsupported controller model: %s"), + _("Unsupported controller model: %1$s"), virDomainControllerModelSCSITypeToString(def->model)); return NULL; case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_DEFAULT: case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LAST: virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unexpected SCSI controller model %d"), + _("Unexpected SCSI controller model %1$d"), def->model); return NULL; } @@ -2679,7 +2678,7 @@ qemuBuildControllerPCIDevProps(virDomainControllerDef *def, if (!modelName) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unknown virDomainControllerPCIModelName value: %d"), + _("Unknown virDomainControllerPCIModelName value: %1$d"), pciopts->modelName); return -1; } @@ -2753,7 +2752,7 @@ qemuBuildControllerPCIDevProps(virDomainControllerDef *def, case VIR_DOMAIN_CONTROLLER_MODEL_PCI_DEFAULT: case VIR_DOMAIN_CONTROLLER_MODEL_PCI_LAST: virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unexpected PCI controller model %d"), + _("Unexpected PCI controller model %1$d"), def->model); return -1; } @@ -2850,7 +2849,7 @@ qemuBuildControllerDevProps(const virDomainDef *domainDef, case VIR_DOMAIN_CONTROLLER_TYPE_ISA: case VIR_DOMAIN_CONTROLLER_TYPE_LAST: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Unsupported controller type: %s"), + _("Unsupported controller type: %1$s"), virDomainControllerTypeToString(def->type)); return -1; } @@ -3825,7 +3824,7 @@ qemuBuildHostNetProps(virDomainObj *vm, if (net->script && netType != VIR_DOMAIN_NET_TYPE_ETHERNET) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("scripts are not supported on interfaces of type %s"), + _("scripts are not supported on interfaces of type %1$s"), virDomainNetTypeToString(netType)); return NULL; } @@ -4023,7 +4022,7 @@ qemuBuildHostNetProps(virDomainObj *vm, case VIR_DOMAIN_NET_TYPE_NULL: case VIR_DOMAIN_NET_TYPE_VDS: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("network device type '%s' is not supported by this hypervisor"), + _("network device type '%1$s' is not supported by this hypervisor"), virDomainNetTypeToString(netType)); return NULL; @@ -4643,7 +4642,7 @@ qemuBuildPCIHostdevDevProps(const virDomainDef *def, case VIR_DOMAIN_HOSTDEV_PCI_BACKEND_XEN: case VIR_DOMAIN_HOSTDEV_PCI_BACKEND_TYPE_LAST: virReportError(VIR_ERR_INTERNAL_ERROR, - _("invalid PCI passthrough type '%s'"), + _("invalid PCI passthrough type '%1$s'"), virDomainHostdevSubsysPCIBackendTypeToString(pcisrc->backend)); return NULL; } @@ -4846,28 +4845,28 @@ qemuOpenChrChardevUNIXSocket(const virDomainChrSourceDef *dev) addr.sun_family = AF_UNIX; if (virStrcpyStatic(addr.sun_path, dev->data.nix.path) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("UNIX socket path '%s' too long"), + _("UNIX socket path '%1$s' too long"), dev->data.nix.path); goto error; } if (unlink(dev->data.nix.path) < 0 && errno != ENOENT) { virReportSystemError(errno, - _("Unable to unlink %s"), + _("Unable to unlink %1$s"), dev->data.nix.path); goto error; } if (bind(fd, (struct sockaddr *)&addr, addrlen) < 0) { virReportSystemError(errno, - _("Unable to bind to UNIX socket path '%s'"), + _("Unable to bind to UNIX socket path '%1$s'"), dev->data.nix.path); goto error; } if (listen(fd, 1) < 0) { virReportSystemError(errno, - _("Unable to listen to UNIX socket path '%s'"), + _("Unable to listen to UNIX socket path '%1$s'"), dev->data.nix.path); goto error; } @@ -5190,7 +5189,7 @@ qemuBuildVirtioSerialPortDevProps(const virDomainDef *def, dev->target.name && STRNEQ(dev->target.name, "com.redhat.spice.0")) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Unsupported spicevmc target name '%s'"), + _("Unsupported spicevmc target name '%1$s'"), dev->target.name); return NULL; } @@ -5629,7 +5628,7 @@ qemuBuildSmbiosCommandLine(virCommand *cmd, if (!source) { virReportError(VIR_ERR_XML_ERROR, - _("Domain '%s' sysinfo are not available"), + _("Domain '%1$s' sysinfo are not available"), def->name); return -1; } @@ -5811,7 +5810,7 @@ qemuBuildClockArgStr(virDomainClockDef *def) case VIR_DOMAIN_CLOCK_OFFSET_LAST: default: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unsupported clock offset '%s'"), + _("unsupported clock offset '%1$s'"), virDomainClockOffsetTypeToString(def->offset)); return NULL; } @@ -6201,7 +6200,7 @@ qemuBuildCpuModelArgStr(virQEMUDriver *driver, virBufferAddLit(buf, "host"); } else { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unexpected host-model CPU for %s architecture"), + _("unexpected host-model CPU for %1$s architecture"), virArchToString(def->os.arch)); return -1; } @@ -6219,8 +6218,8 @@ qemuBuildCpuModelArgStr(virQEMUDriver *driver, cpu->features && !virQEMUCapsGet(qemuCaps, QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("CPU features not supported by hypervisor for %s " - "architecture"), virArchToString(def->os.arch)); + _("CPU features not supported by hypervisor for %1$s architecture"), + virArchToString(def->os.arch)); return -1; } @@ -6519,8 +6518,7 @@ qemuBuildCpuCommandLine(virCommand *cmd, break; default: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("CPU flags requested but can't determine " - "default CPU for arch %s"), + _("CPU flags requested but can't determine default CPU for arch %1$s"), virArchToString(def->os.arch)); return -1; } @@ -8354,7 +8352,7 @@ qemuInterfaceVhostuserConnect(virCommand *cmd, case VIR_DOMAIN_CHR_TYPE_DBUS: case VIR_DOMAIN_CHR_TYPE_LAST: virReportError(VIR_ERR_INTERNAL_ERROR, - _("vhost-user type '%s' not supported"), + _("vhost-user type '%1$s' not supported"), virDomainChrTypeToString(net->data.vhostuser->type)); return -1; } @@ -9095,7 +9093,7 @@ qemuBuildSerialCommandLine(virCommand *cmd, if (caps && !virQEMUCapsGet(qemuCaps, caps)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("'%s' is not supported in this QEMU binary"), + _("'%1$s' is not supported in this QEMU binary"), virDomainChrSerialTargetModelTypeToString(serial->targetModel)); return -1; } @@ -9378,15 +9376,15 @@ qemuBuildTPMOpenBackendFDs(const char *tpmdev, return -1; if ((*tpmfd = open(tpmdev, O_RDWR)) < 0) { - virReportSystemError(errno, _("Could not open TPM device %s"), + virReportSystemError(errno, _("Could not open TPM device %1$s"), tpmdev); return -1; } if ((*cancelfd = open(cancel_path, O_WRONLY)) < 0) { virReportSystemError(errno, - _("Could not open TPM device's cancel " - "path %s"), cancel_path); + _("Could not open TPM device's cancel path %1$s"), + cancel_path); VIR_FORCE_CLOSE(*tpmfd); return -1; } @@ -9928,7 +9926,7 @@ qemuBuildCommandLineValidate(virQEMUDriver *driver, def->os.type == VIR_DOMAIN_OSTYPE_XEN || def->os.type == VIR_DOMAIN_OSTYPE_LINUX) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("qemu emulator '%s' does not support xen"), + _("qemu emulator '%1$s' does not support xen"), def->emulator); return -1; } @@ -10488,7 +10486,7 @@ qemuBuildSerialChrDeviceProps(const virDomainDef *def, if (caps && !virQEMUCapsGet(qemuCaps, caps)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("'%s' is not supported in this QEMU binary"), + _("'%1$s' is not supported in this QEMU binary"), virDomainChrSerialTargetModelTypeToString(serial->targetModel)); return NULL; } @@ -10620,7 +10618,7 @@ qemuBuildConsoleChrDeviceProps(const virDomainDef *def, case VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_OPENVZ: case VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_LAST: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unsupported console target type %s"), + _("unsupported console target type %1$s"), NULLSTR(virDomainChrConsoleTargetTypeToString(chr->targetType))); break; } -- 2.39.2

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

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com&gt; --- src/qemu/qemu_migration.c | 105 +++++++++++++++++++------------------- 1 file changed, 52 insertions(+), 53 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 2720f0b083..a18910f7ad 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -90,7 +90,7 @@ qemuMigrationJobIsAllowed(virDomainObj *vm) if (vm->job->asyncJob == VIR_ASYNC_JOB_MIGRATION_IN || vm->job->asyncJob == VIR_ASYNC_JOB_MIGRATION_OUT) { virReportError(VIR_ERR_OPERATION_INVALID, - _("another migration job is already running for domain '%s'"), + _("another migration job is already running for domain '%1$s'"), vm->def->name); return false; } @@ -139,7 +139,7 @@ qemuMigrationCheckPhase(virDomainObj *vm, if (phase < QEMU_MIGRATION_PHASE_POSTCOPY_FAILED && phase < vm->job->phase) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("migration protocol going backwards %s => %s"), + _("migration protocol going backwards %1$s => %2$s"), qemuMigrationJobPhaseTypeToString(vm->job->phase), qemuMigrationJobPhaseTypeToString(phase)); return -1; @@ -190,9 +190,9 @@ qemuMigrationJobIsActive(virDomainObj *vm, const char *msg; if (job == VIR_ASYNC_JOB_MIGRATION_IN) - msg = _("domain '%s' is not processing incoming migration"); + msg = _("domain '%1$s' is not processing incoming migration"); else - msg = _("domain '%s' is not being migrated"); + msg = _("domain '%1$s' is not being migrated"); virReportError(VIR_ERR_OPERATION_INVALID, msg, vm->def->name); return false; @@ -250,7 +250,7 @@ qemuMigrationSrcRestoreDomainState(virQEMUDriver *driver, virDomainObj *vm) /* Hm, we already know we are in error here. We don't want to * overwrite the previous error, though, so we just throw something * to the logs and hope for the best */ - VIR_ERROR(_("Failed to resume guest %s after failure"), vm->def->name); + VIR_ERROR(_("Failed to resume guest %1$s after failure"), vm->def->name); goto cleanup; } ret = true; @@ -291,7 +291,7 @@ qemuMigrationDstPrecreateDisk(virConnectPtr *conn, if (!(volName = strrchr(basePath, '/'))) { virReportError(VIR_ERR_INVALID_ARG, - _("malformed disk path: %s"), + _("malformed disk path: %1$s"), disk->src->path); goto cleanup; } @@ -340,7 +340,7 @@ qemuMigrationDstPrecreateDisk(virConnectPtr *conn, case VIR_STORAGE_TYPE_NONE: case VIR_STORAGE_TYPE_LAST: virReportError(VIR_ERR_INTERNAL_ERROR, - _("cannot precreate storage for disk type '%s'"), + _("cannot precreate storage for disk type '%1$s'"), virStorageTypeToString(disk->src->type)); goto cleanup; } @@ -446,7 +446,7 @@ qemuMigrationDstPrecreateStorage(virDomainObj *vm, if (!(disk = virDomainDiskByTarget(vm->def, nbd->disks[i].target))) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unable to find disk by target: %s"), + _("unable to find disk by target: %1$s"), nbd->disks[i].target); goto cleanup; } @@ -526,7 +526,7 @@ qemuMigrationDstStartNBDServer(virQEMUDriver *driver, return -1; if (!uri->scheme) { - virReportError(VIR_ERR_INVALID_ARG, _("No URI scheme specified: %s"), nbdURI); + virReportError(VIR_ERR_INVALID_ARG, _("No URI scheme specified: %1$s"), nbdURI); return -1; } @@ -537,7 +537,7 @@ qemuMigrationDstStartNBDServer(virQEMUDriver *driver, * we should rather error out instead of auto-allocating a port * as that would be the exact opposite of what was requested. */ virReportError(VIR_ERR_INVALID_ARG, - _("URI with tcp scheme did not provide a server part: %s"), + _("URI with tcp scheme did not provide a server part: %1$s"), nbdURI); return -1; } @@ -554,7 +554,7 @@ qemuMigrationDstStartNBDServer(virQEMUDriver *driver, server.socket = (char *)uri->path; } else { virReportError(VIR_ERR_INVALID_ARG, - _("Unsupported scheme in disks URI: %s"), + _("Unsupported scheme in disks URI: %1$s"), uri->scheme); return -1; } @@ -574,7 +574,7 @@ qemuMigrationDstStartNBDServer(virQEMUDriver *driver, if (disk->src->readonly || virStorageSourceIsEmpty(disk->src)) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, - _("Cannot migrate empty or read-only disk %s"), + _("Cannot migrate empty or read-only disk %1$s"), disk->dst); goto cleanup; } @@ -655,11 +655,11 @@ qemuMigrationNBDReportMirrorError(qemuBlockJobData *job, { if (job->errmsg) { virReportError(VIR_ERR_OPERATION_FAILED, - _("migration of disk %s failed: %s"), + _("migration of disk %1$s failed: %2$s"), diskdst, job->errmsg); } else { virReportError(VIR_ERR_OPERATION_FAILED, - _("migration of disk %s failed"), diskdst); + _("migration of disk %1$s failed"), diskdst); } } @@ -692,7 +692,7 @@ qemuMigrationSrcNBDStorageCopyReady(virDomainObj *vm, if (!(job = qemuBlockJobDiskGetJob(disk))) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("missing block job data for disk '%s'"), disk->dst); + _("missing block job data for disk '%1$s'"), disk->dst); return -1; } @@ -1158,7 +1158,7 @@ qemuMigrationSrcNBDStorageCopy(virQEMUDriver *driver, if (mirror_speed > LLONG_MAX >> 20) { virReportError(VIR_ERR_OVERFLOW, - _("bandwidth must be less than %llu"), + _("bandwidth must be less than %1$llu"), LLONG_MAX >> 20); return -1; } @@ -1201,7 +1201,7 @@ qemuMigrationSrcNBDStorageCopy(virQEMUDriver *driver, return -1; } else { virReportError(VIR_ERR_INVALID_ARG, - _("Unsupported scheme in disks URI: %s"), + _("Unsupported scheme in disks URI: %1$s"), uri->scheme); return -1; } @@ -1232,7 +1232,7 @@ qemuMigrationSrcNBDStorageCopy(virQEMUDriver *driver, if (vm->job->abortJob) { vm->job->current->status = VIR_DOMAIN_JOB_STATUS_CANCELED; - virReportError(VIR_ERR_OPERATION_ABORTED, _("%s: %s"), + virReportError(VIR_ERR_OPERATION_ABORTED, _("%1$s: %2$s"), virDomainAsyncJobTypeToString(vm->job->asyncJob), _("canceled by client")); return -1; @@ -1286,7 +1286,7 @@ qemuMigrationSrcIsAllowedHostdev(const virDomainDef *def) case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI_HOST: case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_MDEV: virReportError(VIR_ERR_OPERATION_UNSUPPORTED, - _("cannot migrate a domain with <hostdev mode='subsystem' type='%s'>"), + _("cannot migrate a domain with <hostdev mode='subsystem' type='%1$s'>"), virDomainHostdevSubsysTypeToString(hostdev->source.subsys.type)); return false; @@ -1311,11 +1311,11 @@ qemuMigrationSrcIsAllowedHostdev(const virDomainDef *def) virDomainNetType actualType = virDomainNetGetActualType(hostdev->parentnet); virReportError(VIR_ERR_OPERATION_UNSUPPORTED, - _("cannot migrate a domain with <interface type='%s'>"), + _("cannot migrate a domain with <interface type='%1$s'>"), virDomainNetTypeToString(actualType)); } else { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, - _("cannot migrate a domain with <hostdev mode='subsystem' type='%s'>"), + _("cannot migrate a domain with <hostdev mode='subsystem' type='%1$s'>"), virDomainHostdevSubsysTypeToString(hostdev->source.subsys.type)); } return false; @@ -1388,7 +1388,7 @@ qemuMigrationSrcIsAllowed(virDomainObj *vm, if (nsnapshots > 0) { virReportError(VIR_ERR_OPERATION_INVALID, - _("cannot migrate domain with %d snapshots"), + _("cannot migrate domain with %1$d snapshots"), nsnapshots); return false; } @@ -1412,7 +1412,7 @@ qemuMigrationSrcIsAllowed(virDomainObj *vm, if (blockers && blockers[0]) { g_autofree char *reasons = g_strjoinv("; ", blockers); virReportError(VIR_ERR_OPERATION_INVALID, - _("cannot migrate domain: %s"), reasons); + _("cannot migrate domain: %1$s"), reasons); return false; } } else { @@ -1500,8 +1500,7 @@ qemuMigrationSrcIsAllowed(virDomainObj *vm, } if (shmem->role != VIR_DOMAIN_SHMEM_ROLE_MASTER) { virReportError(VIR_ERR_OPERATION_INVALID, - _("shmem device '%s' cannot be migrated, " - "only shmem with role='%s' can be migrated"), + _("shmem device '%1$s' cannot be migrated, only shmem with role='%2$s' can be migrated"), shmem->name, virDomainShmemRoleTypeToString(VIR_DOMAIN_SHMEM_ROLE_MASTER)); return false; @@ -1860,31 +1859,31 @@ qemuMigrationJobCheckStatus(virDomainObj *vm, switch (jobData->status) { case VIR_DOMAIN_JOB_STATUS_NONE: virReportError(VIR_ERR_OPERATION_FAILED, - _("job '%s' is not active"), + _("job '%1$s' is not active"), qemuMigrationJobName(vm)); return -1; case VIR_DOMAIN_JOB_STATUS_FAILED: if (error) { virReportError(VIR_ERR_OPERATION_FAILED, - _("job '%s' failed: %s"), + _("job '%1$s' failed: %2$s"), qemuMigrationJobName(vm), error); } else { virReportError(VIR_ERR_OPERATION_FAILED, - _("job '%s' unexpectedly failed"), + _("job '%1$s' unexpectedly failed"), qemuMigrationJobName(vm)); } return -1; case VIR_DOMAIN_JOB_STATUS_CANCELED: virReportError(VIR_ERR_OPERATION_ABORTED, - _("job '%s' canceled by client"), + _("job '%1$s' canceled by client"), qemuMigrationJobName(vm)); return -1; case VIR_DOMAIN_JOB_STATUS_POSTCOPY_PAUSED: virReportError(VIR_ERR_OPERATION_FAILED, - _("job '%s' failed in post-copy phase"), + _("job '%1$s' failed in post-copy phase"), qemuMigrationJobName(vm)); return -1; @@ -1937,7 +1936,7 @@ qemuMigrationAnyCompleted(virDomainObj *vm, virDomainObjGetState(vm, &pauseReason) == VIR_DOMAIN_PAUSED && pauseReason == VIR_DOMAIN_PAUSED_IOERROR) { virReportError(VIR_ERR_OPERATION_FAILED, - _("job '%s' failed due to I/O error"), + _("job '%1$s' failed due to I/O error"), qemuMigrationJobName(vm)); goto error; } @@ -2109,7 +2108,7 @@ qemuMigrationSrcGraphicsRelocate(virDomainObj *vm, if ((type = virDomainGraphicsTypeFromString(uri->scheme)) < 0) { virReportError(VIR_ERR_INVALID_ARG, - _("unknown graphics type %s"), uri->scheme); + _("unknown graphics type %1$s"), uri->scheme); return -1; } @@ -2124,7 +2123,7 @@ qemuMigrationSrcGraphicsRelocate(virDomainObj *vm, if (STRCASEEQ(param->name, "tlsPort")) { if (virStrToLong_i(param->value, NULL, 10, &tlsPort) < 0) { virReportError(VIR_ERR_INVALID_ARG, - _("invalid tlsPort number: %s"), + _("invalid tlsPort number: %1$s"), param->value); return -1; } @@ -2180,8 +2179,8 @@ qemuMigrationDstOPDRelocate(virQEMUDriver *driver G_GNUC_UNUSED, if (virNetDevOpenvswitchSetMigrateData(cookie->network->net[i].portdata, netptr->ifname) != 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to run command to set OVS port data for " - "interface %s"), netptr->ifname); + _("Unable to run command to set OVS port data for interface %1$s"), + netptr->ifname); return -1; } break; @@ -2621,7 +2620,7 @@ qemuMigrationSrcBeginPhase(virQEMUDriver *driver, if (j == vm->def->ndisks) { virReportError(VIR_ERR_INVALID_ARG, - _("disk target %s not found"), + _("disk target %1$s not found"), migrate_disks[i]); return NULL; } @@ -2688,14 +2687,14 @@ qemuMigrationAnyCanResume(virDomainObj *vm, if (vm->job->asyncOwner != 0 && vm->job->asyncOwner != virThreadSelfID()) { virReportError(VIR_ERR_OPERATION_INVALID, - _("migration of domain %s is being actively monitored by another thread"), + _("migration of domain %1$s is being actively monitored by another thread"), vm->def->name); return false; } if (!virDomainObjIsPostcopy(vm, vm->job)) { virReportError(VIR_ERR_OPERATION_INVALID, - _("migration of domain %s is not in post-copy phase"), + _("migration of domain %1$s is not in post-copy phase"), vm->def->name); return false; } @@ -2703,14 +2702,14 @@ qemuMigrationAnyCanResume(virDomainObj *vm, if (vm->job->phase < QEMU_MIGRATION_PHASE_POSTCOPY_FAILED && !virDomainObjIsFailedPostcopy(vm, vm->job)) { virReportError(VIR_ERR_OPERATION_INVALID, - _("post-copy migration of domain %s has not failed"), + _("post-copy migration of domain %1$s has not failed"), vm->def->name); return false; } if (vm->job->phase > expectedPhase) { virReportError(VIR_ERR_OPERATION_INVALID, - _("resuming failed post-copy migration of domain %s already in progress"), + _("resuming failed post-copy migration of domain %1$s already in progress"), vm->def->name); return false; } @@ -2997,7 +2996,7 @@ qemuMigrationDstPrepareAnyBlockDirtyBitmaps(virDomainObj *vm, if (!(nodedata = virHashLookup(blockNamedNodeData, disk->nodename))) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("failed to find data for block node '%s'"), + _("failed to find data for block node '%1$s'"), disk->nodename); return -1; } @@ -3443,7 +3442,7 @@ qemuMigrationDstPrepareResume(virQEMUDriver *driver, vm = virDomainObjListFindByName(driver->domains, def->name); if (!vm) { virReportError(VIR_ERR_NO_DOMAIN, - _("no domain with matching name '%s'"), def->name); + _("no domain with matching name '%1$s'"), def->name); qemuMigrationDstErrorReport(driver, def->name); return -1; } @@ -3746,7 +3745,7 @@ qemuMigrationDstPrepareDirect(virQEMUDriver *driver, if (uri->scheme == NULL) { virReportError(VIR_ERR_INVALID_ARG, - _("missing scheme in migration URI: %s"), + _("missing scheme in migration URI: %1$s"), uri_in); goto cleanup; } @@ -3755,7 +3754,7 @@ qemuMigrationDstPrepareDirect(virQEMUDriver *driver, STRNEQ(uri->scheme, "rdma") && STRNEQ(uri->scheme, "unix")) { virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, - _("unsupported scheme %s in migration URI %s"), + _("unsupported scheme %1$s in migration URI %2$s"), uri->scheme, uri_in); goto cleanup; } @@ -3765,8 +3764,9 @@ qemuMigrationDstPrepareDirect(virQEMUDriver *driver, listenAddress = uri->path; } else { if (uri->server == NULL) { - virReportError(VIR_ERR_INVALID_ARG, _("missing host in migration" - " URI: %s"), uri_in); + virReportError(VIR_ERR_INVALID_ARG, + _("missing host in migration URI: %1$s"), + uri_in); goto cleanup; } @@ -4332,7 +4332,7 @@ qemuMigrationSrcConnect(virQEMUDriver *driver, /* Migration expects a blocking FD */ if (virSetBlocking(spec->dest.fd.qemu, true) < 0) { - virReportSystemError(errno, _("Unable to set FD %d blocking"), + virReportSystemError(errno, _("Unable to set FD %1$d blocking"), spec->dest.fd.qemu); goto cleanup; } @@ -4604,7 +4604,7 @@ qemuMigrationSrcStart(virDomainObj *vm, } virReportError(VIR_ERR_INTERNAL_ERROR, - _("unexpected migration schema: %d"), spec->destType); + _("unexpected migration schema: %1$d"), spec->destType); return -1; } @@ -4745,8 +4745,7 @@ qemuMigrationSrcRun(virQEMUDriver *driver, if (virLockManagerPluginUsesState(driver->lockManager) && !cookieout) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Migration with lock driver %s requires" - " cookie support"), + _("Migration with lock driver %1$s requires cookie support"), virLockManagerPluginGetName(driver->lockManager)); return -1; } @@ -4884,7 +4883,7 @@ qemuMigrationSrcRun(virQEMUDriver *driver, * as this is a critical section so we are guaranteed * vm->job->abortJob will not change */ vm->job->current->status = VIR_DOMAIN_JOB_STATUS_CANCELED; - virReportError(VIR_ERR_OPERATION_ABORTED, _("%s: %s"), + virReportError(VIR_ERR_OPERATION_ABORTED, _("%1$s: %2$s"), virDomainAsyncJobTypeToString(vm->job->asyncJob), _("canceled by client")); goto exit_monitor; @@ -5130,7 +5129,7 @@ qemuMigrationSrcPerformNative(virQEMUDriver *driver, if (uribits->scheme == NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("missing scheme in migration URI: %s"), + _("missing scheme in migration URI: %1$s"), uri); return -1; } @@ -6302,7 +6301,7 @@ qemuMigrationDstVPAssociatePortProfiles(virDomainDef *def) VIR_NETDEV_VPORT_PROFILE_OP_MIGRATE_IN_FINISH, false) < 0) { virReportError(VIR_ERR_OPERATION_FAILED, - _("Port profile Associate failed for %s"), + _("Port profile Associate failed for %1$s"), net->ifname); goto err_exit; } -- 2.39.2

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com&gt; --- src/qemu/qemu_process.c | 116 +++++++++++++++++++--------------------- 1 file changed, 54 insertions(+), 62 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index deebd03717..8818eb4c8d 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -220,7 +220,7 @@ qemuConnectAgent(virQEMUDriver *driver, virDomainObj *vm) } if (qemuSecuritySetDaemonSocketLabel(driver->securityManager, vm->def) < 0) { - VIR_ERROR(_("Failed to set security context for agent for %s"), + VIR_ERROR(_("Failed to set security context for agent for %1$s"), vm->def->name); goto cleanup; } @@ -238,7 +238,7 @@ qemuConnectAgent(virQEMUDriver *driver, virDomainObj *vm) } if (qemuSecurityClearSocketLabel(driver->securityManager, vm->def) < 0) { - VIR_ERROR(_("Failed to clear security context for agent for %s"), + VIR_ERROR(_("Failed to clear security context for agent for %1$s"), vm->def->name); qemuAgentClose(agent); goto cleanup; @@ -395,7 +395,7 @@ qemuProcessFindDomainDiskByAliasOrQOM(virDomainObj *vm, } virReportError(VIR_ERR_INTERNAL_ERROR, - _("no disk found with alias '%s' or id '%s'"), + _("no disk found with alias '%1$s' or id '%2$s'"), NULLSTR(alias), NULLSTR(qomid)); return NULL; } @@ -1864,7 +1864,7 @@ qemuConnectMonitor(virQEMUDriver *driver, qemuMonitor *mon = NULL; if (qemuSecuritySetDaemonSocketLabel(driver->securityManager, vm->def) < 0) { - VIR_ERROR(_("Failed to set security context for monitor for %s"), + VIR_ERROR(_("Failed to set security context for monitor for %1$s"), vm->def->name); return -1; } @@ -1888,7 +1888,7 @@ qemuConnectMonitor(virQEMUDriver *driver, priv->mon = mon; if (qemuSecurityClearSocketLabel(driver->securityManager, vm->def) < 0) { - VIR_ERROR(_("Failed to clear security context for monitor for %s"), + VIR_ERROR(_("Failed to clear security context for monitor for %1$s"), vm->def->name); return -1; } @@ -2026,7 +2026,7 @@ qemuProcessLookupPTYs(virDomainChrDef **devices, * pty path for this chardev, report an error */ virReportError(VIR_ERR_INTERNAL_ERROR, - _("no assigned pty for device %s"), id); + _("no assigned pty for device %1$s"), id); return -1; } else { /* 'info chardev' had no pty path for this chardev, @@ -2155,7 +2155,7 @@ qemuProcessRefreshPRManagerState(virDomainObj *vm, if (!(prManagerInfo = virHashLookup(info, managedAlias))) { virReportError(VIR_ERR_OPERATION_FAILED, - _("missing info on pr-manager %s"), + _("missing info on pr-manager %1$s"), managedAlias); return -1; } @@ -2360,8 +2360,7 @@ qemuProcessDetectIOThreadPIDs(virDomainObj *vm, if (niothreads != vm->def->niothreadids) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("got wrong number of IOThread pids from QEMU monitor. " - "got %d, wanted %zu"), + _("got wrong number of IOThread pids from QEMU monitor. got %1$d, wanted %2$zu"), niothreads, vm->def->niothreadids); goto cleanup; } @@ -2378,7 +2377,7 @@ qemuProcessDetectIOThreadPIDs(virDomainObj *vm, if (!(iothrid = virDomainIOThreadIDFind(vm->def, iothreads[i]->iothread_id))) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("iothread %d not found"), + _("iothread %1$d not found"), iothreads[i]->iothread_id); goto cleanup; } @@ -2518,7 +2517,7 @@ qemuProcessSetLinkStates(virDomainObj *vm, VIR_DOMAIN_NET_INTERFACE_LINK_STATE_DOWN); if (rv < 0) { virReportError(VIR_ERR_OPERATION_FAILED, - _("Couldn't set link state on interface: %s"), + _("Couldn't set link state on interface: %1$s"), def->nets[i]->info.alias); goto cleanup; } @@ -2839,7 +2838,7 @@ qemuProcessStartManagedPRDaemon(virDomainObj *vm) cfg = virQEMUDriverGetConfig(driver); if (!virFileIsExecutable(cfg->prHelperName)) { - virReportSystemError(errno, _("'%s' is not a suitable pr helper"), + virReportSystemError(errno, _("'%1$s' is not a suitable pr helper"), cfg->prHelperName); goto cleanup; } @@ -2854,7 +2853,7 @@ qemuProcessStartManagedPRDaemon(virDomainObj *vm) if (unlink(socketPath) < 0 && errno != ENOENT) { virReportSystemError(errno, - _("Unable to remove stale socket path: %s"), + _("Unable to remove stale socket path: %1$s"), socketPath); goto cleanup; } @@ -2886,7 +2885,7 @@ qemuProcessStartManagedPRDaemon(virDomainObj *vm) if (virPidFileReadPath(pidfile, &cpid) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("pr helper %s didn't show up"), + _("pr helper %1$s didn't show up"), cfg->prHelperName); goto cleanup; } @@ -2904,11 +2903,11 @@ qemuProcessStartManagedPRDaemon(virDomainObj *vm) if (saferead(errfd, errbuf, sizeof(errbuf) - 1) < 0) { virReportSystemError(errno, - _("pr helper %s died unexpectedly"), + _("pr helper %1$s died unexpectedly"), cfg->prHelperName); } else { virReportError(VIR_ERR_OPERATION_FAILED, - _("pr helper died and reported: %s"), errbuf); + _("pr helper died and reported: %1$s"), errbuf); } goto cleanup; } @@ -4038,7 +4037,7 @@ qemuProcessBuildDestroyMemoryPathsImpl(virQEMUDriver *driver, if (g_mkdir_with_parents(path, 0700) < 0) { virReportSystemError(errno, - _("Unable to create %s"), + _("Unable to create %1$s"), path); return -1; } @@ -4118,7 +4117,7 @@ qemuProcessDestroyMemoryBackingPath(virQEMUDriver *driver, if (unlink(path) < 0 && errno != ENOENT) { - virReportSystemError(errno, _("Unable to remove %s"), path); + virReportSystemError(errno, _("Unable to remove %1$s"), path); return -1; } @@ -4279,7 +4278,7 @@ qemuProcessVerifyHypervFeatures(virDomainDef *def, continue; virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("host doesn't support hyperv stimer '%s' feature"), + _("host doesn't support hyperv stimer '%1$s' feature"), "direct"); return -1; } @@ -4305,7 +4304,7 @@ qemuProcessVerifyHypervFeatures(virDomainDef *def, case VIR_DOMAIN_HYPERV_EVMCS: case VIR_DOMAIN_HYPERV_AVIC: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("host doesn't support hyperv '%s' feature"), + _("host doesn't support hyperv '%1$s' feature"), virDomainHypervTypeToString(i)); return -1; @@ -4577,14 +4576,14 @@ qemuPrepareNVRAMHelper(int dstFD, if ((r = saferead(data->srcFD, buf, sizeof(buf))) < 0) { virReportSystemError(errno, - _("Unable to read from file '%s'"), + _("Unable to read from file '%1$s'"), data->srcPath); return -2; } if (safewrite(dstFD, buf, r) < 0) { virReportSystemError(errno, - _("Unable to write to file '%s'"), + _("Unable to write to file '%1$s'"), dstPath); return -1; } @@ -4622,15 +4621,15 @@ qemuPrepareNVRAM(virQEMUDriver *driver, if (!loader->nvramTemplate) { virReportError(VIR_ERR_OPERATION_FAILED, - _("unable to find any master var store for " - "loader: %s"), loader->path); + _("unable to find any master var store for loader: %1$s"), + loader->path); return -1; } if ((srcFD = virFileOpenAs(loader->nvramTemplate, O_RDONLY, 0, -1, -1, 0)) < 0) { virReportSystemError(-srcFD, - _("Failed to open file '%s'"), + _("Failed to open file '%1$s'"), loader->nvramTemplate); return -1; } @@ -4924,7 +4923,7 @@ qemuProcessGetNetworkAddress(const char *netname, ipdef = virNetworkDefGetIPByIndex(netdef, AF_UNSPEC, 0); if (!ipdef) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("network '%s' doesn't have an IP address"), + _("network '%1$s' doesn't have an IP address"), netdef->name); return -1; } @@ -4948,7 +4947,7 @@ qemuProcessGetNetworkAddress(const char *netname, if (!dev_name) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("network '%s' has no associated interface or bridge"), + _("network '%1$s' has no associated interface or bridge"), netdef->name); return -1; } @@ -5271,7 +5270,7 @@ qemuProcessMakeDir(virQEMUDriver *driver, const char *path) { if (g_mkdir_with_parents(path, 0750) < 0) { - virReportSystemError(errno, _("Cannot create directory '%s'"), path); + virReportSystemError(errno, _("Cannot create directory '%1$s'"), path); return -1; } @@ -5375,7 +5374,7 @@ qemuProcessStartValidateShmem(virDomainObj *vm) if (strchr(shmem->name, '/')) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("shmem name '%s' must not contain '/'"), + _("shmem name '%1$s' must not contain '/'"), shmem->name); return -1; } @@ -5488,9 +5487,7 @@ qemuProcessStartValidateTSC(virQEMUDriver *driver, } virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Requested TSC frequency %llu Hz is outside tolerance " - "range ([%llu, %llu] Hz) around host frequency %llu Hz " - "and TSC scaling is not supported by the host CPU"), + _("Requested TSC frequency %1$llu Hz is outside tolerance range ([%2$llu, %3$llu] Hz) around host frequency %4$llu Hz and TSC scaling is not supported by the host CPU"), freq, minFreq, maxFreq, tsc->frequency); return -1; } @@ -5562,8 +5559,7 @@ qemuProcessStartValidate(virQEMUDriver *driver, str = g_strjoinv(", ", features); virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Some features cannot be reliably used " - "with this QEMU: %s"), str); + _("Some features cannot be reliably used with this QEMU: %1$s"), str); return -1; } } @@ -5596,7 +5592,7 @@ qemuProcessStartUpdateCustomCaps(virDomainObj *vm) for (next = cfg->capabilityfilters; *next; next++) { if ((tmp = virQEMUCapsTypeFromString(*next)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("invalid capability_filters capability '%s'"), + _("invalid capability_filters capability '%1$s'"), *next); return -1; } @@ -5609,7 +5605,7 @@ qemuProcessStartUpdateCustomCaps(virDomainObj *vm) for (next = nsdef->capsadd; next && *next; next++) { if ((tmp = virQEMUCapsTypeFromString(*next)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("invalid qemu namespace capability '%s'"), + _("invalid qemu namespace capability '%1$s'"), *next); return -1; } @@ -5620,7 +5616,7 @@ qemuProcessStartUpdateCustomCaps(virDomainObj *vm) for (next = nsdef->capsdel; next && *next; next++) { if ((tmp = virQEMUCapsTypeFromString(*next)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("invalid qemu namespace capability '%s'"), + _("invalid qemu namespace capability '%1$s'"), *next); return -1; } @@ -5814,9 +5810,7 @@ qemuProcessNetworkPrepareDevices(virQEMUDriver *driver, if (virDomainHostdevFind(def, hostdev, NULL) >= 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("PCI device %04x:%02x:%02x.%x " - "allocated from network %s is already " - "in use by domain %s"), + _("PCI device %1$04x:%2$02x:%3$02x.%4$x allocated from network %5$s is already in use by domain %6$s"), pcisrc->addr.domain, pcisrc->addr.bus, pcisrc->addr.slot, pcisrc->addr.function, net->data.network.name, def->name); @@ -5850,14 +5844,14 @@ qemuProcessSetupVcpuSchedCoreHelper(pid_t ppid G_GNUC_UNUSED, if (virProcessSchedCoreShareFrom(data->dummypid) < 0) { virReportSystemError(errno, - _("unable to share scheduling cookie from %lld"), + _("unable to share scheduling cookie from %1$lld"), (long long) data->dummypid); return -1; } if (virProcessSchedCoreShareTo(data->vcpupid) < 0) { virReportSystemError(errno, - _("unable to share scheduling cookie to %lld"), + _("unable to share scheduling cookie to %1$lld"), (long long) data->vcpupid); return -1; } @@ -5974,7 +5968,7 @@ qemuProcessSetupAllVcpusSchedCoreHelper(pid_t ppid G_GNUC_UNUSED, if (vcpupid > 0 && virProcessSchedCoreShareTo(vcpupid) < 0) { virReportSystemError(errno, - _("unable to share scheduling cookie to %lld"), + _("unable to share scheduling cookie to %1$lld"), (long long) vcpupid); return -1; } @@ -6096,13 +6090,13 @@ qemuProcessValidateHotpluggableVcpus(virDomainDef *def) if (vcpu->order != 0) { if (virBitmapIsBitSet(ordermap, vcpu->order)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("duplicate vcpu order '%u'"), vcpu->order); + _("duplicate vcpu order '%1$u'"), vcpu->order); return -1; } if (virBitmapSetBit(ordermap, vcpu->order)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("vcpu order '%u' exceeds vcpu count"), + _("vcpu order '%1$u' exceeds vcpu count"), vcpu->order); return -1; } @@ -6114,8 +6108,8 @@ qemuProcessValidateHotpluggableVcpus(virDomainDef *def) subvcpu->online != vcpu->online || subvcpu->order != vcpu->order) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("vcpus '%zu' and '%zu' are in the same hotplug " - "group but differ in configuration"), i, j); + _("vcpus '%1$zu' and '%2$zu' are in the same hotplug group but differ in configuration"), + i, j); return -1; } } @@ -6125,7 +6119,7 @@ qemuProcessValidateHotpluggableVcpus(virDomainDef *def) vcpupriv->thread_id == -1 && vcpupriv->node_id == -1) || !vcpupriv->type) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("vcpu '%zu' is missing hotplug data"), i); + _("vcpu '%1$zu' is missing hotplug data"), i); return -1; } } @@ -6275,8 +6269,7 @@ qemuProcessUpdateGuestCPU(virDomainDef *def, if (!virQEMUCapsIsCPUModeSupported(qemuCaps, hostarch, def->virtType, def->cpu->mode, def->os.machine)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("CPU mode '%s' for %s %s domain on %s host is not " - "supported by hypervisor"), + _("CPU mode '%1$s' for %2$s %3$s domain on %4$s host is not supported by hypervisor"), virCPUModeTypeToString(def->cpu->mode), virArchToString(def->os.arch), virDomainVirtTypeToString(def->virtType), @@ -6815,7 +6808,7 @@ qemuProcessSEVCreateFile(virDomainObj *vm, return -1; if (virFileRewriteStr(configFile, S_IRUSR | S_IWUSR, data) < 0) { - virReportSystemError(errno, _("failed to write data to config '%s'"), + virReportSystemError(errno, _("failed to write data to config '%1$s'"), configFile); return -1; } @@ -7089,7 +7082,7 @@ qemuProcessPrepareHostBackendChardevOne(virDomainDeviceDef *dev, case VIR_DOMAIN_CHR_TYPE_LAST: default: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unsupported chardev '%s'"), + _("unsupported chardev '%1$s'"), virDomainChrTypeToString(chardev->type)); return -1; } @@ -7247,7 +7240,7 @@ qemuProcessPrepareHost(virQEMUDriver *driver, if (g_mkdir_with_parents(cfg->logDir, 0777) < 0) { virReportSystemError(errno, - _("cannot create log directory %s"), + _("cannot create log directory %1$s"), cfg->logDir); return -1; } @@ -7262,7 +7255,7 @@ qemuProcessPrepareHost(virQEMUDriver *driver, if (unlink(priv->pidfile) < 0 && errno != ENOENT) { virReportSystemError(errno, - _("Cannot remove stale PID file %s"), + _("Cannot remove stale PID file %1$s"), priv->pidfile); return -1; } @@ -7766,7 +7759,7 @@ qemuProcessLaunch(virConnectPtr conn, if (rv == 0) { if ((rv = virPidFileReadPath(priv->pidfile, &vm->pid)) < 0) { virReportSystemError(-rv, - _("Domain %s didn't show up"), + _("Domain %1$s didn't show up"), vm->def->name); goto cleanup; } @@ -7847,7 +7840,7 @@ qemuProcessLaunch(virConnectPtr conn, if (fstat(incoming->fd, &stdin_sb) < 0) { virReportSystemError(errno, - _("cannot stat fd %d"), incoming->fd); + _("cannot stat fd %1$d"), incoming->fd); goto cleanup; } if (S_ISFIFO(stdin_sb.st_mode) && @@ -8988,7 +8981,7 @@ qemuProcessReconnect(void *opaque) if (!priv->qemuCaps) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("domain '%s' has no capabilities recorded"), + _("domain '%1$s' has no capabilities recorded"), obj->def->name); goto error; } @@ -9352,7 +9345,7 @@ qemuProcessQEMULabelUniqPath(qemuProcessQMP *proc) /* We cannot use the security driver here, but we should not need to. */ if (chown(proc->uniqDir, proc->runUid, -1) < 0) { virReportSystemError(errno, - _("Cannot chown uniq path: %s"), + _("Cannot chown uniq path: %1$s"), proc->uniqDir); return -1; } @@ -9372,8 +9365,7 @@ qemuProcessQMPInit(qemuProcessQMP *proc) if (!(proc->uniqDir = g_mkdtemp(template))) { virReportSystemError(errno, - _("Failed to create unique directory with " - "template '%s' for probing QEMU"), + _("Failed to create unique directory with template '%1$s' for probing QEMU"), template); return -1; } @@ -9461,14 +9453,14 @@ qemuProcessQMPLaunch(qemuProcessQMP *proc) if (status != 0) { VIR_DEBUG("QEMU %s exited with status %d", proc->binary, status); virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to start QEMU binary %s for probing: %s"), + _("Failed to start QEMU binary %1$s for probing: %2$s"), proc->binary, proc->stdErr ? proc->stdErr : _("unknown error")); return -1; } if ((rc = virPidFileReadPath(proc->pidfile, &proc->pid)) < 0) { - virReportSystemError(-rc, _("Failed to read pidfile %s"), proc->pidfile); + virReportSystemError(-rc, _("Failed to read pidfile %1$s"), proc->pidfile); return -1; } -- 2.39.2

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com&gt; --- src/qemu/qemu_agent.c | 41 ++++++++--------- src/qemu/qemu_backup.c | 12 ++--- src/qemu/qemu_block.c | 39 ++++++++-------- src/qemu/qemu_blockjob.c | 2 +- src/qemu/qemu_capabilities.c | 50 ++++++++++---------- src/qemu/qemu_cgroup.c | 4 +- src/qemu/qemu_checkpoint.c | 19 ++++---- src/qemu/qemu_conf.c | 75 ++++++++++++++---------------- src/qemu/qemu_dbus.c | 12 ++--- src/qemu/qemu_domain_address.c | 26 ++++------- src/qemu/qemu_domainjob.c | 6 +-- src/qemu/qemu_extdevice.c | 2 +- src/qemu/qemu_fd.c | 2 +- src/qemu/qemu_firmware.c | 42 ++++++++--------- src/qemu/qemu_interface.c | 6 +-- src/qemu/qemu_interop_config.c | 4 +- src/qemu/qemu_migration_cookie.c | 34 +++++++------- src/qemu/qemu_migration_params.c | 18 ++++---- src/qemu/qemu_monitor.c | 30 ++++++------ src/qemu/qemu_monitor_text.c | 4 +- src/qemu/qemu_namespace.c | 46 +++++++++---------- src/qemu/qemu_passt.c | 2 +- src/qemu/qemu_qapi.c | 4 +- src/qemu/qemu_saveimage.c | 30 ++++++------ src/qemu/qemu_slirp.c | 6 +-- src/qemu/qemu_snapshot.c | 78 ++++++++++++++------------------ src/qemu/qemu_tpm.c | 29 ++++++------ src/qemu/qemu_vhost_user.c | 8 ++-- src/qemu/qemu_vhost_user_gpu.c | 2 +- src/qemu/qemu_virtiofs.c | 10 ++-- 30 files changed, 303 insertions(+), 340 deletions(-) diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index b5aa518d55..eda1308097 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -169,7 +169,7 @@ qemuAgentOpenUnix(const char *socketpath) addr.sun_family = AF_UNIX; if (virStrcpyStatic(addr.sun_path, socketpath) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Socket path %s too big for destination"), socketpath); + _("Socket path %1$s too big for destination"), socketpath); goto error; } @@ -226,7 +226,7 @@ qemuAgentIOProcessLine(qemuAgent *agent, if (virJSONValueGetType(obj) != VIR_JSON_TYPE_OBJECT) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Parsed JSON reply '%s' isn't an object"), line); + _("Parsed JSON reply '%1$s' isn't an object"), line); return -1; } @@ -264,7 +264,7 @@ qemuAgentIOProcessLine(qemuAgent *agent, } virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unknown JSON reply '%s'"), line); + _("Unknown JSON reply '%1$s'"), line); return -1; } @@ -375,7 +375,7 @@ qemuAgentIORead(qemuAgent *agent) if (avail < 1024) { if (agent->bufferLength >= QEMU_AGENT_MAX_RESPONSE) { virReportSystemError(ERANGE, - _("No complete agent response found in %d bytes"), + _("No complete agent response found in %1$d bytes"), QEMU_AGENT_MAX_RESPONSE); return -1; } @@ -616,7 +616,7 @@ qemuAgentOpen(virDomainObj *vm, if (config->type != VIR_DOMAIN_CHR_TYPE_UNIX) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unable to handle agent type: %s"), + _("unable to handle agent type: %1$s"), virDomainChrTypeToString(config->type)); goto cleanup; } @@ -633,7 +633,7 @@ qemuAgentOpen(virDomainObj *vm, agent->socket = g_socket_new_from_fd(agent->fd, &gerr); if (!agent->socket) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to create socket object: %s"), + _("Unable to create socket object: %1$s"), gerr->message); goto cleanup; } @@ -973,7 +973,7 @@ qemuAgentCheckError(virJSONValue *cmd, /* Only send the user the command name + friendly error */ if (!error) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unable to execute QEMU agent command '%s'"), + _("unable to execute QEMU agent command '%1$s'"), qemuAgentCommandName(cmd)); return -1; } @@ -987,7 +987,7 @@ qemuAgentCheckError(virJSONValue *cmd, } virReportError(VIR_ERR_INTERNAL_ERROR, - _("unable to execute QEMU agent command '%s': %s"), + _("unable to execute QEMU agent command '%1$s': %2$s"), qemuAgentCommandName(cmd), qemuAgentStringifyError(error)); @@ -1000,7 +1000,7 @@ qemuAgentCheckError(virJSONValue *cmd, VIR_DEBUG("Neither 'return' nor 'error' is set in the JSON reply %s: %s", NULLSTR(cmdstr), NULLSTR(replystr)); virReportError(VIR_ERR_INTERNAL_ERROR, - _("unable to execute QEMU agent command '%s'"), + _("unable to execute QEMU agent command '%1$s'"), qemuAgentCommandName(cmd)); return -1; } @@ -1283,8 +1283,7 @@ qemuAgentArbitraryCommand(qemuAgent *agent, *result = NULL; if (timeout < VIR_DOMAIN_QEMU_AGENT_COMMAND_MIN) { virReportError(VIR_ERR_INVALID_ARG, - _("guest agent timeout '%d' is " - "less than the minimum '%d'"), + _("guest agent timeout '%1$d' is less than the minimum '%2$d'"), timeout, VIR_DOMAIN_QEMU_AGENT_COMMAND_MIN); return -1; } @@ -1654,7 +1653,7 @@ qemuAgentSetTime(qemuAgent *agent, * not ULLONG_MAX. */ if (seconds > LLONG_MAX / 1000000000LL) { virReportError(VIR_ERR_INVALID_ARG, - _("Time '%lld' is too big for guest agent"), + _("Time '%1$lld' is too big for guest agent"), seconds); return -1; } @@ -1739,7 +1738,7 @@ qemuAgentGetDiskAddress(virJSONValue *json) do { \ if (virJSONValueObjectGetNumberUint(jsonObject, name, var) < 0) { \ virReportError(VIR_ERR_INTERNAL_ERROR, \ - _("'%s' missing"), name); \ + _("'%1$s' missing"), name); \ return NULL; \ } \ } while (0) @@ -1796,8 +1795,7 @@ qemuAgentGetFSInfoFillDisks(virJSONValue *jsondisks, if (!jsondisk) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("array element '%zd' of '%zd' missing in " - "guest-get-fsinfo 'disk' data"), + _("array element '%1$zd' of '%2$zd' missing in guest-get-fsinfo 'disk' data"), i, fsinfo->ndisks); return -1; } @@ -1859,8 +1857,7 @@ qemuAgentGetFSInfo(qemuAgent *agent, if (!entry) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("array element '%zd' of '%zd' missing in " - "guest-get-fsinfo return data"), + _("array element '%1$zd' of '%2$zd' missing in guest-get-fsinfo return data"), i, ndata); goto cleanup; } @@ -1951,14 +1948,14 @@ qemuAgentGetInterfaceOneAddress(virDomainIPAddressPtr ip_addr, type = virJSONValueObjectGetString(ip_addr_obj, "ip-address-type"); if (!type) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("qemu agent didn't provide 'ip-address-type'" - " field for interface '%s'"), name); + _("qemu agent didn't provide 'ip-address-type' field for interface '%1$s'"), + name); return -1; } if (STRNEQ(type, "ipv4") && STRNEQ(type, "ipv6")) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unknown ip address type '%s'"), + _("unknown ip address type '%1$s'"), type); return -1; } @@ -1966,8 +1963,8 @@ qemuAgentGetInterfaceOneAddress(virDomainIPAddressPtr ip_addr, addr = virJSONValueObjectGetString(ip_addr_obj, "ip-address"); if (!addr) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("qemu agent didn't provide 'ip-address'" - " field for interface '%s'"), name); + _("qemu agent didn't provide 'ip-address' field for interface '%1$s'"), + name); return -1; } diff --git a/src/qemu/qemu_backup.c b/src/qemu/qemu_backup.c index 6a5aacd9f6..3be33193f4 100644 --- a/src/qemu/qemu_backup.c +++ b/src/qemu/qemu_backup.c @@ -206,7 +206,7 @@ qemuBackupDiskPrepareOneBitmaps(struct qemuBackupDiskData *dd, dd->backupdisk->incremental, blockNamedNodeData)) { virReportError(VIR_ERR_CHECKPOINT_INCONSISTENT, - _("missing or broken bitmap '%s' for disk '%s'"), + _("missing or broken bitmap '%1$s' for disk '%2$s'"), dd->backupdisk->incremental, dd->domdisk->dst); return -1; } @@ -256,7 +256,7 @@ qemuBackupDiskPrepareDataOne(virDomainObj *vm, if (!(dd->domdisk = virDomainDiskByTarget(vm->def, dd->backupdisk->name))) { virReportError(VIR_ERR_INVALID_ARG, - _("no disk named '%s'"), dd->backupdisk->name); + _("no disk named '%1$s'"), dd->backupdisk->name); return -1; } @@ -268,7 +268,7 @@ qemuBackupDiskPrepareDataOne(virDomainObj *vm, } else if (dd->store->format != VIR_STORAGE_FILE_QCOW2) { if (pull) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("pull mode backup for disk '%s' requires qcow2 driver"), + _("pull mode backup for disk '%1$s' requires qcow2 driver"), dd->backupdisk->name); return -1; } @@ -298,7 +298,7 @@ qemuBackupDiskPrepareDataOne(virDomainObj *vm, * has corresponding bitmap. */ if (!virDomainCheckpointFindByName(vm->checkpoints, dd->backupdisk->incremental)) { virReportError(VIR_ERR_NO_DOMAIN_CHECKPOINT, - _("Checkpoint '%s' for incremental backup of disk '%s' not found"), + _("Checkpoint '%1$s' for incremental backup of disk '%2$s' not found"), dd->backupdisk->incremental, dd->backupdisk->name); return -1; } @@ -428,7 +428,7 @@ qemuBackupDiskPrepareOneStorage(virDomainObj *vm, if (virFileExists(dd->store->path)) { virReportError(VIR_ERR_INVALID_ARG, - _("store '%s' for backup of '%s' exists"), + _("store '%1$s' for backup of '%2$s' exists"), dd->store->path, dd->domdisk->dst); return -1; } @@ -440,7 +440,7 @@ qemuBackupDiskPrepareOneStorage(virDomainObj *vm, if (virStorageSourceCreate(dd->store) < 0) { virReportSystemError(errno, - _("failed to create image file '%s'"), + _("failed to create image file '%1$s'"), NULLSTR(dd->store->path)); return -1; } diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c index 8fcebd8992..918b426103 100644 --- a/src/qemu/qemu_block.c +++ b/src/qemu/qemu_block.c @@ -44,7 +44,7 @@ qemuBlockNodeNameValidate(const char *nn) if (strlen(nn) >= qemuBlockNodeNameBufSize) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("node-name '%s' too long for qemu"), nn); + _("node-name '%1$s' too long for qemu"), nn); return -1; } @@ -80,7 +80,7 @@ qemuBlockStorageSourceGetURI(virStorageSource *src) if (src->nhosts != 1) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("protocol '%s' accepts only one host"), + _("protocol '%1$s' accepts only one host"), virStorageNetProtocolTypeToString(src->protocol)); return NULL; } @@ -153,7 +153,7 @@ qemuBlockStorageSourceBuildJSONSocketAddress(virStorageNetHostDef *host) case VIR_STORAGE_NET_HOST_TRANS_RDMA: case VIR_STORAGE_NET_HOST_TRANS_LAST: virReportError(VIR_ERR_INTERNAL_ERROR, - _("transport protocol '%s' is not yet supported"), + _("transport protocol '%1$s' is not yet supported"), virStorageNetHostTransportTypeToString(host->transport)); return NULL; } @@ -469,7 +469,7 @@ qemuBlockStorageSourceGetISCSIProps(virStorageSource *src, *(lunStr++) = '\0'; if (virStrToLong_ui(lunStr, NULL, 10, &lun) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("cannot parse target for lunStr '%s'"), + _("cannot parse target for lunStr '%1$s'"), target); return NULL; } @@ -866,7 +866,7 @@ qemuBlockStorageSourceGetBackendProps(virStorageSource *src, case VIR_STORAGE_TYPE_VOLUME: virReportError(VIR_ERR_INTERNAL_ERROR, - _("storage source pool '%s' volume '%s' is not translated"), + _("storage source pool '%1$s' volume '%2$s' is not translated"), src->srcpool->pool, src->srcpool->volume); return NULL; @@ -1212,7 +1212,7 @@ qemuBlockStorageSourceGetBlockdevFormatProps(virStorageSource *src) case VIR_STORAGE_FILE_ISO: case VIR_STORAGE_FILE_DIR: virReportError(VIR_ERR_INTERNAL_ERROR, - _("mishandled storage format '%s'"), + _("mishandled storage format '%1$s'"), virStorageFileFormatTypeToString(src->format)); return NULL; @@ -1271,7 +1271,7 @@ qemuBlockStorageSourceGetBlockdevProps(virStorageSource *src, } else { if (virStorageSourceIsBacking(backingStore)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("storage format '%s' does not support backing store"), + _("storage format '%1$s' does not support backing store"), virStorageFileFormatTypeToString(src->format)); return NULL; } @@ -2198,7 +2198,7 @@ qemuBlockStorageSourceCreateGetFormatProps(virStorageSource *src, case VIR_STORAGE_FILE_AUTO: case VIR_STORAGE_FILE_NONE: virReportError(VIR_ERR_INTERNAL_ERROR, - _("mishandled storage format '%s'"), + _("mishandled storage format '%1$s'"), virStorageFileFormatTypeToString(src->format)); return -1; @@ -2352,7 +2352,7 @@ qemuBlockStorageSourceCreateGeneric(virDomainObj *vm, _("blockdev-create job was cancelled")); } else { virReportError(VIR_ERR_OPERATION_FAILED, - _("failed to format image: '%s'"), NULLSTR(job->errmsg)); + _("failed to format image: '%1$s'"), NULLSTR(job->errmsg)); } goto cleanup; } @@ -2421,7 +2421,7 @@ qemuBlockStorageSourceCreateFormat(virDomainObj *vm, if (!createformatprops) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, - _("can't create storage format '%s'"), + _("can't create storage format '%1$s'"), virStorageFileFormatTypeToString(src->format)); return -1; } @@ -2552,7 +2552,7 @@ qemuBlockStorageSourceCreateDetectSize(GHashTable *blockNamedNodeData, if (!(entry = virHashLookup(blockNamedNodeData, templ->nodeformat))) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("failed to update capacity data for block node '%s'"), + _("failed to update capacity data for block node '%1$s'"), templ->nodeformat); return -1; } @@ -3282,7 +3282,7 @@ qemuBlockCommit(virDomainObj *vm, if (virStorageSourceIsEmpty(disk->src)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("disk %s has no source file to be committed"), + _("disk %1$s has no source file to be committed"), disk->dst); return NULL; } @@ -3297,20 +3297,20 @@ qemuBlockCommit(virDomainObj *vm, /* XXX Should we auto-pivot when COMMIT_ACTIVE is not specified? */ if (!(flags & VIR_DOMAIN_BLOCK_COMMIT_ACTIVE)) { virReportError(VIR_ERR_INVALID_ARG, - _("commit of '%s' active layer requires active flag"), + _("commit of '%1$s' active layer requires active flag"), disk->dst); return NULL; } } else if (flags & VIR_DOMAIN_BLOCK_COMMIT_ACTIVE) { virReportError(VIR_ERR_INVALID_ARG, - _("active commit requested but '%s' is not active"), + _("active commit requested but '%1$s' is not active"), topSource->path); return NULL; } if (!virStorageSourceHasBacking(topSource)) { virReportError(VIR_ERR_INVALID_ARG, - _("top '%s' in chain for '%s' has no backing file"), + _("top '%1$s' in chain for '%2$s' has no backing file"), topSource->path, disk->src->path); return NULL; } @@ -3318,8 +3318,7 @@ qemuBlockCommit(virDomainObj *vm, if ((flags & VIR_DOMAIN_BLOCK_COMMIT_SHALLOW) && baseSource != topSource->backingStore) { virReportError(VIR_ERR_INVALID_ARG, - _("base '%s' is not immediately below '%s' in chain " - "for '%s'"), + _("base '%1$s' is not immediately below '%2$s' in chain for '%3$s'"), baseSource->path, topSource->path, disk->src->path); return NULL; } @@ -3448,7 +3447,7 @@ qemuBlockPivot(virDomainObj *vm, if (job->state != QEMU_BLOCKJOB_STATE_READY) { virReportError(VIR_ERR_BLOCK_COPY_ACTIVE, - _("block job '%s' not ready for pivot yet"), + _("block job '%1$s' not ready for pivot yet"), job->name); return -1; } @@ -3457,7 +3456,7 @@ qemuBlockPivot(virDomainObj *vm, case QEMU_BLOCKJOB_TYPE_NONE: case QEMU_BLOCKJOB_TYPE_LAST: virReportError(VIR_ERR_INTERNAL_ERROR, - _("invalid job type '%d'"), job->type); + _("invalid job type '%1$d'"), job->type); return -1; case QEMU_BLOCKJOB_TYPE_PULL: @@ -3467,7 +3466,7 @@ qemuBlockPivot(virDomainObj *vm, case QEMU_BLOCKJOB_TYPE_CREATE: case QEMU_BLOCKJOB_TYPE_BROKEN: virReportError(VIR_ERR_OPERATION_INVALID, - _("job type '%s' does not support pivot"), + _("job type '%1$s' does not support pivot"), qemuBlockjobTypeToString(job->type)); return -1; diff --git a/src/qemu/qemu_blockjob.c b/src/qemu/qemu_blockjob.c index a20cf1db62..ecd9007ef5 100644 --- a/src/qemu/qemu_blockjob.c +++ b/src/qemu/qemu_blockjob.c @@ -175,7 +175,7 @@ qemuBlockJobRegister(qemuBlockJobData *job, if (disk && QEMU_DOMAIN_DISK_PRIVATE(disk)->blockjob) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("disk '%s' has a blockjob assigned"), disk->dst); + _("disk '%1$s' has a blockjob assigned"), disk->dst); return -1; } diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 218e6c09a4..68e940b70d 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1807,7 +1807,7 @@ int virQEMUCapsGetDefaultVersion(virCaps *caps, VIR_DOMAIN_OSTYPE_HVM, hostarch, VIR_DOMAIN_VIRT_NONE, NULL, NULL))) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Cannot find suitable emulator for %s"), + _("Cannot find suitable emulator for %1$s"), virArchToString(hostarch)); return -1; } @@ -3665,8 +3665,7 @@ virQEMUCapsInitCPUModelS390(virQEMUCaps *qemuCaps, if (!modelInfo) { if (type == VIR_DOMAIN_VIRT_KVM) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("missing host CPU model info from QEMU " - "capabilities for binary %s"), + _("missing host CPU model info from QEMU capabilities for binary %1$s"), qemuCaps->binary); return -1; } @@ -4034,8 +4033,7 @@ virQEMUCapsLoadHostCPUModelInfo(virQEMUCapsAccel *caps, prop->value.string = virXMLPropString(ctxt->node, "value"); if (!prop->value.string) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("invalid string value for '%s' host CPU " - "model property in QEMU capabilities cache"), + _("invalid string value for '%1$s' host CPU model property in QEMU capabilities cache"), prop->name); return -1; } @@ -4045,8 +4043,7 @@ virQEMUCapsLoadHostCPUModelInfo(virQEMUCapsAccel *caps, if (virXPathLongLong("string(./@value)", ctxt, &prop->value.number) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("invalid number value for '%s' host CPU " - "model property in QEMU capabilities cache"), + _("invalid number value for '%1$s' host CPU model property in QEMU capabilities cache"), prop->name); return -1; } @@ -4105,7 +4102,7 @@ virQEMUCapsLoadCPUModels(virArch arch, if ((strUsable = virXMLPropString(nodes[i], "usable")) && (usable = virDomainCapsCPUUsableTypeFromString(strUsable)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unknown value '%s' in attribute 'usable'"), + _("unknown value '%1$s' in attribute 'usable'"), strUsable); return -1; } @@ -4457,7 +4454,7 @@ virQEMUCapsParseHypervCapabilities(virQEMUCaps *qemuCaps, if ((val = virDomainHypervTypeFromString(name)) < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unsupported HyperV Enlightenment feature: %s"), + _("unsupported HyperV Enlightenment feature: %1$s"), name); return -1; } @@ -4497,7 +4494,7 @@ virQEMUCapsParseFlags(virQEMUCaps *qemuCaps, xmlXPathContextPtr ctxt) flag = virQEMUCapsTypeFromString(str); if (flag < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unknown qemu capabilities flag %s"), str); + _("Unknown qemu capabilities flag %1$s"), str); return -1; } @@ -4597,7 +4594,7 @@ virQEMUCapsValidateEmulator(virQEMUCaps *qemuCaps, xmlXPathContextPtr ctxt) if (STRNEQ(str, qemuCaps->binary)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Expected caps for '%s' but saw '%s'"), + _("Expected caps for '%1$s' but saw '%2$s'"), qemuCaps->binary, str); return -1; } @@ -4618,7 +4615,7 @@ virQEMUCapsValidateArch(virQEMUCaps *qemuCaps, xmlXPathContextPtr ctxt) } if (!(qemuCaps->arch = virArchFromString(str))) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unknown arch %s in QEMU capabilities cache"), str); + _("unknown arch %1$s in QEMU capabilities cache"), str); return -1; } @@ -5128,7 +5125,7 @@ virQEMUCapsSaveFile(void *data, if (virFileWriteStr(filename, xml, 0600) < 0) { virReportSystemError(errno, - _("Failed to save '%s' for '%s'"), + _("Failed to save '%1$s' for '%2$s'"), filename, qemuCaps->binary); return -1; } @@ -5259,7 +5256,7 @@ virQEMUCapsKVMUsable(virQEMUCapsCachePriv *priv) if (stat(kvm_device, &sb) < 0) { if (errno != ENOENT) { virReportSystemError(errno, - _("Failed to stat %s"), kvm_device); + _("Failed to stat %1$s"), kvm_device); } return false; } @@ -5456,7 +5453,7 @@ virQEMUCapsInitQMPArch(virQEMUCaps *qemuCaps, if ((qemuCaps->arch = virQEMUCapsArchFromString(archstr)) == VIR_ARCH_NONE) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unknown QEMU arch %s"), archstr); + _("Unknown QEMU arch %1$s"), archstr); return -1; } @@ -5601,7 +5598,7 @@ virQEMUCapsInitQMPMonitor(virQEMUCaps *qemuCaps, if (major < QEMU_MIN_MAJOR || (major == QEMU_MIN_MAJOR && minor < QEMU_MIN_MINOR)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("QEMU version >= %d.%d.%d is required, but %d.%d.%d found"), + _("QEMU version >= %1$d.%2$d.%3$d is required, but %4$d.%5$d.%6$d found"), QEMU_MIN_MAJOR, QEMU_MIN_MINOR, QEMU_MIN_MICRO, major, minor, micro); return -1; @@ -5702,7 +5699,7 @@ virQEMUCapsLogProbeFailure(const char *binary) VIR_LOG_WARN, __FILE__, __LINE__, __func__, meta, - _("Failed to probe capabilities for %s: %s"), + _("Failed to probe capabilities for %1$s: %2$s"), binary, virGetLastErrorMessage()); } @@ -5777,7 +5774,7 @@ virQEMUCapsNewForBinaryInternal(virArch hostArch, /* We would also want to check faccessat if we cared about ACLs, * but we don't. */ if (stat(binary, &sb) < 0) { - virReportSystemError(errno, _("Cannot check QEMU binary %s"), + virReportSystemError(errno, _("Cannot check QEMU binary %1$s"), binary); return NULL; } @@ -5788,14 +5785,14 @@ virQEMUCapsNewForBinaryInternal(virArch hostArch, * in a sub-process so it's hard to feed back a useful error. */ if (!virFileIsExecutable(binary)) { - virReportSystemError(errno, _("QEMU binary %s is not executable"), + virReportSystemError(errno, _("QEMU binary %1$s is not executable"), binary); return NULL; } if (virFileExists(QEMU_MODDIR)) { if (stat(QEMU_MODDIR, &sb) < 0) { - virReportSystemError(errno, _("Cannot check QEMU module directory %s"), + virReportSystemError(errno, _("Cannot check QEMU module directory %1$s"), QEMU_MODDIR); return NULL; } @@ -6036,14 +6033,14 @@ virQEMUCapsCacheLookupDefault(virFileCache *cache, if (virttypeStr && (virttype = virDomainVirtTypeFromString(virttypeStr)) < 0) { virReportError(VIR_ERR_INVALID_ARG, - _("unknown virttype: %s"), virttypeStr); + _("unknown virttype: %1$s"), virttypeStr); return NULL; } if (archStr && (arch = virArchFromString(archStr)) == VIR_ARCH_NONE) { virReportError(VIR_ERR_INVALID_ARG, - _("unknown architecture: %s"), archStr); + _("unknown architecture: %1$s"), archStr); return NULL; } @@ -6053,7 +6050,7 @@ virQEMUCapsCacheLookupDefault(virFileCache *cache, } if (!binary) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unable to find any emulator to serve '%s' architecture"), + _("unable to find any emulator to serve '%1$s' architecture"), archStr); return NULL; } @@ -6069,8 +6066,7 @@ virQEMUCapsCacheLookupDefault(virFileCache *cache, (ARCH_IS_ARM(arch) && ARCH_IS_ARM(arch_from_caps)) || (ARCH_IS_S390(arch) && ARCH_IS_S390(arch_from_caps)))) { virReportError(VIR_ERR_INVALID_ARG, - _("architecture from emulator '%s' doesn't " - "match given architecture '%s'"), + _("architecture from emulator '%1$s' doesn't match given architecture '%2$s'"), virArchToString(arch_from_caps), virArchToString(arch)); return NULL; @@ -6083,7 +6079,7 @@ virQEMUCapsCacheLookupDefault(virFileCache *cache, if (virQEMUCapsTypeIsAccelerated(virttype) && capsType == VIR_DOMAIN_VIRT_QEMU) { virReportError(VIR_ERR_INVALID_ARG, - _("the accel '%s' is not supported by '%s' on this host"), + _("the accel '%1$s' is not supported by '%2$s' on this host"), virQEMUCapsAccelStr(virttype), binary); return NULL; } @@ -6094,7 +6090,7 @@ virQEMUCapsCacheLookupDefault(virFileCache *cache, if (!virQEMUCapsIsMachineSupported(qemuCaps, virttype, machine)) { virReportError(VIR_ERR_INVALID_ARG, - _("the machine '%s' is not supported by emulator '%s'"), + _("the machine '%1$s' is not supported by emulator '%2$s'"), machine, binary); return NULL; } diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index b1178e0146..fe78a0251a 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -171,7 +171,7 @@ qemuSetupImagePathCgroup(virDomainObj *vm, if (virDevMapperGetTargets(path, &targetPaths) < 0 && errno != ENOSYS) { virReportSystemError(errno, - _("Unable to get devmapper targets for %s"), + _("Unable to get devmapper targets for %1$s"), path); return -1; } @@ -865,7 +865,7 @@ qemuSetupCgroupAppid(virDomainObj *vm) if (virFileWriteStr(path, appid, 0) < 0) { virReportSystemError(errno, - _("Unable to write '%s' to '%s'"), appid, path); + _("Unable to write '%1$s' to '%2$s'"), appid, path); return -1; } diff --git a/src/qemu/qemu_checkpoint.c b/src/qemu/qemu_checkpoint.c index 8580158d66..8449ed176a 100644 --- a/src/qemu/qemu_checkpoint.c +++ b/src/qemu/qemu_checkpoint.c @@ -87,7 +87,7 @@ qemuCheckpointObjFromName(virDomainObj *vm, chk = virDomainCheckpointFindByName(vm->checkpoints, name); if (!chk) virReportError(VIR_ERR_NO_DOMAIN_CHECKPOINT, - _("no domain checkpoint with matching name '%s'"), + _("no domain checkpoint with matching name '%1$s'"), name); return chk; @@ -121,7 +121,7 @@ qemuCheckpointWriteMetadata(virDomainObj *vm, chkDir = g_strdup_printf("%s/%s", checkpointDir, vm->def->name); if (g_mkdir_with_parents(chkDir, 0777) < 0) { - virReportSystemError(errno, _("cannot create checkpoint directory '%s'"), + virReportSystemError(errno, _("cannot create checkpoint directory '%1$s'"), chkDir); return -1; } @@ -164,7 +164,7 @@ qemuCheckpointDiscardDiskBitmaps(virStorageSource *src, if (!found) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("bitmap '%s' not found in backing chain of '%s'"), + _("bitmap '%1$s' not found in backing chain of '%2$s'"), delbitmap, diskdst); return -1; } @@ -205,7 +205,7 @@ qemuCheckpointDiscardBitmaps(virDomainObj *vm, if (!chkdisk->bitmap) { virReportError(VIR_ERR_INVALID_ARG, - _("missing bitmap name for disk '%s' of checkpoint '%s'"), + _("missing bitmap name for disk '%1$s' of checkpoint '%2$s'"), chkdisk->name, chkdef->parent.name); return -1; } @@ -357,15 +357,14 @@ qemuCheckpointPrepare(virQEMUDriver *driver, if (STRNEQ(disk->bitmap, def->parent.name)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("bitmap for disk '%s' must match checkpoint name '%s'"), + _("bitmap for disk '%1$s' must match checkpoint name '%2$s'"), disk->name, def->parent.name); return -1; } if (vm->def->disks[i]->src->format != VIR_STORAGE_FILE_QCOW2) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("checkpoint for disk %s unsupported " - "for storage type %s"), + _("checkpoint for disk %1$s unsupported for storage type %2$s"), disk->name, virStorageFileFormatTypeToString( vm->def->disks[i]->src->format)); @@ -431,7 +430,7 @@ qemuCheckpointRedefineValidateBitmaps(virDomainObj *vm, if (!qemuBlockBitmapChainIsValid(domdisk->src, chkdef->parent.name, blockNamedNodeData)) { virReportError(VIR_ERR_CHECKPOINT_INCONSISTENT, - _("missing or broken bitmap '%s' for disk '%s'"), + _("missing or broken bitmap '%1$s' for disk '%2$s'"), chkdef->parent.name, domdisk->dst); return -1; } @@ -547,7 +546,7 @@ qemuCheckpointCreateFinalize(virQEMUDriver *driver, /* if writing of metadata fails, error out rather than trying * to silently carry on without completing the checkpoint */ virReportError(VIR_ERR_INTERNAL_ERROR, - _("unable to save metadata for checkpoint %s"), + _("unable to save metadata for checkpoint %1$s"), chk->def->name); qemuCheckpointRollbackMetadata(vm, chk); return -1; @@ -889,7 +888,7 @@ qemuCheckpointDelete(virDomainObj *vm, driver->xmlopt, cfg->checkpointDir) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("failed to set checkpoint '%s' as current"), + _("failed to set checkpoint '%1$s' as current"), chk->def->name); virDomainCheckpointSetCurrent(vm->checkpoints, NULL); goto endjob; diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 680832742c..d9460d82e0 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -546,8 +546,7 @@ virQEMUDriverConfigLoadRemoteDisplayEntry(virQEMUDriverConfig *cfg, * to tell to vnc (usually subtract 5700, e.g. localhost:1 * for port 5701) */ virReportError(VIR_ERR_INTERNAL_ERROR, - _("%s: remote_websocket_port_min: port must be greater " - "than or equal to %d"), + _("%1$s: remote_websocket_port_min: port must be greater than or equal to %2$d"), filename, QEMU_WEBSOCKET_PORT_MIN); return -1; } @@ -557,16 +556,15 @@ virQEMUDriverConfigLoadRemoteDisplayEntry(virQEMUDriverConfig *cfg, if (cfg->webSocketPortMax > QEMU_WEBSOCKET_PORT_MAX || cfg->webSocketPortMax < cfg->webSocketPortMin) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("%s: remote_websocket_port_max: port must be between " - "the minimal port and %d"), + _("%1$s: remote_websocket_port_max: port must be between the minimal port and %2$d"), filename, QEMU_WEBSOCKET_PORT_MAX); return -1; } if (cfg->webSocketPortMin > cfg->webSocketPortMax) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("%s: remote_websocket_port_min: min port must not be " - "greater than max port"), filename); + _("%1$s: remote_websocket_port_min: min port must not be greater than max port"), + filename); return -1; } @@ -577,8 +575,7 @@ virQEMUDriverConfigLoadRemoteDisplayEntry(virQEMUDriverConfig *cfg, * to tell to vnc (usually subtract 5900, e.g. localhost:1 * for port 5901) */ virReportError(VIR_ERR_INTERNAL_ERROR, - _("%s: remote_display_port_min: port must be greater " - "than or equal to %d"), + _("%1$s: remote_display_port_min: port must be greater than or equal to %2$d"), filename, QEMU_REMOTE_PORT_MIN); return -1; } @@ -588,16 +585,15 @@ virQEMUDriverConfigLoadRemoteDisplayEntry(virQEMUDriverConfig *cfg, if (cfg->remotePortMax > QEMU_REMOTE_PORT_MAX || cfg->remotePortMax < cfg->remotePortMin) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("%s: remote_display_port_max: port must be between " - "the minimal port and %d"), + _("%1$s: remote_display_port_max: port must be between the minimal port and %2$d"), filename, QEMU_REMOTE_PORT_MAX); return -1; } if (cfg->remotePortMin > cfg->remotePortMax) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("%s: remote_display_port_min: min port must not be " - "greater than max port"), filename); + _("%1$s: remote_display_port_min: min port must not be greater than max port"), + filename); return -1; } @@ -686,7 +682,7 @@ virQEMUDriverConfigLoadProcessEntry(virQEMUDriverConfig *cfg, cfg->maxCore = ULLONG_MAX; } else { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Unknown core size '%s'"), + _("Unknown core size '%1$s'"), corestr); return -1; } @@ -705,7 +701,7 @@ virQEMUDriverConfigLoadProcessEntry(virQEMUDriverConfig *cfg, cfg->stdioLogD = false; } else { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Unknown stdio handler %s"), + _("Unknown stdio handler %1$s"), stdioHandler); return -1; } @@ -718,7 +714,7 @@ virQEMUDriverConfigLoadProcessEntry(virQEMUDriverConfig *cfg, if (val < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Unknown sched_core value %s"), + _("Unknown sched_core value %1$s"), schedCore); return -1; } @@ -794,7 +790,7 @@ virQEMUDriverConfigLoadNetworkEntry(virQEMUDriverConfig *cfg, return -1; if (cfg->migrationPortMin <= 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("%s: migration_port_min: port must be greater than 0"), + _("%1$s: migration_port_min: port must be greater than 0"), filename); return -1; } @@ -804,8 +800,7 @@ virQEMUDriverConfigLoadNetworkEntry(virQEMUDriverConfig *cfg, if (cfg->migrationPortMax > 65535 || cfg->migrationPortMax < cfg->migrationPortMin) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("%s: migration_port_max: port must be between " - "the minimal port %d and 65535"), + _("%1$s: migration_port_max: port must be between the minimal port %2$d and 65535"), filename, cfg->migrationPortMin); return -1; } @@ -817,8 +812,7 @@ virQEMUDriverConfigLoadNetworkEntry(virQEMUDriverConfig *cfg, (STRPREFIX(cfg->migrateHost, "localhost") || virSocketAddrIsNumericLocalhost(cfg->migrateHost))) { virReportError(VIR_ERR_CONF_SYNTAX, - _("migration_host must not be the address of" - " the local machine: %s"), + _("migration_host must not be the address of the local machine: %1$s"), cfg->migrateHost); return -1; } @@ -830,8 +824,7 @@ virQEMUDriverConfigLoadNetworkEntry(virQEMUDriverConfig *cfg, (STRPREFIX(cfg->migrationAddress, "localhost") || virSocketAddrIsNumericLocalhost(cfg->migrationAddress))) { virReportError(VIR_ERR_CONF_SYNTAX, - _("migration_address must not be the address of" - " the local machine: %s"), + _("migration_address must not be the address of the local machine: %1$s"), cfg->migrationAddress); return -1; } @@ -923,7 +916,7 @@ virQEMUDriverConfigLoadSecurityEntry(virQEMUDriverConfig *cfg, if (STREQ(cfg->securityDriverNames[i], cfg->securityDriverNames[j])) { virReportError(VIR_ERR_CONF_SYNTAX, - _("Duplicate security driver %s"), + _("Duplicate security driver %1$s"), cfg->securityDriverNames[i]); return -1; } @@ -961,7 +954,7 @@ virQEMUDriverConfigLoadSecurityEntry(virQEMUDriverConfig *cfg, int ctl; if ((ctl = virCgroupControllerTypeFromString(controllers[i])) < 0) { virReportError(VIR_ERR_CONF_SYNTAX, - _("Unknown cgroup controller '%s'"), + _("Unknown cgroup controller '%1$s'"), controllers[i]); return -1; } @@ -987,7 +980,7 @@ virQEMUDriverConfigLoadSecurityEntry(virQEMUDriverConfig *cfg, if (ns < 0) { virReportError(VIR_ERR_CONF_SYNTAX, - _("Unknown namespace: %s"), + _("Unknown namespace: %1$s"), namespaces[i]); return -1; } @@ -1000,14 +993,14 @@ virQEMUDriverConfigLoadSecurityEntry(virQEMUDriverConfig *cfg, if (!qemuDomainNamespaceAvailable(ns)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("%s namespace is not available"), + _("%1$s namespace is not available"), namespaces[i]); return -1; } if (virBitmapSetBit(cfg->namespaces, ns) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to enable namespace: %s"), + _("Unable to enable namespace: %1$s"), namespaces[i]); return -1; } @@ -1158,8 +1151,7 @@ virQEMUDriverConfigValidate(virQEMUDriverConfig *cfg) if (cfg->defaultTLSx509certdirPresent) { if (!virFileExists(cfg->defaultTLSx509certdir)) { virReportError(VIR_ERR_CONF_SYNTAX, - _("default_tls_x509_cert_dir directory '%s' " - "does not exist"), + _("default_tls_x509_cert_dir directory '%1$s' does not exist"), cfg->defaultTLSx509certdir); return -1; } @@ -1168,7 +1160,7 @@ virQEMUDriverConfigValidate(virQEMUDriverConfig *cfg) if (cfg->vncTLSx509certdir && !virFileExists(cfg->vncTLSx509certdir)) { virReportError(VIR_ERR_CONF_SYNTAX, - _("vnc_tls_x509_cert_dir directory '%s' does not exist"), + _("vnc_tls_x509_cert_dir directory '%1$s' does not exist"), cfg->vncTLSx509certdir); return -1; } @@ -1176,7 +1168,7 @@ virQEMUDriverConfigValidate(virQEMUDriverConfig *cfg) if (cfg->spiceTLSx509certdir && !virFileExists(cfg->spiceTLSx509certdir)) { virReportError(VIR_ERR_CONF_SYNTAX, - _("spice_tls_x509_cert_dir directory '%s' does not exist"), + _("spice_tls_x509_cert_dir directory '%1$s' does not exist"), cfg->spiceTLSx509certdir); return -1; } @@ -1184,7 +1176,7 @@ virQEMUDriverConfigValidate(virQEMUDriverConfig *cfg) if (cfg->chardevTLSx509certdir && !virFileExists(cfg->chardevTLSx509certdir)) { virReportError(VIR_ERR_CONF_SYNTAX, - _("chardev_tls_x509_cert_dir directory '%s' does not exist"), + _("chardev_tls_x509_cert_dir directory '%1$s' does not exist"), cfg->chardevTLSx509certdir); return -1; } @@ -1192,7 +1184,7 @@ virQEMUDriverConfigValidate(virQEMUDriverConfig *cfg) if (cfg->migrateTLSx509certdir && !virFileExists(cfg->migrateTLSx509certdir)) { virReportError(VIR_ERR_CONF_SYNTAX, - _("migrate_tls_x509_cert_dir directory '%s' does not exist"), + _("migrate_tls_x509_cert_dir directory '%1$s' does not exist"), cfg->migrateTLSx509certdir); return -1; } @@ -1200,7 +1192,7 @@ virQEMUDriverConfigValidate(virQEMUDriverConfig *cfg) if (cfg->backupTLSx509certdir && !virFileExists(cfg->backupTLSx509certdir)) { virReportError(VIR_ERR_CONF_SYNTAX, - _("backup_tls_x509_cert_dir directory '%s' does not exist"), + _("backup_tls_x509_cert_dir directory '%1$s' does not exist"), cfg->backupTLSx509certdir); return -1; } @@ -1208,7 +1200,7 @@ virQEMUDriverConfigValidate(virQEMUDriverConfig *cfg) if (cfg->vxhsTLSx509certdir && !virFileExists(cfg->vxhsTLSx509certdir)) { virReportError(VIR_ERR_CONF_SYNTAX, - _("vxhs_tls_x509_cert_dir directory '%s' does not exist"), + _("vxhs_tls_x509_cert_dir directory '%1$s' does not exist"), cfg->vxhsTLSx509certdir); return -1; } @@ -1216,7 +1208,7 @@ virQEMUDriverConfigValidate(virQEMUDriverConfig *cfg) if (cfg->nbdTLSx509certdir && !virFileExists(cfg->nbdTLSx509certdir)) { virReportError(VIR_ERR_CONF_SYNTAX, - _("nbd_tls_x509_cert_dir directory '%s' does not exist"), + _("nbd_tls_x509_cert_dir directory '%1$s' does not exist"), cfg->nbdTLSx509certdir); return -1; } @@ -1457,21 +1449,21 @@ virQEMUDriverGetDomainCapabilities(virQEMUDriver *driver, if (!virQEMUCapsIsArchSupported(qemuCaps, arch)) { virReportError(VIR_ERR_INVALID_ARG, - _("Emulator '%s' does not support arch '%s'"), + _("Emulator '%1$s' does not support arch '%2$s'"), path, virArchToString(arch)); return NULL; } if (!virQEMUCapsIsVirtTypeSupported(qemuCaps, virttype)) { virReportError(VIR_ERR_INVALID_ARG, - _("Emulator '%s' does not support virt type '%s'"), + _("Emulator '%1$s' does not support virt type '%2$s'"), path, virDomainVirtTypeToString(virttype)); return NULL; } if (!virQEMUCapsIsMachineSupported(qemuCaps, virttype, machine)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Emulator '%s' does not support machine type '%s'"), + _("Emulator '%1$s' does not support machine type '%2$s'"), path, NULLSTR(machine)); return NULL; } @@ -1567,8 +1559,7 @@ qemuGetDomainHupageMemPath(virQEMUDriver *driver, if (i == cfg->nhugetlbfs) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to find any usable hugetlbfs " - "mount for %llu KiB"), + _("Unable to find any usable hugetlbfs mount for %1$llu KiB"), pagesize); return -1; } @@ -1652,7 +1643,7 @@ qemuHugepageMakeBasedir(virQEMUDriver *driver, if (g_mkdir_with_parents(hugepagePath, 0777) < 0) { virReportSystemError(errno, - _("unable to create hugepage path %s"), + _("unable to create hugepage path %1$s"), hugepagePath); return -1; } diff --git a/src/qemu/qemu_dbus.c b/src/qemu/qemu_dbus.c index a6dc802637..1ffe1f147f 100644 --- a/src/qemu/qemu_dbus.c +++ b/src/qemu/qemu_dbus.c @@ -190,7 +190,7 @@ qemuDBusStart(virQEMUDriver *driver, if (!virFileIsExecutable(cfg->dbusDaemonName)) { virReportSystemError(errno, - _("'%s' is not a suitable dbus-daemon"), + _("'%1$s' is not a suitable dbus-daemon"), cfg->dbusDaemonName); return -1; } @@ -203,7 +203,7 @@ qemuDBusStart(virQEMUDriver *driver, sockpath = qemuDBusCreateSocketPath(cfg, shortName); if (qemuDBusWriteConfig(configfile, sockpath) < 0) { - virReportSystemError(errno, _("Failed to write '%s'"), configfile); + virReportSystemError(errno, _("Failed to write '%1$s'"), configfile); return -1; } @@ -222,7 +222,7 @@ qemuDBusStart(virQEMUDriver *driver, if (virPidFileReadPath(pidfile, &cpid) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("dbus-daemon %s didn't show up"), + _("dbus-daemon %1$s didn't show up"), cfg->dbusDaemonName); goto cleanup; } @@ -240,11 +240,11 @@ qemuDBusStart(virQEMUDriver *driver, if (saferead(errfd, errbuf, sizeof(errbuf) - 1) < 0) { virReportSystemError(errno, - _("dbus-daemon %s died unexpectedly"), + _("dbus-daemon %1$s died unexpectedly"), cfg->dbusDaemonName); } else { virReportError(VIR_ERR_OPERATION_FAILED, - _("dbus-daemon died and reported: %s"), errbuf); + _("dbus-daemon died and reported: %1$s"), errbuf); } goto cleanup; @@ -252,7 +252,7 @@ qemuDBusStart(virQEMUDriver *driver, if (!virFileExists(sockpath)) { virReportError(VIR_ERR_OPERATION_TIMEOUT, - _("DBus daemon %s didn't show up"), + _("DBus daemon %1$s didn't show up"), cfg->dbusDaemonName); goto cleanup; } diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c index 2023f283d6..165f975e2a 100644 --- a/src/qemu/qemu_domain_address.c +++ b/src/qemu/qemu_domain_address.c @@ -68,7 +68,7 @@ qemuDomainGetSCSIControllerModel(const virDomainDef *def, return VIR_DOMAIN_CONTROLLER_MODEL_SCSI_NCR53C90; virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to determine model for SCSI controller idx=%d"), + _("Unable to determine model for SCSI controller idx=%1$d"), cont->idx); return -1; } @@ -116,7 +116,7 @@ qemuDomainFindSCSIControllerModel(const virDomainDef *def, if (!(cont = virDomainDeviceFindSCSIController(def, &info->addr.drive))) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unable to find a SCSI controller for idx=%d"), + _("unable to find a SCSI controller for idx=%1$d"), info->addr.drive.controller); return -1; } @@ -207,7 +207,7 @@ qemuDomainAssignSpaprVIOAddress(virDomainDef *def, while (ret != 0) { if (user_reg) { virReportError(VIR_ERR_XML_ERROR, - _("spapr-vio address %#llx already in use"), + _("spapr-vio address %1$#llx already in use"), info->addr.spaprvio.reg); return -EEXIST; } @@ -1710,8 +1710,8 @@ qemuDomainPCIAddressSetCreate(virDomainDef *def, if (idx >= addrs->nbuses) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Inappropriate new pci controller index %zu " - "exceeds addrs array length"), idx); + _("Inappropriate new pci controller index %1$zu exceeds addrs array length"), + idx); goto error; } @@ -2306,7 +2306,7 @@ qemuDomainAssignDevicePCISlots(virDomainDef *def, if (!virDeviceInfoPCIAddressIsWanted(&def->disks[i]->info)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("virtio disk cannot have an address of type '%s'"), + _("virtio disk cannot have an address of type '%1$s'"), virDomainDeviceAddressTypeToString(def->disks[i]->info.type)); return -1; } @@ -2807,8 +2807,7 @@ qemuDomainAssignPCIAddresses(virDomainDef *def, if (contIndex < 0) { /* this should never happen - we just added it */ virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not find auto-added %s controller " - "with index %zu"), + _("Could not find auto-added %1$s controller with index %2$zu"), virDomainControllerModelPCITypeToString(bus->model), i); goto cleanup; @@ -2896,10 +2895,7 @@ qemuDomainAssignPCIAddresses(virDomainDef *def, options->busNr = qemuDomainAddressFindNewBusNr(def); if (options->busNr == -1) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("No free busNr lower than current " - "lowest busNr is available to " - "auto-assign to bus %d. Must be " - "manually assigned"), + _("No free busNr lower than current lowest busNr is available to auto-assign to bus %1$d. Must be manually assigned"), addr->bus); goto cleanup; } @@ -2923,7 +2919,7 @@ qemuDomainAssignPCIAddresses(virDomainDef *def, } if (options->targetIndex == -1) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("No usable target index found for %d"), + _("No usable target index found for %1$d"), addr->bus); goto cleanup; } @@ -2943,9 +2939,7 @@ qemuDomainAssignPCIAddresses(virDomainDef *def, if (cont->model == VIR_DOMAIN_CONTROLLER_MODEL_PCI_BRIDGE && idx <= addr->bus) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("PCI controller at index %d (0x%02x) has " - "bus='0x%02x', but index must be " - "larger than bus"), + _("PCI controller at index %1$d (0x%2$02x) has bus='0x%3$02x', but index must be larger than bus"), idx, idx, addr->bus); goto cleanup; } diff --git a/src/qemu/qemu_domainjob.c b/src/qemu/qemu_domainjob.c index 27beb5229f..6376f928d5 100644 --- a/src/qemu/qemu_domainjob.c +++ b/src/qemu/qemu_domainjob.c @@ -725,7 +725,7 @@ qemuDomainObjPrivateXMLParseJob(virDomainObj *vm, if ((type = virDomainJobTypeFromString(tmp)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unknown job type %s"), tmp); + _("Unknown job type %1$s"), tmp); return -1; } VIR_FREE(tmp); @@ -738,7 +738,7 @@ qemuDomainObjPrivateXMLParseJob(virDomainObj *vm, if ((async = virDomainAsyncJobTypeFromString(tmp)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unknown async job type %s"), tmp); + _("Unknown async job type %1$s"), tmp); return -1; } VIR_FREE(tmp); @@ -748,7 +748,7 @@ qemuDomainObjPrivateXMLParseJob(virDomainObj *vm, vm->job->phase = qemuDomainAsyncJobPhaseFromString(async, tmp); if (vm->job->phase < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unknown job phase %s"), tmp); + _("Unknown job phase %1$s"), tmp); return -1; } VIR_FREE(tmp); diff --git a/src/qemu/qemu_extdevice.c b/src/qemu/qemu_extdevice.c index 1c397972e4..bf59967eb7 100644 --- a/src/qemu/qemu_extdevice.c +++ b/src/qemu/qemu_extdevice.c @@ -49,7 +49,7 @@ qemuExtDeviceLogCommand(virQEMUDriver *driver, return -1; return qemuDomainLogAppendMessage(driver, vm, - _("%s: Starting external device: %s\n%s\n"), + _("%1$s: Starting external device: %2$s\n%3$s\n"), timestamp, info, cmds); } diff --git a/src/qemu/qemu_fd.c b/src/qemu/qemu_fd.c index feab907afd..e847056573 100644 --- a/src/qemu/qemu_fd.c +++ b/src/qemu/qemu_fd.c @@ -221,7 +221,7 @@ qemuFDPassTransferMonitor(qemuFDPass *fdpass, for (i = 0; i < fdsets->nfdsets; i++) { if (fdsets->fdsets[i].id == fdpass->fdSetID) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("fdset '%u' is already in use by qemu"), + _("fdset '%1$u' is already in use by qemu"), fdpass->fdSetID); return -1; } diff --git a/src/qemu/qemu_firmware.c b/src/qemu/qemu_firmware.c index 9de4166772..2830b99f1b 100644 --- a/src/qemu/qemu_firmware.c +++ b/src/qemu/qemu_firmware.c @@ -307,7 +307,7 @@ qemuFirmwareInterfaceParse(const char *path, if (!(interfacesJSON = virJSONValueObjectGetArray(doc, "interface-types"))) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("failed to get interface-types from '%s'"), + _("failed to get interface-types from '%1$s'"), path); return -1; } @@ -323,7 +323,7 @@ qemuFirmwareInterfaceParse(const char *path, if ((tmp = qemuFirmwareOSInterfaceTypeFromString(tmpStr)) <= 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unknown interface type: '%s'"), + _("unknown interface type: '%1$s'"), tmpStr); return -1; } @@ -351,7 +351,7 @@ qemuFirmwareFlashFileParse(const char *path, if (!(filename = virJSONValueObjectGetString(doc, "filename"))) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("missing 'filename' in '%s'"), + _("missing 'filename' in '%1$s'"), path); return -1; } @@ -360,7 +360,7 @@ qemuFirmwareFlashFileParse(const char *path, if (!(format = virJSONValueObjectGetString(doc, "format"))) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("missing 'format' in '%s'"), + _("missing 'format' in '%1$s'"), path); return -1; } @@ -394,7 +394,7 @@ qemuFirmwareMappingFlashParse(const char *path, modeval = qemuFirmwareFlashModeTypeFromString(modestr); if (modeval < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Firmware flash mode value '%s' unexpected"), + _("Firmware flash mode value '%1$s' unexpected"), modestr); return -1; } @@ -403,7 +403,7 @@ qemuFirmwareMappingFlashParse(const char *path, if (!(executable = virJSONValueObjectGet(doc, "executable"))) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("missing 'executable' in '%s'"), + _("missing 'executable' in '%1$s'"), path); return -1; } @@ -414,7 +414,7 @@ qemuFirmwareMappingFlashParse(const char *path, if (flash->mode == QEMU_FIRMWARE_FLASH_MODE_SPLIT) { if (!(nvram_template = virJSONValueObjectGet(doc, "nvram-template"))) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("missing 'nvram-template' in '%s'"), + _("missing 'nvram-template' in '%1$s'"), path); return -1; } @@ -436,7 +436,7 @@ qemuFirmwareMappingKernelParse(const char *path, if (!(filename = virJSONValueObjectGetString(doc, "filename"))) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("missing 'filename' in '%s'"), + _("missing 'filename' in '%1$s'"), path); } @@ -455,7 +455,7 @@ qemuFirmwareMappingMemoryParse(const char *path, if (!(filename = virJSONValueObjectGetString(doc, "filename"))) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("missing 'filename' in '%s'"), + _("missing 'filename' in '%1$s'"), path); } @@ -476,21 +476,21 @@ qemuFirmwareMappingParse(const char *path, if (!(mapping = virJSONValueObjectGet(doc, "mapping"))) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("missing mapping in '%s'"), + _("missing mapping in '%1$s'"), path); return -1; } if (!(deviceStr = virJSONValueObjectGetString(mapping, "device"))) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("missing device type in '%s'"), + _("missing device type in '%1$s'"), path); return -1; } if ((tmp = qemuFirmwareDeviceTypeFromString(deviceStr)) <= 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unknown device type in '%s'"), + _("unknown device type in '%1$s'"), path); return -1; } @@ -533,7 +533,7 @@ qemuFirmwareTargetParse(const char *path, if (!(targetsJSON = virJSONValueObjectGetArray(doc, "targets"))) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("failed to get targets from '%s'"), + _("failed to get targets from '%1$s'"), path); return -1; } @@ -554,21 +554,21 @@ qemuFirmwareTargetParse(const char *path, if (!(architectureStr = virJSONValueObjectGetString(item, "architecture"))) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("missing 'architecture' in '%s'"), + _("missing 'architecture' in '%1$s'"), path); goto cleanup; } if ((t->architecture = virQEMUCapsArchFromString(architectureStr)) == VIR_ARCH_NONE) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unknown architecture '%s'"), + _("unknown architecture '%1$s'"), architectureStr); goto cleanup; } if (!(machines = virJSONValueObjectGetArray(item, "machines"))) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("missing 'machines' in '%s'"), + _("missing 'machines' in '%1$s'"), path); goto cleanup; } @@ -615,7 +615,7 @@ qemuFirmwareFeatureParse(const char *path, if (!(featuresJSON = virJSONValueObjectGetArray(doc, "features"))) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("failed to get features from '%s'"), + _("failed to get features from '%1$s'"), path); return -1; } @@ -659,7 +659,7 @@ qemuFirmwareParse(const char *path) if (!(doc = virJSONValueFromString(cont))) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unable to parse json file '%s'"), + _("unable to parse json file '%1$s'"), path); return NULL; } @@ -1603,7 +1603,7 @@ qemuFirmwareFillDomain(virQEMUDriver *driver, loader->format != VIR_STORAGE_FILE_RAW && loader->format != VIR_STORAGE_FILE_QCOW2) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Unsupported loader format '%s'"), + _("Unsupported loader format '%1$s'"), virStorageFileFormatTypeToString(loader->format)); return -1; } @@ -1611,7 +1611,7 @@ qemuFirmwareFillDomain(virQEMUDriver *driver, nvram->format != VIR_STORAGE_FILE_RAW && nvram->format != VIR_STORAGE_FILE_QCOW2) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Unsupported nvram format '%s'"), + _("Unsupported nvram format '%1$s'"), virStorageFileFormatTypeToString(nvram->format)); return -1; } @@ -1669,7 +1669,7 @@ qemuFirmwareFillDomain(virQEMUDriver *driver, return -1; } else { virReportError(VIR_ERR_OPERATION_FAILED, - _("Unable to find any firmware to satisfy '%s'"), + _("Unable to find any firmware to satisfy '%1$s'"), virDomainOsDefFirmwareTypeToString(def->os.firmware)); return -1; } diff --git a/src/qemu/qemu_interface.c b/src/qemu/qemu_interface.c index 076640cbde..faf7922f31 100644 --- a/src/qemu/qemu_interface.c +++ b/src/qemu/qemu_interface.c @@ -339,7 +339,7 @@ qemuCreateInBridgePortWithHelper(virQEMUDriverConfig *cfg, } if (!virFileIsExecutable(cfg->bridgeHelperName)) { - virReportSystemError(errno, _("'%s' is not a suitable bridge helper"), + virReportSystemError(errno, _("'%1$s' is not a suitable bridge helper"), cfg->bridgeHelperName); return -1; } @@ -377,7 +377,7 @@ qemuCreateInBridgePortWithHelper(virQEMUDriverConfig *cfg, errstr = g_strdup_printf("stderr=%s", errbuf); virReportSystemError(errno, - _("%s: failed to communicate with bridge helper: %s"), + _("%1$s: failed to communicate with bridge helper: %2$s"), cmdstr, NULLSTR_EMPTY(errstr)); VIR_FREE(errstr); @@ -650,7 +650,7 @@ qemuInterfaceVDPAConnect(virDomainNetDef *net) if ((fd = open(net->data.vdpa.devicepath, O_RDWR)) < 0) { virReportSystemError(errno, - _("Unable to open '%s' for vdpa device"), + _("Unable to open '%1$s' for vdpa device"), net->data.vdpa.devicepath); return -1; } diff --git a/src/qemu/qemu_interop_config.c b/src/qemu/qemu_interop_config.c index cdc710804f..08fb68c901 100644 --- a/src/qemu/qemu_interop_config.c +++ b/src/qemu/qemu_interop_config.c @@ -58,7 +58,7 @@ qemuBuildFileList(GHashTable *files, const char *dir) path = g_strdup_printf("%s/%s", dir, filename); if (stat(path, &sb) < 0) { - virReportSystemError(errno, _("Unable to access %s"), path); + virReportSystemError(errno, _("Unable to access %1$s"), path); return -1; } @@ -141,7 +141,7 @@ qemuInteropFetchConfigs(const char *name, if ((len = virFileLength(path, -1)) < 0) { virReportSystemError(errno, - _("unable to get size of '%s'"), + _("unable to get size of '%1$s'"), path); return -1; } diff --git a/src/qemu/qemu_migration_cookie.c b/src/qemu/qemu_migration_cookie.c index 26d07d1ad4..7f0b7a3412 100644 --- a/src/qemu/qemu_migration_cookie.c +++ b/src/qemu/qemu_migration_cookie.c @@ -188,14 +188,14 @@ qemuDomainExtractTLSSubject(const char *certdir) if (virFileReadAll(certfile, 8192, &pemdata) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unable to read server cert %s"), certfile); + _("unable to read server cert %1$s"), certfile); return NULL; } rc = gnutls_x509_crt_init(&cert); if (rc < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("cannot initialize cert object: %s"), + _("cannot initialize cert object: %1$s"), gnutls_strerror(rc)); return NULL; } @@ -206,7 +206,7 @@ qemuDomainExtractTLSSubject(const char *certdir) rc = gnutls_x509_crt_import(cert, &pemdatum, GNUTLS_X509_FMT_PEM); if (rc < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("cannot load cert data from %s: %s"), + _("cannot load cert data from %1$s: %2$s"), certfile, gnutls_strerror(rc)); return NULL; } @@ -219,7 +219,7 @@ qemuDomainExtractTLSSubject(const char *certdir) } if (rc != 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("cannot get cert distinguished name: %s"), + _("cannot get cert distinguished name: %1$s"), gnutls_strerror(rc)); return NULL; } @@ -287,8 +287,8 @@ qemuMigrationCookieNetworkAlloc(virQEMUDriver *driver G_GNUC_UNUSED, if (virNetDevOpenvswitchGetMigrateData(&mig->net[i].portdata, netptr->ifname) != 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to run command to get OVS port data for " - "interface %s"), netptr->ifname); + _("Unable to run command to get OVS port data for interface %1$s"), + netptr->ifname); return NULL; } break; @@ -910,7 +910,7 @@ qemuMigrationCookieGraphicsXMLParse(xmlXPathContextPtr ctxt) } if ((grap->type = virDomainGraphicsTypeFromString(graphicstype)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unknown graphics type %s"), graphicstype); + _("unknown graphics type %1$s"), graphicstype); return NULL; } if (virXPathInt("string(./graphics/@port)", ctxt, &grap->port) < 0) { @@ -987,7 +987,7 @@ qemuMigrationCookieNBDXMLParse(xmlXPathContextPtr ctxt) port = virXPathString("string(./nbd/@port)", ctxt); if (port && virStrToLong_i(port, NULL, 10, &ret->port) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Malformed nbd port '%s'"), + _("Malformed nbd port '%1$s'"), port); return NULL; } @@ -1015,7 +1015,7 @@ qemuMigrationCookieNBDXMLParse(xmlXPathContextPtr ctxt) virStrToLong_ull(capacity, NULL, 10, &ret->disks[i].capacity) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Malformed disk capacity: '%s'"), + _("Malformed disk capacity: '%1$s'"), NULLSTR(capacity)); return NULL; } @@ -1180,13 +1180,13 @@ qemuMigrationCookieXMLParseMandatoryFeatures(xmlXPathContextPtr ctxt, if ((val = qemuMigrationCookieFlagTypeFromString(str)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unknown migration cookie feature %s"), str); + _("Unknown migration cookie feature %1$s"), str); return -1; } if ((flags & (1 << val)) == 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unsupported migration cookie feature %s"), str); + _("Unsupported migration cookie feature %1$s"), str); return -1; } } @@ -1279,7 +1279,7 @@ qemuMigrationCookieXMLParse(qemuMigrationCookie *mig, } if (STRNEQ(name, mig->name)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Incoming cookie data had unexpected name %s vs %s"), + _("Incoming cookie data had unexpected name %1$s vs %2$s"), name, mig->name); return -1; } @@ -1293,7 +1293,7 @@ qemuMigrationCookieXMLParse(qemuMigrationCookie *mig, virUUIDFormat(mig->uuid, localdomuuid); if (STRNEQ(uuid, localdomuuid)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Incoming cookie data had unexpected UUID %s vs %s"), + _("Incoming cookie data had unexpected UUID %1$s vs %2$s"), uuid, localdomuuid); return -1; } @@ -1321,7 +1321,7 @@ qemuMigrationCookieXMLParse(qemuMigrationCookie *mig, } if (memcmp(mig->remoteHostuuid, mig->localHostuuid, VIR_UUID_BUFLEN) == 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Attempt to migrate guest to the same host %s"), + _("Attempt to migrate guest to the same host %1$s"), hostuuid); return -1; } @@ -1527,14 +1527,14 @@ qemuMigrationCookieParse(virQEMUDriver *driver, if (!mig->lockDriver) { if (virLockManagerPluginUsesState(driver->lockManager)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Missing %s lock state for migration cookie"), + _("Missing %1$s lock state for migration cookie"), virLockManagerPluginGetName(driver->lockManager)); return NULL; } } else if (STRNEQ(mig->lockDriver, virLockManagerPluginGetName(driver->lockManager))) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Source host lock driver %s different from target %s"), + _("Source host lock driver %1$s different from target %2$s"), mig->lockDriver, virLockManagerPluginGetName(driver->lockManager)); return NULL; @@ -1567,7 +1567,7 @@ qemuMigrationCookieBlockDirtyBitmapsMatchDisks(virDomainDef *def, if (!(disk->disk = virDomainDiskByTarget(def, disk->target))) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Can't find disk '%s' in domain definition"), + _("Can't find disk '%1$s' in domain definition"), disk->target); return -1; } diff --git a/src/qemu/qemu_migration_params.c b/src/qemu/qemu_migration_params.c index bd09dcfb23..fc3379dcd3 100644 --- a/src/qemu/qemu_migration_params.c +++ b/src/qemu/qemu_migration_params.c @@ -330,7 +330,7 @@ qemuMigrationParamsCheckType(qemuMigrationParam param, { if (qemuMigrationParamInfo[param].type != type) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Type mismatch for '%s' migration parameter"), + _("Type mismatch for '%1$s' migration parameter"), qemuMigrationParamTypeToString(param)); return -1; } @@ -363,7 +363,7 @@ qemuMigrationParamsGetTPInt(qemuMigrationParams *migParams, unsigned int max = UINT_MAX / unit; if (migParams->params[param].value.i > max) { virReportError(VIR_ERR_OVERFLOW, - _("migration parameter '%s' must be less than %u"), + _("migration parameter '%1$s' must be less than %2$u"), name, max + 1); return -1; } @@ -424,7 +424,7 @@ qemuMigrationParamsGetTPULL(qemuMigrationParams *migParams, unsigned long long max = ULLONG_MAX / unit; if (migParams->params[param].value.ull > max) { virReportError(VIR_ERR_OVERFLOW, - _("migration parameter '%s' must be less than %llu"), + _("migration parameter '%1$s' must be less than %2$llu"), name, max + 1); return -1; } @@ -523,14 +523,14 @@ qemuMigrationParamsSetCompression(virTypedParameterPtr params, method = qemuMigrationCompressMethodTypeFromString(params[i].value.s); if (method < 0) { virReportError(VIR_ERR_INVALID_ARG, - _("Unsupported compression method '%s'"), + _("Unsupported compression method '%1$s'"), params[i].value.s); return -1; } if (migParams->compMethods & (1ULL << method)) { virReportError(VIR_ERR_INVALID_ARG, - _("Compression method '%s' is specified twice"), + _("Compression method '%1$s' is specified twice"), params[i].value.s); return -1; } @@ -1229,7 +1229,7 @@ qemuMigrationParamsCheck(virDomainObj *vm, if (state && !qemuMigrationCapsGet(vm, cap)) { virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, - _("Migration option '%s' is not supported by QEMU binary"), + _("Migration option '%1$s' is not supported by QEMU binary"), qemuMigrationCapabilityTypeToString(cap)); return -1; } @@ -1398,14 +1398,14 @@ qemuMigrationParamsParse(xmlXPathContextPtr ctxt, if ((param = qemuMigrationParamTypeFromString(name)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unknown migration parameter '%s'"), name); + _("unknown migration parameter '%1$s'"), name); return -1; } pv = &params->params[param]; if (!(value = virXMLPropString(nodes[i], "value"))) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("missing value for migration parameter '%s'"), + _("missing value for migration parameter '%1$s'"), name); return -1; } @@ -1431,7 +1431,7 @@ qemuMigrationParamsParse(xmlXPathContextPtr ctxt, if (rc < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("invalid value '%s' for migration parameter '%s'"), + _("invalid value '%1$s' for migration parameter '%2$s'"), value, name); return -1; } diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 1fa35f03cc..71ebd356ad 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -241,7 +241,7 @@ qemuMonitorOpenUnix(const char *monitor) addr.sun_family = AF_UNIX; if (virStrcpyStatic(addr.sun_path, monitor) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Monitor path %s too big for destination"), monitor); + _("Monitor path %1$s too big for destination"), monitor); return -1; } @@ -401,7 +401,7 @@ qemuMonitorIORead(qemuMonitor *mon) if (avail < 1024) { if (mon->bufferLength >= QEMU_MONITOR_MAX_RESPONSE) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("QEMU monitor reply exceeds buffer size (%d bytes)"), + _("QEMU monitor reply exceeds buffer size (%1$d bytes)"), QEMU_MONITOR_MAX_RESPONSE); return -1; } @@ -506,7 +506,7 @@ qemuMonitorIO(GSocket *socket G_GNUC_UNUSED, if (!error && !mon->goteof && cond & G_IO_ERR) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Invalid file descriptor while waiting for monitor (vm='%s')"), mon->domainName); + _("Invalid file descriptor while waiting for monitor (vm='%1$s')"), mon->domainName); mon->goteof = true; } } @@ -532,7 +532,7 @@ qemuMonitorIO(GSocket *socket G_GNUC_UNUSED, } else { if (virGetLastErrorCode() == VIR_ERR_OK && !mon->goteof) virReportError(VIR_ERR_INTERNAL_ERROR, - _("Error while processing monitor IO (vm='%s')"), mon->domainName); + _("Error while processing monitor IO (vm='%1$s')"), mon->domainName); virCopyLastError(&mon->lastError); virResetLastError(); } @@ -636,7 +636,7 @@ qemuMonitorOpenInternal(virDomainObj *vm, mon->socket = g_socket_new_from_fd(fd, &gerr); if (!mon->socket) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to create socket object: %s"), + _("Unable to create socket object: %1$s"), gerr->message); goto cleanup; } @@ -684,7 +684,7 @@ qemuMonitorOpen(virDomainObj *vm, if (config->type != VIR_DOMAIN_CHR_TYPE_UNIX) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unable to handle monitor type: %s"), + _("unable to handle monitor type: %1$s"), virDomainChrTypeToString(config->type)); return NULL; } @@ -851,7 +851,7 @@ qemuMonitorSend(qemuMonitor *mon, } if (mon->goteof) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("End of file from qemu monitor (vm='%s')"), mon->domainName); + _("End of file from qemu monitor (vm='%1$s')"), mon->domainName); return -1; } @@ -865,7 +865,7 @@ qemuMonitorSend(qemuMonitor *mon, while (!mon->msg->finished) { if (virCondWait(&mon->notify, &mon->parent.lock) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to wait on monitor condition (vm='%s')"), mon->domainName); + _("Unable to wait on monitor condition (vm='%1$s')"), mon->domainName); goto cleanup; } } @@ -1010,8 +1010,8 @@ qemuMonitorUpdateVideoMemorySize(qemuMonitor *mon, if (rc < 0) { if (rc == -2) virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to find QOM Object path for " - "device '%s'"), videoName); + _("Failed to find QOM Object path for device '%1$s'"), + videoName); return -1; } @@ -1040,8 +1040,8 @@ qemuMonitorUpdateVideoVram64Size(qemuMonitor *mon, if (rc < 0) { if (rc == -2) virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to find QOM Object path for " - "device '%s'"), videoName); + _("Failed to find QOM Object path for device '%1$s'"), + videoName); return -1; } @@ -1897,7 +1897,7 @@ qemuMonitorBlockIOStatusToError(const char *status) if (st < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unknown block IO status: %s"), status); + _("unknown block IO status: %1$s"), status); return -1; } @@ -2046,7 +2046,7 @@ qemuMonitorTypeToProtocol(int type) return "spice"; default: virReportError(VIR_ERR_INVALID_ARG, - _("unsupported protocol type %s"), + _("unsupported protocol type %1$s"), virDomainGraphicsTypeToString(type)); return NULL; } @@ -2683,7 +2683,7 @@ qemuMonitorAddObject(qemuMonitor *mon, if (!id || !type) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("missing alias or qom-type for qemu object '%s'"), + _("missing alias or qom-type for qemu object '%1$s'"), NULLSTR(type)); return -1; } diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c index 8e70b8f78d..3482972600 100644 --- a/src/qemu/qemu_monitor_text.c +++ b/src/qemu/qemu_monitor_text.c @@ -49,7 +49,7 @@ qemuMonitorTextCreateSnapshot(qemuMonitor *mon, strstr(reply, "Error: ") || (strstr(reply, "Error") && strstr(reply, "while writing VM"))) { virReportError(VIR_ERR_OPERATION_FAILED, - _("Failed to take snapshot: %s"), reply); + _("Failed to take snapshot: %1$s"), reply); return -1; } else if (strstr(reply, "No block device can accept snapshots")) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", @@ -80,7 +80,7 @@ int qemuMonitorTextDeleteSnapshot(qemuMonitor *mon, const char *name) (strstr(reply, "Error") && strstr(reply, "while deleting snapshot"))) { virReportError(VIR_ERR_OPERATION_FAILED, - _("Failed to delete snapshot: %s"), reply); + _("Failed to delete snapshot: %1$s"), reply); return -1; } diff --git a/src/qemu/qemu_namespace.c b/src/qemu/qemu_namespace.c index 89d631ee5a..ba0e831178 100644 --- a/src/qemu/qemu_namespace.c +++ b/src/qemu/qemu_namespace.c @@ -283,7 +283,7 @@ qemuDomainSetupDisk(virStorageSource *src, if (virDevMapperGetTargets(next->path, &targetPaths) < 0 && errno != ENOSYS) { virReportSystemError(errno, - _("Unable to get devmapper targets for %s"), + _("Unable to get devmapper targets for %1$s"), next->path); return -1; } @@ -778,7 +778,7 @@ qemuDomainUnshareNamespace(virQEMUDriverConfig *cfg, if (stat(devMountsPath[i], &sb) < 0) { virReportSystemError(errno, - _("Unable to stat: %s"), + _("Unable to stat: %1$s"), devMountsPath[i]); goto cleanup; } @@ -789,7 +789,7 @@ qemuDomainUnshareNamespace(virQEMUDriverConfig *cfg, if ((S_ISDIR(sb.st_mode) && g_mkdir_with_parents(devMountsSavePath[i], 0777) < 0) || (!S_ISDIR(sb.st_mode) && virFileTouch(devMountsSavePath[i], sb.st_mode) < 0)) { virReportSystemError(errno, - _("Failed to create %s"), + _("Failed to create %1$s"), devMountsSavePath[i]); goto cleanup; } @@ -816,21 +816,21 @@ qemuDomainUnshareNamespace(virQEMUDriverConfig *cfg, if (stat(devMountsSavePath[i], &sb) < 0) { virReportSystemError(errno, - _("Unable to stat: %s"), + _("Unable to stat: %1$s"), devMountsSavePath[i]); goto cleanup; } if (S_ISDIR(sb.st_mode)) { if (g_mkdir_with_parents(devMountsPath[i], 0777) < 0) { - virReportSystemError(errno, _("Cannot create %s"), + virReportSystemError(errno, _("Cannot create %1$s"), devMountsPath[i]); goto cleanup; } } else { if (virFileMakeParentPath(devMountsPath[i]) < 0 || virFileTouch(devMountsPath[i], sb.st_mode) < 0) { - virReportSystemError(errno, _("Cannot create %s"), + virReportSystemError(errno, _("Cannot create %1$s"), devMountsPath[i]); goto cleanup; } @@ -878,7 +878,7 @@ qemuDomainEnableNamespace(virDomainObj *vm, if (virBitmapSetBit(priv->namespaces, ns) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to enable namespace: %s"), + _("Unable to enable namespace: %1$s"), qemuDomainNamespaceTypeToString(ns)); return -1; } @@ -1006,7 +1006,7 @@ qemuNamespaceMknodOne(qemuNamespaceMknodItem *data) if (virFileMakeParentPath(data->file) < 0) { virReportSystemError(errno, - _("Unable to create %s"), data->file); + _("Unable to create %1$s"), data->file); goto cleanup; } @@ -1026,14 +1026,14 @@ qemuNamespaceMknodOne(qemuNamespaceMknodItem *data) if (unlink(data->file) < 0 && errno != ENOENT) { virReportSystemError(errno, - _("Unable to remove symlink %s"), + _("Unable to remove symlink %1$s"), data->file); goto cleanup; } if (symlink(data->target, data->file) < 0) { virReportSystemError(errno, - _("Unable to create symlink %s (pointing to %s)"), + _("Unable to create symlink %1$s (pointing to %2$s)"), data->file, data->target); goto cleanup; } else { @@ -1053,7 +1053,7 @@ qemuNamespaceMknodOne(qemuNamespaceMknodItem *data) unlink(data->file); if (mknod(data->file, data->sb.st_mode, data->sb.st_rdev) < 0) { virReportSystemError(errno, - _("Unable to create device %s"), + _("Unable to create device %1$s"), data->file); goto cleanup; } else { @@ -1068,7 +1068,7 @@ qemuNamespaceMknodOne(qemuNamespaceMknodItem *data) if (umount(data->file) < 0 && errno != ENOENT && errno != EINVAL) { virReportSystemError(errno, - _("Unable to umount %s"), + _("Unable to umount %1$s"), data->file); goto cleanup; } @@ -1080,14 +1080,14 @@ qemuNamespaceMknodOne(qemuNamespaceMknodItem *data) * proper owner and mode. Move the mount only after that. */ } else { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, - _("unsupported device type %s 0%o"), + _("unsupported device type %1$s 0%2$o"), data->file, data->sb.st_mode); goto cleanup; } if (lchown(data->file, data->sb.st_uid, data->sb.st_gid) < 0) { virReportSystemError(errno, - _("Failed to chown device %s"), + _("Failed to chown device %1$s"), data->file); goto cleanup; } @@ -1096,7 +1096,7 @@ qemuNamespaceMknodOne(qemuNamespaceMknodItem *data) if (!isLink && chmod(data->file, data->sb.st_mode) < 0) { virReportSystemError(errno, - _("Failed to set permissions for device %s"), + _("Failed to set permissions for device %1$s"), data->file); goto cleanup; } @@ -1105,7 +1105,7 @@ qemuNamespaceMknodOne(qemuNamespaceMknodItem *data) virFileSetACLs(data->file, data->acl) < 0 && errno != ENOTSUP) { virReportSystemError(errno, - _("Unable to set ACLs on %s"), data->file); + _("Unable to set ACLs on %1$s"), data->file); goto cleanup; } @@ -1116,7 +1116,7 @@ qemuNamespaceMknodOne(qemuNamespaceMknodItem *data) if (errno != EOPNOTSUPP && errno != ENOTSUP) { VIR_WARNINGS_RESET virReportSystemError(errno, - _("Unable to set SELinux label on %s"), + _("Unable to set SELinux label on %1$s"), data->file); goto cleanup; } @@ -1196,7 +1196,7 @@ qemuNamespaceMknodItemInit(qemuNamespaceMknodItem *item, return -2; virReportSystemError(errno, - _("Unable to access %s"), file); + _("Unable to access %1$s"), file); return -1; } @@ -1213,7 +1213,7 @@ qemuNamespaceMknodItemInit(qemuNamespaceMknodItem *item, if (!(target = g_file_read_link(file, &gerr))) { virReportError(VIR_ERR_SYSTEM_ERROR, - _("failed to resolve symlink %s: %s"), file, gerr->message); + _("failed to resolve symlink %1$s: %2$s"), file, gerr->message); return -1; } @@ -1238,7 +1238,7 @@ qemuNamespaceMknodItemInit(qemuNamespaceMknodItem *item, virFileGetACLs(file, &item->acl) < 0 && errno != ENOTSUP) { virReportSystemError(errno, - _("Unable to get ACLs on %s"), file); + _("Unable to get ACLs on %1$s"), file); return -1; } @@ -1246,7 +1246,7 @@ qemuNamespaceMknodItemInit(qemuNamespaceMknodItem *item, if (lgetfilecon_raw(file, &item->tcon) < 0 && (errno != ENOTSUP && errno != ENODATA)) { virReportSystemError(errno, - _("Unable to get SELinux label from %s"), file); + _("Unable to get SELinux label from %1$s"), file); return -1; } # endif @@ -1307,7 +1307,7 @@ qemuNamespacePrepareOneItem(qemuNamespaceMknodData *data, if (ttl-- == 0) { virReportSystemError(ELOOP, - _("Too many levels of symbolic links: %s"), + _("Too many levels of symbolic links: %1$s"), next); return -1; } @@ -1413,7 +1413,7 @@ qemuNamespaceUnlinkHelper(pid_t pid G_GNUC_UNUSED, VIR_DEBUG("Unlinking %s", path); if (unlink(path) < 0 && errno != ENOENT) { virReportSystemError(errno, - _("Unable to remove device %s"), path); + _("Unable to remove device %1$s"), path); return -1; } } diff --git a/src/qemu/qemu_passt.c b/src/qemu/qemu_passt.c index 0afa8bdb3a..e7dfc8ce61 100644 --- a/src/qemu/qemu_passt.c +++ b/src/qemu/qemu_passt.c @@ -229,7 +229,7 @@ qemuPasstStart(virDomainObj *vm, } else { /* validation guarantees this will never happen */ virReportError(VIR_ERR_INTERNAL_ERROR, - _("Invalid portForward proto value %u"), pf->proto); + _("Invalid portForward proto value %1$u"), pf->proto); return -1; } diff --git a/src/qemu/qemu_qapi.c b/src/qemu/qemu_qapi.c index 500d3c50b3..184c0a965f 100644 --- a/src/qemu/qemu_qapi.c +++ b/src/qemu/qemu_qapi.c @@ -498,11 +498,11 @@ virQEMUQAPISchemaPathGet(const char *query, if (rc == -2) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("malformed QAPI schema when querying '%s' of '%s'"), + _("malformed QAPI schema when querying '%1$s' of '%2$s'"), NULLSTR(ctxt.prevquery), query); } else if (rc == -3) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("terminal QAPI query component '%s' of '%s' must not have followers"), + _("terminal QAPI query component '%1$s' of '%2$s' must not have followers"), NULLSTR(ctxt.prevquery), query); } diff --git a/src/qemu/qemu_saveimage.c b/src/qemu/qemu_saveimage.c index ef62303728..41310d6a9a 100644 --- a/src/qemu/qemu_saveimage.c +++ b/src/qemu/qemu_saveimage.c @@ -172,14 +172,14 @@ virQEMUSaveDataWrite(virQEMUSaveData *data, if (safewrite(fd, header, sizeof(*header)) != sizeof(*header)) { virReportSystemError(errno, - _("failed to write header to domain save file '%s'"), + _("failed to write header to domain save file '%1$s'"), path); return -1; } if (safewrite(fd, data->xml, xml_len) != xml_len) { virReportSystemError(errno, - _("failed to write domain xml to '%s'"), + _("failed to write domain xml to '%1$s'"), path); return -1; } @@ -187,14 +187,14 @@ virQEMUSaveDataWrite(virQEMUSaveData *data, if (data->cookie && safewrite(fd, data->cookie, cookie_len) != cookie_len) { virReportSystemError(errno, - _("failed to write cookie to '%s'"), + _("failed to write cookie to '%1$s'"), path); return -1; } if (safewrite(fd, zeros, zerosLen) != zerosLen) { virReportSystemError(errno, - _("failed to write padding to '%s'"), + _("failed to write padding to '%1$s'"), path); return -1; } @@ -215,7 +215,7 @@ virQEMUSaveDataFinish(virQEMUSaveData *data, if (safewrite(*fd, header, sizeof(*header)) != sizeof(*header) || VIR_CLOSE(*fd) < 0) { virReportSystemError(errno, - _("failed to write header to domain save file '%s'"), + _("failed to write header to domain save file '%1$s'"), path); return -1; } @@ -232,7 +232,7 @@ qemuSaveImageGetCompressionCommand(virQEMUSaveFormat compression) if (!prog) { virReportError(VIR_ERR_OPERATION_FAILED, - _("Invalid compressed save format %d"), + _("Invalid compressed save format %1$d"), compression); return NULL; } @@ -304,7 +304,7 @@ qemuSaveImageCreate(virQEMUDriver *driver, * trigger a single page of file system cache pollution, but * that's acceptable. */ if (VIR_CLOSE(fd) < 0) { - virReportSystemError(errno, _("unable to close %s"), path); + virReportSystemError(errno, _("unable to close %1$s"), path); goto cleanup; } @@ -387,8 +387,7 @@ qemuSaveImageGetCompressionProgram(const char *imageFormat, styleFormat); else virReportError(VIR_ERR_OPERATION_FAILED, - _("Invalid %s image format specified " - "in configuration file"), + _("Invalid %1$s image format specified in configuration file"), styleFormat); } else { if (use_raw_on_fail) @@ -397,8 +396,7 @@ qemuSaveImageGetCompressionProgram(const char *imageFormat, styleFormat); else virReportError(VIR_ERR_OPERATION_FAILED, - _("Compression program for %s image format " - "in configuration file isn't available"), + _("Compression program for %1$s image format in configuration file isn't available"), styleFormat); } @@ -473,7 +471,7 @@ qemuSaveImageOpen(virQEMUDriver *driver, if (unlink_corrupt) { if (unlink(path) < 0) { virReportSystemError(errno, - _("cannot remove corrupt file: %s"), + _("cannot remove corrupt file: %1$s"), path); return -1; } else { @@ -491,7 +489,7 @@ qemuSaveImageOpen(virQEMUDriver *driver, if (unlink_corrupt) { if (unlink(path) < 0) { virReportSystemError(errno, - _("cannot remove corrupt file: %s"), + _("cannot remove corrupt file: %1$s"), path); return -1; } else { @@ -516,14 +514,14 @@ qemuSaveImageOpen(virQEMUDriver *driver, if (header->version > QEMU_SAVE_VERSION) { virReportError(VIR_ERR_OPERATION_FAILED, - _("image version is not supported (%d > %d)"), + _("image version is not supported (%1$d > %2$d)"), header->version, QEMU_SAVE_VERSION); return -1; } if (header->data_len <= 0) { virReportError(VIR_ERR_OPERATION_FAILED, - _("invalid header data length: %d"), header->data_len); + _("invalid header data length: %1$d"), header->data_len); return -1; } @@ -654,7 +652,7 @@ qemuSaveImageStartVM(virConnectPtr conn, virErrorRestore(&orig_err); } if (VIR_CLOSE(*fd) < 0) { - virReportSystemError(errno, _("cannot close file: %s"), path); + virReportSystemError(errno, _("cannot close file: %1$s"), path); rc = -1; } diff --git a/src/qemu/qemu_slirp.c b/src/qemu/qemu_slirp.c index 9697542cd3..972d1f45c1 100644 --- a/src/qemu/qemu_slirp.c +++ b/src/qemu/qemu_slirp.c @@ -101,7 +101,7 @@ qemuSlirpNewForHelper(const char *helper) slirp = qemuSlirpNew(); if (!slirp) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to allocate slirp for '%s'"), helper); + _("Failed to allocate slirp for '%1$s'"), helper); return NULL; } @@ -113,7 +113,7 @@ qemuSlirpNewForHelper(const char *helper) if (!(doc = virJSONValueFromString(output)) || !(featuresJSON = virJSONValueObjectGetArray(doc, "features"))) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unable to parse json capabilities '%s'"), + _("unable to parse json capabilities '%1$s'"), helper); return NULL; } @@ -331,7 +331,7 @@ qemuSlirpStart(virDomainObj *vm, rc = virPidFileReadPath(pidfile, &pid); if (rc < 0) { virReportSystemError(-rc, - _("Unable to read slirp pidfile '%s'"), + _("Unable to read slirp pidfile '%1$s'"), pidfile); goto error; } diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c index 7aa4195f04..1a013d792a 100644 --- a/src/qemu/qemu_snapshot.c +++ b/src/qemu/qemu_snapshot.c @@ -84,7 +84,7 @@ qemuSnapObjFromName(virDomainObj *vm, snap = virDomainSnapshotFindByName(vm->snapshots, name); if (!snap) virReportError(VIR_ERR_NO_DOMAIN_SNAPSHOT, - _("no domain snapshot with matching name '%s'"), + _("no domain snapshot with matching name '%1$s'"), name); return snap; @@ -347,8 +347,8 @@ qemuSnapshotPrepareDiskShared(virDomainSnapshotDiskDef *snapdisk, if (!qemuBlockStorageSourceSupportsConcurrentAccess(snapdisk->src)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("shared access for disk '%s' requires use of " - "supported storage format"), domdisk->dst); + _("shared access for disk '%1$s' requires use of supported storage format"), + domdisk->dst); return -1; } @@ -386,8 +386,7 @@ qemuSnapshotPrepareDiskExternalInactive(virDomainSnapshotDiskDef *snapdisk, case VIR_STORAGE_NET_PROTOCOL_NFS: case VIR_STORAGE_NET_PROTOCOL_LAST: virReportError(VIR_ERR_INTERNAL_ERROR, - _("external inactive snapshots are not supported on " - "'network' disks using '%s' protocol"), + _("external inactive snapshots are not supported on 'network' disks using '%1$s' protocol"), virStorageNetProtocolTypeToString(domdisk->src->protocol)); return -1; } @@ -400,8 +399,8 @@ qemuSnapshotPrepareDiskExternalInactive(virDomainSnapshotDiskDef *snapdisk, case VIR_STORAGE_TYPE_NONE: case VIR_STORAGE_TYPE_LAST: virReportError(VIR_ERR_INTERNAL_ERROR, - _("external inactive snapshots are not supported on " - "'%s' disks"), virStorageTypeToString(domDiskType)); + _("external inactive snapshots are not supported on '%1$s' disks"), + virStorageTypeToString(domDiskType)); return -1; } @@ -418,8 +417,8 @@ qemuSnapshotPrepareDiskExternalInactive(virDomainSnapshotDiskDef *snapdisk, case VIR_STORAGE_TYPE_NONE: case VIR_STORAGE_TYPE_LAST: virReportError(VIR_ERR_INTERNAL_ERROR, - _("external inactive snapshots are not supported on " - "'%s' disks"), virStorageTypeToString(snapDiskType)); + _("external inactive snapshots are not supported on '%1$s' disks"), + virStorageTypeToString(snapDiskType)); return -1; } @@ -462,8 +461,8 @@ qemuSnapshotPrepareDiskExternalActive(virDomainSnapshotDiskDef *snapdisk, case VIR_STORAGE_TYPE_NONE: case VIR_STORAGE_TYPE_LAST: virReportError(VIR_ERR_INTERNAL_ERROR, - _("external active snapshots are not supported on " - "'%s' disks"), virStorageTypeToString(actualType)); + _("external active snapshots are not supported on '%1$s' disks"), + virStorageTypeToString(actualType)); return -1; } @@ -510,21 +509,21 @@ qemuSnapshotPrepareDiskExternal(virDomainDiskDef *disk, if (rc < 0) { if (err != ENOENT) { virReportSystemError(err, - _("unable to stat for disk %s: %s"), + _("unable to stat for disk %1$s: %2$s"), snapdisk->name, snapdisk->src->path); return -1; } if (reuse) { virReportSystemError(err, - _("missing existing file for disk %s: %s"), + _("missing existing file for disk %1$s: %2$s"), snapdisk->name, snapdisk->src->path); return -1; } if (snapdisk->src->type == VIR_STORAGE_TYPE_BLOCK) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, - _("block device snapshot target '%s' doesn't exist"), + _("block device snapshot target '%1$s' doesn't exist"), snapdisk->src->path); return -1; } @@ -533,7 +532,7 @@ qemuSnapshotPrepareDiskExternal(virDomainDiskDef *disk, if ((snapdisk->src->type == VIR_STORAGE_TYPE_BLOCK && !S_ISBLK(st.st_mode)) || (snapdisk->src->type == VIR_STORAGE_TYPE_FILE && !S_ISREG(st.st_mode))) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("mismatch between configured type for snapshot disk '%s' and the type of existing file '%s'"), + _("mismatch between configured type for snapshot disk '%1$s' and the type of existing file '%2$s'"), snapdisk->name, snapdisk->src->path); return -1; } @@ -542,7 +541,7 @@ qemuSnapshotPrepareDiskExternal(virDomainDiskDef *disk, snapdisk->src->type == VIR_STORAGE_TYPE_FILE && st.st_size > 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("external snapshot file for disk %s already exists and is not a block device: %s"), + _("external snapshot file for disk %1$s already exists and is not a block device: %2$s"), snapdisk->name, snapdisk->src->path); return -1; } @@ -591,8 +590,7 @@ qemuSnapshotPrepareDiskInternal(virDomainDiskDef *disk, case VIR_STORAGE_NET_PROTOCOL_NFS: case VIR_STORAGE_NET_PROTOCOL_LAST: virReportError(VIR_ERR_INTERNAL_ERROR, - _("internal inactive snapshots are not supported on " - "'network' disks using '%s' protocol"), + _("internal inactive snapshots are not supported on 'network' disks using '%1$s' protocol"), virStorageNetProtocolTypeToString(disk->src->protocol)); return -1; } @@ -605,8 +603,8 @@ qemuSnapshotPrepareDiskInternal(virDomainDiskDef *disk, case VIR_STORAGE_TYPE_NONE: case VIR_STORAGE_TYPE_LAST: virReportError(VIR_ERR_INTERNAL_ERROR, - _("internal inactive snapshots are not supported on " - "'%s' disks"), virStorageTypeToString(actualType)); + _("internal inactive snapshots are not supported on '%1$s' disks"), + virStorageTypeToString(actualType)); return -1; } @@ -641,8 +639,7 @@ qemuSnapshotPrepare(virDomainObj *vm, if (def->state == VIR_DOMAIN_SNAPSHOT_DISK_SNAPSHOT && active) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("active qemu domains require external disk " - "snapshots; disk %s requested internal"), + _("active qemu domains require external disk snapshots; disk %1$s requested internal"), disk->name); return -1; } @@ -654,8 +651,7 @@ qemuSnapshotPrepare(virDomainObj *vm, if (dom_disk->src->format > 0 && dom_disk->src->format != VIR_STORAGE_FILE_QCOW2) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("internal snapshot for disk %s unsupported " - "for storage type %s"), + _("internal snapshot for disk %1$s unsupported for storage type %2$s"), disk->name, virStorageFileFormatTypeToString(dom_disk->src->format)); return -1; @@ -668,8 +664,7 @@ qemuSnapshotPrepare(virDomainObj *vm, } else if (disk->src->format != VIR_STORAGE_FILE_QCOW2 && disk->src->format != VIR_STORAGE_FILE_QED) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("external snapshot format for disk %s " - "is unsupported: %s"), + _("external snapshot format for disk %1$s is unsupported: %2$s"), disk->name, virStorageFileFormatTypeToString(disk->src->format)); return -1; @@ -1030,7 +1025,7 @@ qemuSnapshotDiskPrepareOne(qemuSnapshotDiskContext *snapctxt, /* pre-create the image file so that we can label it before handing it to qemu */ if (dd->src->type != VIR_STORAGE_TYPE_BLOCK) { if (virStorageSourceCreate(dd->src) < 0) { - virReportSystemError(errno, _("failed to create image file '%s'"), + virReportSystemError(errno, _("failed to create image file '%1$s'"), NULLSTR(dd->src->path)); return -1; } @@ -1112,7 +1107,7 @@ qemuSnapshotGetTransientDiskDef(virDomainDiskDef *domdisk, if (virFileExists(snapdisk->src->path)) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, - _("Overlay file '%s' for transient disk '%s' already exists"), + _("Overlay file '%1$s' for transient disk '%2$s' already exists"), snapdisk->src->path, domdisk->dst); return NULL; } @@ -1461,16 +1456,14 @@ qemuSnapshotCreateXMLValidateDef(virDomainObj *vm, if (!(flags & VIR_DOMAIN_SNAPSHOT_CREATE_NO_METADATA)) { if (strchr(def->parent.name, '/')) { virReportError(VIR_ERR_XML_DETAIL, - _("invalid snapshot name '%s': " - "name can't contain '/'"), + _("invalid snapshot name '%1$s': name can't contain '/'"), def->parent.name); return -1; } if (def->parent.name[0] == '.') { virReportError(VIR_ERR_XML_DETAIL, - _("invalid snapshot name '%s': " - "name can't start with '.'"), + _("invalid snapshot name '%1$s': name can't start with '.'"), def->parent.name); return -1; } @@ -1499,7 +1492,7 @@ qemuSnapshotCreateXMLValidateDef(virDomainObj *vm, case VIR_DOMAIN_SNAPSHOT_DISK_SNAPSHOT: if (!redefine) { - virReportError(VIR_ERR_INTERNAL_ERROR, _("Invalid domain state %s"), + virReportError(VIR_ERR_INTERNAL_ERROR, _("Invalid domain state %1$s"), virDomainSnapshotStateTypeToString(state)); return -1; } @@ -1515,7 +1508,7 @@ qemuSnapshotCreateXMLValidateDef(virDomainObj *vm, case VIR_DOMAIN_SNAPSHOT_NOSTATE: case VIR_DOMAIN_SNAPSHOT_BLOCKED: /* invalid state, unused in qemu */ case VIR_DOMAIN_SNAPSHOT_LAST: - virReportError(VIR_ERR_INTERNAL_ERROR, _("Invalid domain state %s"), + virReportError(VIR_ERR_INTERNAL_ERROR, _("Invalid domain state %1$s"), virDomainSnapshotStateTypeToString(state)); return -1; } @@ -1595,7 +1588,7 @@ qemuSnapshotCreateWriteMetadata(virDomainObj *vm, driver->xmlopt, cfg->snapshotDir) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unable to save metadata for snapshot %s"), + _("unable to save metadata for snapshot %1$s"), snap->def->name); return -1; } @@ -1821,7 +1814,7 @@ qemuSnapshotRevertValidate(virDomainObj *vm, if (!snap->def->dom) { virReportError(VIR_ERR_SNAPSHOT_REVERT_RISKY, - _("snapshot '%s' lacks domain '%s' rollback info"), + _("snapshot '%1$s' lacks domain '%2$s' rollback info"), snap->def->name, vm->def->name); return -1; } @@ -2219,8 +2212,7 @@ qemuSnapshotRevert(virDomainObj *vm, case VIR_DOMAIN_SNAPSHOT_BLOCKED: case VIR_DOMAIN_SNAPSHOT_LAST: virReportError(VIR_ERR_INTERNAL_ERROR, - _("Invalid target domain state '%s'. Refusing " - "snapshot reversion"), + _("Invalid target domain state '%1$s'. Refusing snapshot reversion"), virDomainSnapshotStateTypeToString(snapdef->state)); goto endjob; } @@ -2319,7 +2311,7 @@ qemuSnapshotDeleteExternalPrepare(virDomainObj *vm, if (snapDisk->snapshotDeleteInProgress) { virReportError(VIR_ERR_OPERATION_INVALID, - _("snapshot disk '%s' was target of not completed snapshot delete"), + _("snapshot disk '%1$s' was target of not completed snapshot delete"), snapDisk->name); return -1; } @@ -2335,7 +2327,7 @@ qemuSnapshotDeleteExternalPrepare(virDomainObj *vm, data->snapDisk->name); if (!data->parentDomDisk) { virReportError(VIR_ERR_OPERATION_FAILED, - _("failed to find disk '%s' in snapshot VM XML"), + _("failed to find disk '%1$s' in snapshot VM XML"), snapDisk->name); return -1; } @@ -2727,7 +2719,7 @@ qemuSnapshotDiscardExternal(virDomainObj *vm, if (data->job->state == QEMU_BLOCKJOB_STATE_FAILED) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("block commit failed while deleting disk '%s' snapshot: '%s'"), + _("block commit failed while deleting disk '%1$s' snapshot: '%2$s'"), data->snapDisk->name, data->job->errmsg); goto error; } @@ -2749,7 +2741,7 @@ qemuSnapshotDiscardExternal(virDomainObj *vm, if (data->job->state == QEMU_BLOCKJOB_STATE_FAILED) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("finishing block job failed while deleting disk '%s' snapshot: '%s'"), + _("finishing block job failed while deleting disk '%1$s' snapshot: '%2$s'"), data->snapDisk->name, data->job->errmsg); goto error; } @@ -3079,7 +3071,7 @@ qemuSnapshotDeleteValidate(virDomainObj *vm, if (!virStorageSourceIsSameLocation(vmdisk->src, disk->src)) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, - _("disk image '%s' for internal snapshot '%s' is not the same as disk image currently used by VM"), + _("disk image '%1$s' for internal snapshot '%2$s' is not the same as disk image currently used by VM"), snapDisk->name, snap->def->name); return -1; } diff --git a/src/qemu/qemu_tpm.c b/src/qemu/qemu_tpm.c index f4344de663..4d72c936dc 100644 --- a/src/qemu/qemu_tpm.c +++ b/src/qemu/qemu_tpm.c @@ -179,7 +179,7 @@ qemuTPMEmulatorCreateStorage(virDomainTPMDef *tpm, /* allow others to cd into this dir */ if (g_mkdir_with_parents(swtpmStorageDir, 0711) < 0) { virReportSystemError(errno, - _("Could not create TPM directory %s"), + _("Could not create TPM directory %1$s"), swtpmStorageDir); return -1; } @@ -192,7 +192,7 @@ qemuTPMEmulatorCreateStorage(virDomainTPMDef *tpm, if (virDirCreate(storagepath, 0700, swtpm_user, swtpm_group, VIR_DIR_CREATE_ALLOW_EXIST) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not create directory %s as %u:%d"), + _("Could not create directory %1$s as %2$u:%3$d"), storagepath, swtpm_user, swtpm_group); return -1; } @@ -294,8 +294,7 @@ qemuTPMCreateConfigFiles(const char *swtpm_setup) return -1; if (exitstatus != 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not run '%s' to create config files. " - "exitstatus: %d;\nError: %s"), + _("Could not run '%1$s' to create config files. exitstatus: %2$d;\nError: %3$s"), swtpm_setup, exitstatus, errbuf); return -1; } @@ -323,8 +322,8 @@ qemuTPMVirCommandAddEncryption(virCommand *cmd, if (!virTPMSwtpmSetupCapsGet(VIR_TPM_SWTPM_SETUP_FEATURE_CMDARG_PWDFILE_FD)) { virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, - _("%s does not support passing a passphrase using a file " - "descriptor"), swtpm_setup); + _("%1$s does not support passing a passphrase using a file descriptor"), + swtpm_setup); return -1; } @@ -436,8 +435,7 @@ qemuTPMEmulatorRunSetup(const char *storagepath, if (virCommandRun(cmd, &exitstatus) < 0 || exitstatus != 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not run '%s'. exitstatus: %d; " - "Check error log '%s' for details."), + _("Could not run '%1$s'. exitstatus: %2$d; Check error log '%3$s' for details."), swtpm_setup, exitstatus, logfile); return -1; } @@ -523,8 +521,7 @@ qemuTPMEmulatorReconfigure(const char *storagepath, if (virCommandRun(cmd, &exitstatus) < 0 || exitstatus != 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not run '%s --reconfigure'. exitstatus: %d; " - "Check error log '%s' for details."), + _("Could not run '%1$s --reconfigure'. exitstatus: %2$d; Check error log '%3$s' for details."), swtpm_setup, exitstatus, logfile); return -1; } @@ -636,8 +633,8 @@ qemuTPMEmulatorBuildCommand(virDomainTPMDef *tpm, if (tpm->data.emulator.hassecretuuid) { if (!virTPMSwtpmCapsGet(VIR_TPM_SWTPM_FEATURE_CMDARG_PWD_FD)) { virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, - _("%s does not support passing passphrase via file descriptor"), - swtpm); + _("%1$s does not support passing passphrase via file descriptor"), + swtpm); goto error; } @@ -674,8 +671,8 @@ qemuTPMEmulatorBuildCommand(virDomainTPMDef *tpm, */ if (incomingMigration && on_shared_storage) { virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, - _("%s (on destination side) does not support the --migration option needed for migration with shared storage"), - swtpm); + _("%1$s (on destination side) does not support the --migration option needed for migration with shared storage"), + swtpm); goto error; } } @@ -809,7 +806,7 @@ qemuTPMEmulatorPrepareHost(virDomainTPMDef *tpm, /* ... and make sure it can be accessed by swtpm_user */ if (chown(tpm->data.emulator.logfile, swtpm_user, swtpm_group) < 0) { virReportSystemError(errno, - _("Could not chown on swtpm logfile %s"), + _("Could not chown on swtpm logfile %1$s"), tpm->data.emulator.logfile); return -1; } @@ -988,7 +985,7 @@ qemuTPMEmulatorStart(virQEMUDriver *driver, _("swtpm died unexpectedly")); } else { virReportError(VIR_ERR_OPERATION_FAILED, - _("swtpm died and reported: %s"), errbuf); + _("swtpm died and reported: %1$s"), errbuf); } goto error; } diff --git a/src/qemu/qemu_vhost_user.c b/src/qemu/qemu_vhost_user.c index 7539afd50a..0294daab80 100644 --- a/src/qemu/qemu_vhost_user.c +++ b/src/qemu/qemu_vhost_user.c @@ -150,7 +150,7 @@ qemuVhostUserTypeParse(const char *path, if ((tmp = qemuVhostUserTypeTypeFromString(type)) <= 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unknown vhost-user type: '%s'"), + _("unknown vhost-user type: '%1$s'"), type); return -1; } @@ -189,7 +189,7 @@ qemuVhostUserParse(const char *path) if (!(doc = virJSONValueFromString(cont))) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unable to parse json file '%s'"), + _("unable to parse json file '%1$s'"), path); return NULL; } @@ -285,7 +285,7 @@ qemuVhostUserGPUFillCapabilities(qemuVhostUser *vu, if (!(featuresJSON = virJSONValueObjectGetArray(doc, "features"))) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("failed to get features from '%s'"), + _("failed to get features from '%1$s'"), vu->binary); return -1; } @@ -359,7 +359,7 @@ qemuVhostUserFillDomainGPU(virQEMUDriver *driver, if (!(doc = virJSONValueFromString(output))) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unable to parse json capabilities '%s'"), + _("unable to parse json capabilities '%1$s'"), vu->binary); continue; } diff --git a/src/qemu/qemu_vhost_user_gpu.c b/src/qemu/qemu_vhost_user_gpu.c index 5b49ef4e28..dbac4a2153 100644 --- a/src/qemu/qemu_vhost_user_gpu.c +++ b/src/qemu/qemu_vhost_user_gpu.c @@ -158,7 +158,7 @@ int qemuExtVhostUserGPUStart(virQEMUDriver *driver, rc = virPidFileReadPath(pidfile, &pid); if (rc < 0) { virReportSystemError(-rc, - _("Unable to read vhost-user-gpu pidfile '%s'"), + _("Unable to read vhost-user-gpu pidfile '%1$s'"), pidfile); goto cleanup; } diff --git a/src/qemu/qemu_virtiofs.c b/src/qemu/qemu_virtiofs.c index cd947bebfd..230f85c291 100644 --- a/src/qemu/qemu_virtiofs.c +++ b/src/qemu/qemu_virtiofs.c @@ -190,14 +190,14 @@ qemuVirtioFSStart(virQEMUDriver *driver, if (!virFileIsExecutable(fs->binary)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("virtiofsd binary '%s' is not executable"), + _("virtiofsd binary '%1$s' is not executable"), fs->binary); return -1; } if (!virFileExists(fs->src->path)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("the virtiofs export directory '%s' does not exist"), + _("the virtiofs export directory '%1$s' does not exist"), fs->src->path); return -1; } @@ -228,12 +228,12 @@ qemuVirtioFSStart(virQEMUDriver *driver, goto error; } else { if ((logfd = open(logpath, O_WRONLY | O_CREAT | O_APPEND, S_IRUSR | S_IWUSR)) < 0) { - virReportSystemError(errno, _("failed to create logfile %s"), + virReportSystemError(errno, _("failed to create logfile %1$s"), logpath); goto error; } if (virSetCloseExec(logfd) < 0) { - virReportSystemError(errno, _("failed to set close-on-exec flag on %s"), + virReportSystemError(errno, _("failed to set close-on-exec flag on %1$s"), logpath); goto error; } @@ -276,7 +276,7 @@ qemuVirtioFSStart(virQEMUDriver *driver, rc = virPidFileReadPath(pidfile, &pid); if (rc < 0) { virReportSystemError(-rc, - _("Unable to read virtiofsd pidfile '%s'"), + _("Unable to read virtiofsd pidfile '%1$s'"), pidfile); goto error; } -- 2.39.2

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com&gt; --- src/rpc/gendispatch.pl | 10 ++--- src/rpc/virkeepalive.c | 2 +- src/rpc/virnetclient.c | 4 +- src/rpc/virnetclientprogram.c | 26 ++++++------ src/rpc/virnetclientstream.c | 6 +-- src/rpc/virnetdaemon.c | 6 +-- src/rpc/virnetlibsshsession.c | 57 ++++++++++++------------- src/rpc/virnetmessage.c | 21 +++++----- src/rpc/virnetsaslcontext.c | 38 ++++++++--------- src/rpc/virnetserver.c | 2 +- src/rpc/virnetserverclient.c | 4 +- src/rpc/virnetserverprogram.c | 12 +++--- src/rpc/virnetsocket.c | 42 +++++++++---------- src/rpc/virnetsshsession.c | 59 ++++++++++++-------------- src/rpc/virnettlscontext.c | 78 +++++++++++++++++------------------ 15 files changed, 178 insertions(+), 189 deletions(-) diff --git a/src/rpc/gendispatch.pl b/src/rpc/gendispatch.pl index b186849606..e791d2c75c 100755 --- a/src/rpc/gendispatch.pl +++ b/src/rpc/gendispatch.pl @@ -1178,7 +1178,7 @@ elsif ($mode eq "server") { if ($modern_ret_as_list) { print " if (nresults > $single_ret_list_max_define) {\n"; print " virReportError(VIR_ERR_INTERNAL_ERROR,\n"; - print " _(\"Too many ${single_ret_list_error_msg_type}s '%d' for limit '%d'\"),\n"; + print " _(\"Too many ${single_ret_list_error_msg_type}s '%1\$d' for limit '%2\$d'\"),\n"; print " nresults, $single_ret_list_max_define);\n"; print " goto cleanup;\n"; print " }\n"; @@ -1845,7 +1845,7 @@ elsif ($mode eq "client") { print "\n"; print " if ($args_check->{arg} > $args_check->{limit}) {\n"; print " virReportError(VIR_ERR_RPC,\n"; - print " _(\"%s length greater than maximum: %d > %d\"),\n"; + print " _(\"%1\$s length greater than maximum: %2\$d > %3\$d\"),\n"; print " $args_check->{name}, (int)$args_check->{arg}, $args_check->{limit});\n"; print " goto done;\n"; print " }\n"; @@ -1855,7 +1855,7 @@ elsif ($mode eq "client") { print "\n"; print " if ($single_ret_list_max_var > $single_ret_list_max_define) {\n"; print " virReportError(VIR_ERR_RPC,\n"; - print " _(\"too many remote ${single_ret_list_error_msg_type}s: %d > %d,\"\n"; + print " _(\"too many remote ${single_ret_list_error_msg_type}s: %1\$d > %2\$d,\"\n"; print " \"in parameter '$single_ret_list_name' for 'vir$call->{ProcName}'\"),\n"; print " $single_ret_list_max_var, $single_ret_list_max_define);\n"; print " goto done;\n"; @@ -1917,7 +1917,7 @@ elsif ($mode eq "client") { $modern_ret_as_list) { print " if (ret.$single_ret_list_name.${single_ret_list_name}_len > $single_ret_list_max_var) {\n"; print " virReportError(VIR_ERR_RPC,\n"; - print " _(\"too many remote ${single_ret_list_error_msg_type}s: %d > %d,\"\n"; + print " _(\"too many remote ${single_ret_list_error_msg_type}s: %1\$d > %2\$d,\"\n"; print " \"in parameter '$single_ret_list_name' for 'vir$call->{ProcName}'\"),\n"; print " ret.$single_ret_list_name.${single_ret_list_name}_len, $single_ret_list_max_var);\n"; print " goto cleanup;\n"; @@ -2219,7 +2219,7 @@ elsif ($mode eq "client") { if ($action eq "Ensure") { print " if (rv == 0)\n"; print " virReportError(VIR_ERR_ACCESS_DENIED,\n"; - print" _(\"'%s' denied access\"), conn->driver->name);\n"; + print" _(\"'%1\$s' denied access\"), conn->driver->name);\n"; print " return $fail;\n"; } else { print " virResetLastError();\n"; diff --git a/src/rpc/virkeepalive.c b/src/rpc/virkeepalive.c index 434cc2c7c9..d96bd347ad 100644 --- a/src/rpc/virkeepalive.c +++ b/src/rpc/virkeepalive.c @@ -249,7 +249,7 @@ virKeepAliveStart(virKeepAlive *ka, /* Guard against overflow */ if (interval > INT_MAX / 1000) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("keepalive interval %d too large"), interval); + _("keepalive interval %1$d too large"), interval); goto cleanup; } ka->interval = interval; diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c index 1202b0f30c..df2958935b 100644 --- a/src/rpc/virnetclient.c +++ b/src/rpc/virnetclient.c @@ -1138,7 +1138,7 @@ virNetClientCallDispatchReply(virNetClient *client) if (!thecall) { virReportError(VIR_ERR_RPC, - _("no call waiting for reply with prog %d vers %d serial %d"), + _("no call waiting for reply with prog %1$d vers %2$d serial %3$d"), client->msg.header.prog, client->msg.header.vers, client->msg.header.serial); return -1; } @@ -1327,7 +1327,7 @@ virNetClientCallDispatch(virNetClient *client) case VIR_NET_CALL_WITH_FDS: default: virReportError(VIR_ERR_RPC, - _("got unexpected RPC call prog %d vers %d proc %d type %d"), + _("got unexpected RPC call prog %1$d vers %2$d proc %3$d type %4$d"), client->msg.header.prog, client->msg.header.vers, client->msg.header.proc, client->msg.header.type); return -1; diff --git a/src/rpc/virnetclientprogram.c b/src/rpc/virnetclientprogram.c index b93c495347..abc8e6798a 100644 --- a/src/rpc/virnetclientprogram.c +++ b/src/rpc/virnetclientprogram.c @@ -216,25 +216,25 @@ int virNetClientProgramDispatch(virNetClientProgram *prog, /* Check version, etc. */ if (msg->header.prog != prog->program) { - VIR_ERROR(_("program mismatch in event (actual 0x%x, expected 0x%x)"), + VIR_ERROR(_("program mismatch in event (actual 0x%1$x, expected 0x%2$x)"), msg->header.prog, prog->program); return -1; } if (msg->header.vers != prog->version) { - VIR_ERROR(_("version mismatch in event (actual 0x%x, expected 0x%x)"), + VIR_ERROR(_("version mismatch in event (actual 0x%1$x, expected 0x%2$x)"), msg->header.vers, prog->version); return -1; } if (msg->header.status != VIR_NET_OK) { - VIR_ERROR(_("status mismatch in event (actual 0x%x, expected 0x%x)"), + VIR_ERROR(_("status mismatch in event (actual 0x%1$x, expected 0x%2$x)"), msg->header.status, VIR_NET_OK); return -1; } if (msg->header.type != VIR_NET_MESSAGE) { - VIR_ERROR(_("type mismatch in event (actual 0x%x, expected 0x%x)"), + VIR_ERROR(_("type mismatch in event (actual 0x%1$x, expected 0x%2$x)"), msg->header.type, VIR_NET_MESSAGE); return -1; } @@ -242,7 +242,7 @@ int virNetClientProgramDispatch(virNetClientProgram *prog, event = virNetClientProgramGetEvent(prog, msg->header.proc); if (!event) { - VIR_ERROR(_("No event expected with procedure 0x%x"), + VIR_ERROR(_("No event expected with procedure 0x%1$x"), msg->header.proc); return -1; } @@ -295,13 +295,13 @@ int virNetClientProgramCall(virNetClientProgram *prog, for (i = 0; i < msg->nfds; i++) { if ((msg->fds[i] = dup(outfds[i])) < 0) { virReportSystemError(errno, - _("Cannot duplicate FD %d"), + _("Cannot duplicate FD %1$d"), outfds[i]); goto error; } if (virSetInherit(msg->fds[i], false) < 0) { virReportSystemError(errno, - _("Cannot set close-on-exec %d"), + _("Cannot set close-on-exec %1$d"), msg->fds[i]); goto error; } @@ -327,18 +327,18 @@ int virNetClientProgramCall(virNetClientProgram *prog, if (msg->header.type != VIR_NET_REPLY && msg->header.type != VIR_NET_REPLY_WITH_FDS) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unexpected message type %d"), msg->header.type); + _("Unexpected message type %1$d"), msg->header.type); goto error; } if (msg->header.proc != proc) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unexpected message proc %d != %d"), + _("Unexpected message proc %1$d != %2$d"), msg->header.proc, proc); goto error; } if (msg->header.serial != serial) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unexpected message serial %d != %d"), + _("Unexpected message serial %1$d != %2$d"), msg->header.serial, serial); goto error; } @@ -354,13 +354,13 @@ int virNetClientProgramCall(virNetClientProgram *prog, for (i = 0; i < *ninfds; i++) { if (((*infds)[i] = dup(msg->fds[i])) < 0) { virReportSystemError(errno, - _("Cannot duplicate FD %d"), + _("Cannot duplicate FD %1$d"), msg->fds[i]); goto error; } if (virSetInherit((*infds)[i], false) < 0) { virReportSystemError(errno, - _("Cannot set close-on-exec %d"), + _("Cannot set close-on-exec %1$d"), (*infds)[i]); goto error; } @@ -378,7 +378,7 @@ int virNetClientProgramCall(virNetClientProgram *prog, case VIR_NET_CONTINUE: default: virReportError(VIR_ERR_RPC, - _("Unexpected message status %d"), msg->header.status); + _("Unexpected message status %1$d"), msg->header.status); goto error; } diff --git a/src/rpc/virnetclientstream.c b/src/rpc/virnetclientstream.c index e0e3178111..21e9332134 100644 --- a/src/rpc/virnetclientstream.c +++ b/src/rpc/virnetclientstream.c @@ -417,7 +417,7 @@ virNetClientStreamSetHole(virNetClientStream *st, /* Shouldn't happen, But it's better to safe than sorry. */ if (st->holeLength) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unprocessed hole of size %lld already in the queue"), + _("unprocessed hole of size %1$lld already in the queue"), st->holeLength); return -1; } @@ -462,7 +462,7 @@ virNetClientStreamHandleHole(virNetClient *client, if (msg->header.type != VIR_NET_STREAM_HOLE) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Invalid message prog=%d type=%d serial=%u proc=%d"), + _("Invalid message prog=%1$d type=%2$d serial=%3$u proc=%4$d"), msg->header.prog, msg->header.type, msg->header.serial, @@ -851,7 +851,7 @@ int virNetClientStreamInData(virNetClientStream *st, st->holeLength = 0; } else { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Invalid message prog=%d type=%d serial=%u proc=%d"), + _("Invalid message prog=%1$d type=%2$d serial=%3$u proc=%4$d"), msg->header.prog, msg->header.type, msg->header.serial, diff --git a/src/rpc/virnetdaemon.c b/src/rpc/virnetdaemon.c index c4f5bbdce5..1292faa078 100644 --- a/src/rpc/virnetdaemon.c +++ b/src/rpc/virnetdaemon.c @@ -194,7 +194,7 @@ virNetDaemonGetServer(virNetDaemon *dmn, if (!srv) { virReportError(VIR_ERR_NO_SERVER, - _("No server named '%s'"), serverName); + _("No server named '%1$s'"), serverName); } return srv; @@ -324,7 +324,7 @@ virNetDaemonNewPostExecRestart(virJSONValue *object, size_t n = virJSONValueArraySize(servers); if (n > nDefServerNames) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Server count %zd greater than default name count %zu"), + _("Server count %1$zd greater than default name count %2$zu"), n, nDefServerNames); goto error; } @@ -646,7 +646,7 @@ virNetDaemonSignalEvent(int watch, } virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unexpected signal received: %d"), siginfo.si_signo); + _("Unexpected signal received: %1$d"), siginfo.si_signo); cleanup: virObjectUnlock(dmn); diff --git a/src/rpc/virnetlibsshsession.c b/src/rpc/virnetlibsshsession.c index bba37210df..e71a79d0fb 100644 --- a/src/rpc/virnetlibsshsession.c +++ b/src/rpc/virnetlibsshsession.c @@ -261,10 +261,8 @@ virNetLibsshCheckHostKey(virNetLibsshSession *sess) /* host key verification failed */ virReportError(VIR_ERR_AUTH_FAILED, - _("!!! SSH HOST KEY VERIFICATION FAILED !!!: " - "Identity of host '%s:%d' differs from stored identity. " - "Please verify the new host key '%s' to avoid possible " - "man in the middle attack. The key is stored in '%s'."), + _("!!! SSH HOST KEY VERIFICATION FAILED !!!: Identity of host '%1$s:%2$d' differs from stored identity. " + "Please verify the new host key '%3$s' to avoid possible man in the middle attack. The key is stored in '%4$s'."), sess->hostname, sess->port, keyhashstr, sess->knownHostsFile); @@ -290,7 +288,7 @@ virNetLibsshCheckHostKey(virNetLibsshSession *sess) if (!keyhashstr) return -1; - prompt = g_strdup_printf(_("Accept SSH host key with hash '%s' for " "host '%s:%d' (%s/%s)?"), + prompt = g_strdup_printf(_("Accept SSH host key with hash '%1$s' for host '%2$s:%3$d' (%4$s/%5$s)?"), keyhashstr, sess->hostname, sess->port, "y", "n"); if (!(cred = virAuthAskCredential(sess->cred, prompt, true))) { @@ -301,7 +299,7 @@ virNetLibsshCheckHostKey(virNetLibsshSession *sess) if (!cred->result || STRCASENEQ(cred->result, "y")) { virReportError(VIR_ERR_LIBSSH, - _("SSH host key for '%s' (%s) was not accepted"), + _("SSH host key for '%1$s' (%2$s) was not accepted"), sess->hostname, keyhashstr); ssh_string_free_char(keyhashstr); return -1; @@ -314,7 +312,7 @@ virNetLibsshCheckHostKey(virNetLibsshSession *sess) if (ssh_session_update_known_hosts(sess->session) < 0) { errmsg = ssh_get_error(sess->session); virReportError(VIR_ERR_LIBSSH, - _("failed to write known_host file '%s': %s"), + _("failed to write known_host file '%1$s': %2$s"), sess->knownHostsFile, errmsg); return -1; @@ -326,7 +324,7 @@ virNetLibsshCheckHostKey(virNetLibsshSession *sess) case SSH_SERVER_ERROR: errmsg = ssh_get_error(sess->session); virReportError(VIR_ERR_LIBSSH, - _("failed to validate SSH host key: %s"), + _("failed to validate SSH host key: %1$s"), errmsg); return -1; @@ -395,14 +393,13 @@ virNetLibsshImportPrivkey(virNetLibsshSession *sess, sess, &key); if (ret == SSH_EOF) { virReportError(VIR_ERR_AUTH_FAILED, - _("error while reading private key '%s'"), + _("error while reading private key '%1$s'"), priv->filename); return SSH_AUTH_ERROR; } else if (ret == SSH_ERROR) { if (virGetLastErrorCode() == VIR_ERR_OK) { virReportError(VIR_ERR_AUTH_FAILED, - _("error while opening private key '%s', wrong " - "passphrase?"), + _("error while opening private key '%1$s', wrong passphrase?"), priv->filename); } return SSH_AUTH_ERROR; @@ -435,7 +432,7 @@ virNetLibsshAuthenticatePrivkey(virNetLibsshSession *sess, ret = ssh_pki_import_pubkey_file(tmp, &public_key); if (ret == SSH_ERROR) { virReportError(VIR_ERR_AUTH_FAILED, - _("error while reading public key '%s'"), + _("error while reading public key '%1$s'"), tmp); err = SSH_AUTH_ERROR; goto error; @@ -449,8 +446,7 @@ virNetLibsshAuthenticatePrivkey(virNetLibsshSession *sess, ret = ssh_pki_export_privkey_to_pubkey(private_key, &public_key); if (ret == SSH_ERROR) { virReportError(VIR_ERR_AUTH_FAILED, - _("cannot export the public key from the " - "private key '%s'"), + _("cannot export the public key from the private key '%1$s'"), priv->filename); err = SSH_AUTH_ERROR; goto error; @@ -535,7 +531,7 @@ virNetLibsshAuthenticatePassword(virNetLibsshSession *sess) g_autoptr(virConnectCredential) cred = NULL; g_autofree char *prompt = NULL; - prompt = g_strdup_printf(_("Enter %s's password for %s"), + prompt = g_strdup_printf(_("Enter %1$s's password for %2$s"), sess->username, sess->hostname); if (!(cred = virAuthAskCredential(sess->cred, prompt, false))) @@ -552,7 +548,7 @@ virNetLibsshAuthenticatePassword(virNetLibsshSession *sess) error: errmsg = ssh_get_error(sess->session); virReportError(VIR_ERR_AUTH_FAILED, - _("authentication failed: %s"), errmsg); + _("authentication failed: %1$s"), errmsg); return rc; } @@ -632,7 +628,7 @@ virNetLibsshAuthenticateKeyboardInteractive(virNetLibsshSession *sess, cred->result) < 0) { errmsg = ssh_get_error(sess->session); virReportError(VIR_ERR_AUTH_FAILED, - _("authentication failed: %s"), errmsg); + _("authentication failed: %1$s"), errmsg); return SSH_AUTH_ERROR; } @@ -649,7 +645,7 @@ virNetLibsshAuthenticateKeyboardInteractive(virNetLibsshSession *sess, /* error path */ errmsg = ssh_get_error(sess->session); virReportError(VIR_ERR_AUTH_FAILED, - _("authentication failed: %s"), errmsg); + _("authentication failed: %1$s"), errmsg); } return ret; @@ -679,7 +675,7 @@ virNetLibsshAuthenticate(virNetLibsshSession *sess) if (ret == SSH_AUTH_ERROR) { errmsg = ssh_get_error(sess->session); virReportError(VIR_ERR_LIBSSH, - _("Failed to authenticate as 'none': %s"), + _("Failed to authenticate as 'none': %1$s"), errmsg); return -1; } @@ -708,7 +704,7 @@ virNetLibsshAuthenticate(virNetLibsshSession *sess) if (ret == SSH_AUTH_ERROR) { errmsg = ssh_get_error(sess->session); virReportError(VIR_ERR_LIBSSH, - _("failed to authenticate using agent: %s"), + _("failed to authenticate using agent: %1$s"), errmsg); } break; @@ -736,7 +732,7 @@ virNetLibsshAuthenticate(virNetLibsshSession *sess) if (sess->nauths == 1) { errmsg = ssh_get_error(sess->session); virReportError(VIR_ERR_LIBSSH, - _("failed to authenticate: %s"), + _("failed to authenticate: %1$s"), errmsg); } else if (no_method && !auth_failed) { virReportError(VIR_ERR_AUTH_FAILED, "%s", @@ -761,7 +757,7 @@ virNetLibsshOpenChannel(virNetLibsshSession *sess) if (!sess->channel) { errmsg = ssh_get_error(sess->session); virReportError(VIR_ERR_LIBSSH, - _("failed to create libssh channel: %s"), + _("failed to create libssh channel: %1$s"), errmsg); return -1; } @@ -769,7 +765,7 @@ virNetLibsshOpenChannel(virNetLibsshSession *sess) if (ssh_channel_open_session(sess->channel) != SSH_OK) { errmsg = ssh_get_error(sess->session); virReportError(VIR_ERR_LIBSSH, - _("failed to open ssh channel: %s"), + _("failed to open ssh channel: %1$s"), errmsg); return -1; } @@ -777,7 +773,7 @@ virNetLibsshOpenChannel(virNetLibsshSession *sess) if (ssh_channel_request_exec(sess->channel, sess->channelCommand) != SSH_OK) { errmsg = ssh_get_error(sess->session); virReportError(VIR_ERR_LIBSSH, - _("failed to execute command '%s': %s"), + _("failed to execute command '%1$s': %2$s"), sess->channelCommand, errmsg); return -1; @@ -1058,7 +1054,7 @@ virNetLibsshSessionConnect(virNetLibsshSession *sess, if (ret < 0) { errmsg = ssh_get_error(sess->session); virReportError(VIR_ERR_NO_CONNECT, - _("SSH session handshake failed: %s"), + _("SSH session handshake failed: %1$s"), errmsg); goto error; } @@ -1103,8 +1099,7 @@ virNetLibsshChannelRead(virNetLibsshSession *sess, if (sess->state != VIR_NET_LIBSSH_STATE_HANDSHAKE_COMPLETE) { if (sess->state == VIR_NET_LIBSSH_STATE_ERROR_REMOTE) virReportError(VIR_ERR_LIBSSH, - _("Remote program terminated " - "with non-zero code: %d"), + _("Remote program terminated with non-zero code: %1$d"), sess->channelCommandReturnValue); else virReportError(VIR_ERR_LIBSSH, "%s", @@ -1189,7 +1184,7 @@ virNetLibsshChannelRead(virNetLibsshSession *sess, eof: if (ssh_channel_get_exit_status(sess->channel)) { virReportError(VIR_ERR_LIBSSH, - _("Remote command terminated with non-zero code: %d"), + _("Remote command terminated with non-zero code: %1$d"), ssh_channel_get_exit_status(sess->channel)); sess->channelCommandReturnValue = ssh_channel_get_exit_status(sess->channel); sess->state = VIR_NET_LIBSSH_STATE_ERROR_REMOTE; @@ -1224,7 +1219,7 @@ virNetLibsshChannelWrite(virNetLibsshSession *sess, if (sess->state != VIR_NET_LIBSSH_STATE_HANDSHAKE_COMPLETE) { if (sess->state == VIR_NET_LIBSSH_STATE_ERROR_REMOTE) virReportError(VIR_ERR_LIBSSH, - _("Remote program terminated with non-zero code: %d"), + _("Remote program terminated with non-zero code: %1$d"), sess->channelCommandReturnValue); else virReportError(VIR_ERR_LIBSSH, "%s", @@ -1236,7 +1231,7 @@ virNetLibsshChannelWrite(virNetLibsshSession *sess, if (ssh_channel_is_eof(sess->channel)) { if (ssh_channel_get_exit_status(sess->channel)) { virReportError(VIR_ERR_LIBSSH, - _("Remote program terminated with non-zero code: %d"), + _("Remote program terminated with non-zero code: %1$d"), ssh_channel_get_exit_status(sess->channel)); sess->state = VIR_NET_LIBSSH_STATE_ERROR_REMOTE; sess->channelCommandReturnValue = ssh_channel_get_exit_status(sess->channel); @@ -1261,7 +1256,7 @@ virNetLibsshChannelWrite(virNetLibsshSession *sess, sess->state = VIR_NET_LIBSSH_STATE_ERROR; msg = ssh_get_error(sess->session); virReportError(VIR_ERR_LIBSSH, - _("write failed: %s"), msg); + _("write failed: %1$s"), msg); } cleanup: diff --git a/src/rpc/virnetmessage.c b/src/rpc/virnetmessage.c index c9698fb263..50cc335fd6 100644 --- a/src/rpc/virnetmessage.c +++ b/src/rpc/virnetmessage.c @@ -141,7 +141,7 @@ int virNetMessageDecodeLength(virNetMessage *msg) if (len < VIR_NET_MESSAGE_LEN_MAX) { virReportError(VIR_ERR_RPC, - _("packet %d bytes received from server too small, want %d"), + _("packet %1$d bytes received from server too small, want %2$d"), len, VIR_NET_MESSAGE_LEN_MAX); goto cleanup; } @@ -151,7 +151,7 @@ int virNetMessageDecodeLength(virNetMessage *msg) if (len > VIR_NET_MESSAGE_MAX) { virReportError(VIR_ERR_RPC, - _("packet %d bytes received from server too large, want %d"), + _("packet %1$d bytes received from server too large, want %2$d"), len, VIR_NET_MESSAGE_MAX); goto cleanup; } @@ -287,7 +287,7 @@ int virNetMessageEncodeNumFDs(virNetMessage *msg) if (numFDs > VIR_NET_MESSAGE_NUM_FDS_MAX) { virReportError(VIR_ERR_RPC, - _("Too many FDs to send %d, expected %d maximum"), + _("Too many FDs to send %1$d, expected %2$d maximum"), numFDs, VIR_NET_MESSAGE_NUM_FDS_MAX); goto cleanup; } @@ -325,7 +325,7 @@ int virNetMessageDecodeNumFDs(virNetMessage *msg) if (numFDs > VIR_NET_MESSAGE_NUM_FDS_MAX) { virReportError(VIR_ERR_RPC, - _("Received too many FDs %d, expected %d maximum"), + _("Received too many FDs %1$d, expected %2$d maximum"), numFDs, VIR_NET_MESSAGE_NUM_FDS_MAX); goto cleanup; } @@ -457,8 +457,7 @@ int virNetMessageEncodePayloadRaw(virNetMessage *msg, if ((msg->bufferOffset + len) > (VIR_NET_MESSAGE_MAX + VIR_NET_MESSAGE_LEN_MAX)) { virReportError(VIR_ERR_RPC, - _("Stream data too long to send " - "(%zu bytes needed, %zu bytes available)"), + _("Stream data too long to send (%1$zu bytes needed, %2$zu bytes available)"), len, VIR_NET_MESSAGE_MAX + VIR_NET_MESSAGE_LEN_MAX - @@ -549,20 +548,20 @@ int virNetMessageDupFD(virNetMessage *msg, if (slot >= msg->nfds) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("No FD available at slot %zu"), slot); + _("No FD available at slot %1$zu"), slot); return -1; } if ((fd = dup(msg->fds[slot])) < 0) { virReportSystemError(errno, - _("Unable to duplicate FD %d"), + _("Unable to duplicate FD %1$d"), msg->fds[slot]); return -1; } if (virSetInherit(fd, false) < 0) { VIR_FORCE_CLOSE(fd); virReportSystemError(errno, - _("Cannot set close-on-exec %d"), + _("Cannot set close-on-exec %1$d"), fd); return -1; } @@ -576,14 +575,14 @@ int virNetMessageAddFD(virNetMessage *msg, if ((newfd = dup(fd)) < 0) { virReportSystemError(errno, - _("Unable to duplicate FD %d"), + _("Unable to duplicate FD %1$d"), fd); goto error; } if (virSetInherit(newfd, false) < 0) { virReportSystemError(errno, - _("Cannot set close-on-exec %d"), + _("Cannot set close-on-exec %1$d"), newfd); goto error; } diff --git a/src/rpc/virnetsaslcontext.c b/src/rpc/virnetsaslcontext.c index dbf777cfa3..7151225cc3 100644 --- a/src/rpc/virnetsaslcontext.c +++ b/src/rpc/virnetsaslcontext.c @@ -78,7 +78,7 @@ static int virNetSASLContextClientOnceInit(void) int err = sasl_client_init(NULL); if (err != SASL_OK) { virReportError(VIR_ERR_AUTH_FAILED, - _("failed to initialize SASL library: %d (%s)"), + _("failed to initialize SASL library: %1$d (%2$s)"), err, sasl_errstring(err, NULL, NULL)); return -1; } @@ -94,7 +94,7 @@ static int virNetSASLContextServerOnceInit(void) int err = sasl_server_init(NULL, "libvirt"); if (err != SASL_OK) { virReportError(VIR_ERR_AUTH_FAILED, - _("failed to initialize SASL library: %d (%s)"), + _("failed to initialize SASL library: %1$d (%2$s)"), err, sasl_errstring(err, NULL, NULL)); return -1; } @@ -162,7 +162,7 @@ int virNetSASLContextCheckIdentity(virNetSASLContext *ctxt, } /* Denied */ - VIR_ERROR(_("SASL client identity '%s' not allowed by ACL"), identity); + VIR_ERROR(_("SASL client identity '%1$s' not allowed by ACL"), identity); /* This is the most common error: make it informative. */ virReportError(VIR_ERR_SYSTEM_ERROR, "%s", @@ -206,7 +206,7 @@ virNetSASLSession *virNetSASLSessionNewClient(virNetSASLContext *ctxt G_GNUC_UNU &sasl->conn); if (err != SASL_OK) { virReportError(VIR_ERR_AUTH_FAILED, - _("Failed to create SASL client context: %d (%s)"), + _("Failed to create SASL client context: %1$d (%2$s)"), err, sasl_errstring(err, NULL, NULL)); goto cleanup; } @@ -243,7 +243,7 @@ virNetSASLSession *virNetSASLSessionNewServer(virNetSASLContext *ctxt G_GNUC_UNU &sasl->conn); if (err != SASL_OK) { virReportError(VIR_ERR_AUTH_FAILED, - _("Failed to create SASL client context: %d (%s)"), + _("Failed to create SASL client context: %1$d (%2$s)"), err, sasl_errstring(err, NULL, NULL)); goto cleanup; } @@ -265,7 +265,7 @@ int virNetSASLSessionExtKeySize(virNetSASLSession *sasl, err = sasl_setprop(sasl->conn, SASL_SSF_EXTERNAL, &ssf); if (err != SASL_OK) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("cannot set external SSF %d (%s)"), + _("cannot set external SSF %1$d (%2$s)"), err, sasl_errstring(err, NULL, NULL)); goto cleanup; } @@ -286,7 +286,7 @@ const char *virNetSASLSessionGetIdentity(virNetSASLSession *sasl) err = sasl_getprop(sasl->conn, SASL_USERNAME, &val); if (err != SASL_OK) { virReportError(VIR_ERR_AUTH_FAILED, - _("cannot query SASL username on connection %d (%s)"), + _("cannot query SASL username on connection %1$d (%2$s)"), err, sasl_errstring(err, NULL, NULL)); val = NULL; goto cleanup; @@ -314,7 +314,7 @@ int virNetSASLSessionGetKeySize(virNetSASLSession *sasl) err = sasl_getprop(sasl->conn, SASL_SSF, &val); if (err != SASL_OK) { virReportError(VIR_ERR_AUTH_FAILED, - _("cannot query SASL ssf on connection %d (%s)"), + _("cannot query SASL ssf on connection %1$d (%2$s)"), err, sasl_errstring(err, NULL, NULL)); ssf = -1; goto cleanup; @@ -350,7 +350,7 @@ int virNetSASLSessionSecProps(virNetSASLSession *sasl, err = sasl_setprop(sasl->conn, SASL_SEC_PROPS, &secprops); if (err != SASL_OK) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("cannot set security props %d (%s)"), + _("cannot set security props %1$d (%2$s)"), err, sasl_errstring(err, NULL, NULL)); goto cleanup; } @@ -374,7 +374,7 @@ static int virNetSASLSessionUpdateBufSize(virNetSASLSession *sasl) err = sasl_getprop(sasl->conn, SASL_MAXOUTBUF, &u.ptr); if (err != SASL_OK) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("cannot get security props %d (%s)"), + _("cannot get security props %1$d (%2$s)"), err, sasl_errstring(err, NULL, NULL)); return -1; } @@ -402,7 +402,7 @@ char *virNetSASLSessionListMechanisms(virNetSASLSession *sasl) NULL); if (err != SASL_OK) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("cannot list SASL mechanisms %d (%s)"), + _("cannot list SASL mechanisms %1$d (%2$s)"), err, sasl_errdetail(sasl->conn)); goto cleanup; } @@ -458,7 +458,7 @@ int virNetSASLSessionClientStart(virNetSASLSession *sasl, break; default: virReportError(VIR_ERR_AUTH_FAILED, - _("Failed to start SASL negotiation: %d (%s)"), + _("Failed to start SASL negotiation: %1$d (%2$s)"), err, sasl_errdetail(sasl->conn)); break; } @@ -507,7 +507,7 @@ int virNetSASLSessionClientStep(virNetSASLSession *sasl, break; default: virReportError(VIR_ERR_AUTH_FAILED, - _("Failed to step SASL negotiation: %d (%s)"), + _("Failed to step SASL negotiation: %1$d (%2$s)"), err, sasl_errdetail(sasl->conn)); break; } @@ -553,7 +553,7 @@ int virNetSASLSessionServerStart(virNetSASLSession *sasl, break; default: virReportError(VIR_ERR_AUTH_FAILED, - _("Failed to start SASL negotiation: %d (%s)"), + _("Failed to start SASL negotiation: %1$d (%2$s)"), err, sasl_errdetail(sasl->conn)); break; } @@ -598,7 +598,7 @@ int virNetSASLSessionServerStep(virNetSASLSession *sasl, break; default: virReportError(VIR_ERR_AUTH_FAILED, - _("Failed to start SASL negotiation: %d (%s)"), + _("Failed to start SASL negotiation: %1$d (%2$s)"), err, sasl_errdetail(sasl->conn)); break; } @@ -631,7 +631,7 @@ ssize_t virNetSASLSessionEncode(virNetSASLSession *sasl, virObjectLock(sasl); if (inputLen > sasl->maxbufsize) { virReportSystemError(EINVAL, - _("SASL data length %zu too long, max %zu"), + _("SASL data length %1$zu too long, max %2$zu"), inputLen, sasl->maxbufsize); goto cleanup; } @@ -645,7 +645,7 @@ ssize_t virNetSASLSessionEncode(virNetSASLSession *sasl, if (err != SASL_OK) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("failed to encode SASL data: %d (%s)"), + _("failed to encode SASL data: %1$d (%2$s)"), err, sasl_errstring(err, NULL, NULL)); goto cleanup; } @@ -670,7 +670,7 @@ ssize_t virNetSASLSessionDecode(virNetSASLSession *sasl, virObjectLock(sasl); if (inputLen > sasl->maxbufsize) { virReportSystemError(EINVAL, - _("SASL data length %zu too long, max %zu"), + _("SASL data length %1$zu too long, max %2$zu"), inputLen, sasl->maxbufsize); goto cleanup; } @@ -683,7 +683,7 @@ ssize_t virNetSASLSessionDecode(virNetSASLSession *sasl, *outputlen = outlen; if (err != SASL_OK) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("failed to decode SASL data: %d (%s)"), + _("failed to decode SASL data: %1$d (%2$s)"), err, sasl_errstring(err, NULL, NULL)); goto cleanup; } diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c index e97dfe8136..7233629f22 100644 --- a/src/rpc/virnetserver.c +++ b/src/rpc/virnetserver.c @@ -1110,7 +1110,7 @@ virNetServerGetClient(virNetServer *srv, return virObjectRef(client); } - virReportError(VIR_ERR_NO_CLIENT, _("No client with matching ID '%llu'"), id); + virReportError(VIR_ERR_NO_CLIENT, _("No client with matching ID '%1$llu'"), id); return NULL; } diff --git a/src/rpc/virnetserverclient.c b/src/rpc/virnetserverclient.c index bdb3552c5d..c0c018b6be 100644 --- a/src/rpc/virnetserverclient.c +++ b/src/rpc/virnetserverclient.c @@ -1116,7 +1116,7 @@ static ssize_t virNetServerClientRead(virNetServerClient *client) if (client->rx->bufferLength <= client->rx->bufferOffset) { virReportError(VIR_ERR_RPC, - _("unexpected zero/negative length request %lld"), + _("unexpected zero/negative length request %1$lld"), (long long int)(client->rx->bufferLength - client->rx->bufferOffset)); client->wantClose = true; return -1; @@ -1289,7 +1289,7 @@ static ssize_t virNetServerClientWrite(virNetServerClient *client) if (client->tx->bufferLength < client->tx->bufferOffset) { virReportError(VIR_ERR_RPC, - _("unexpected zero/negative length request %lld"), + _("unexpected zero/negative length request %1$lld"), (long long int)(client->tx->bufferLength - client->tx->bufferOffset)); client->wantClose = true; return -1; diff --git a/src/rpc/virnetserverprogram.c b/src/rpc/virnetserverprogram.c index 58b6a278ca..2cce188a09 100644 --- a/src/rpc/virnetserverprogram.c +++ b/src/rpc/virnetserverprogram.c @@ -232,7 +232,7 @@ int virNetServerProgramUnknownError(virNetServerClient *client, virNetMessageError rerr; virReportError(VIR_ERR_RPC, - _("Cannot find program %d version %d"), req->prog, req->vers); + _("Cannot find program %1$d version %2$d"), req->prog, req->vers); memset(&rerr, 0, sizeof(rerr)); return virNetServerProgramSendError(req->prog, @@ -284,14 +284,14 @@ int virNetServerProgramDispatch(virNetServerProgram *prog, /* Check version, etc. */ if (msg->header.prog != prog->program) { virReportError(VIR_ERR_RPC, - _("program mismatch (actual %x, expected %x)"), + _("program mismatch (actual %1$x, expected %2$x)"), msg->header.prog, prog->program); goto error; } if (msg->header.vers != prog->version) { virReportError(VIR_ERR_RPC, - _("version mismatch (actual %x, expected %x)"), + _("version mismatch (actual %1$x, expected %2$x)"), msg->header.vers, prog->version); goto error; } @@ -323,7 +323,7 @@ int virNetServerProgramDispatch(virNetServerProgram *prog, case VIR_NET_STREAM_HOLE: default: virReportError(VIR_ERR_RPC, - _("Unexpected message type %u"), + _("Unexpected message type %1$u"), msg->header.type); goto error; } @@ -377,7 +377,7 @@ virNetServerProgramDispatchCall(virNetServerProgram *prog, if (msg->header.status != VIR_NET_OK) { virReportError(VIR_ERR_RPC, - _("Unexpected message status %u"), + _("Unexpected message status %1$u"), msg->header.status); goto error; } @@ -386,7 +386,7 @@ virNetServerProgramDispatchCall(virNetServerProgram *prog, if (!dispatcher) { virReportError(VIR_ERR_RPC, - _("unknown procedure: %d"), + _("unknown procedure: %1$d"), msg->header.proc); goto error; } diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index b248ce24dc..910fb8dd67 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -162,7 +162,7 @@ virNetSocketCheckProtocolByLookup(const char *address, gaierr == EAI_NONAME) { } else { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Cannot resolve %s address: %s"), + _("Cannot resolve %1$s address: %2$s"), address, gai_strerror(gaierr)); return -1; @@ -346,7 +346,7 @@ int virNetSocketNewListenTCP(const char *nodename, e = getaddrinfo(nodename, service, &hints, &ai); if (e != 0) { virReportError(VIR_ERR_SYSTEM_ERROR, - _("Unable to resolve address '%s' service '%s': %s"), + _("Unable to resolve address '%1$s' service '%2$s': %3$s"), nodename, service, gai_strerror(e)); return -1; } @@ -495,7 +495,7 @@ int virNetSocketNewListenUNIX(const char *path, addr.data.un.sun_family = AF_UNIX; if (virStrcpyStatic(addr.data.un.sun_path, path) < 0) { virReportSystemError(ENAMETOOLONG, - _("Path %s too long for unix socket"), path); + _("Path %1$s too long for unix socket"), path); goto error; } if (addr.data.un.sun_path[0] == '@') @@ -508,7 +508,7 @@ int virNetSocketNewListenUNIX(const char *path, if (bind(fd, &addr.data.sa, addr.len) < 0) { umask(oldmask); virReportSystemError(errno, - _("Failed to bind socket to '%s'"), + _("Failed to bind socket to '%1$s'"), path); goto error; } @@ -519,7 +519,7 @@ int virNetSocketNewListenUNIX(const char *path, */ if (grp != 0 && chown(path, user, grp)) { virReportSystemError(errno, - _("Failed to change ownership of '%s' to %d:%d"), + _("Failed to change ownership of '%1$s' to %2$d:%3$d"), path, (int)user, (int)grp); goto error; } @@ -598,7 +598,7 @@ int virNetSocketNewConnectTCP(const char *nodename, e = getaddrinfo(nodename, service, &hints, &ai); if (e != 0) { virReportError(VIR_ERR_SYSTEM_ERROR, - _("Unable to resolve address '%s' service '%s': %s"), + _("Unable to resolve address '%1$s' service '%2$s': %3$s"), nodename, service, gai_strerror(e)); return -1; } @@ -625,7 +625,7 @@ int virNetSocketNewConnectTCP(const char *nodename, if (fd == -1) { virReportSystemError(savedErrno, - _("unable to connect to server at '%s:%s'"), + _("unable to connect to server at '%1$s:%2$s'"), nodename, service); goto error; } @@ -685,7 +685,7 @@ int virNetSocketNewConnectUNIX(const char *path, if (g_mkdir_with_parents(rundir, 0700) < 0) { virReportSystemError(errno, - _("Cannot create user runtime directory '%s'"), + _("Cannot create user runtime directory '%1$s'"), rundir); goto cleanup; } @@ -694,12 +694,12 @@ int virNetSocketNewConnectUNIX(const char *path, if ((lockfd = open(lockpath, O_RDWR | O_CREAT, 0600)) < 0 || virSetCloseExec(lockfd) < 0) { - virReportSystemError(errno, _("Unable to create lock '%s'"), lockpath); + virReportSystemError(errno, _("Unable to create lock '%1$s'"), lockpath); goto cleanup; } if (virFileLock(lockfd, false, 0, 1, true) < 0) { - virReportSystemError(errno, _("Unable to lock '%s'"), lockpath); + virReportSystemError(errno, _("Unable to lock '%1$s'"), lockpath); goto cleanup; } } @@ -711,7 +711,7 @@ int virNetSocketNewConnectUNIX(const char *path, remoteAddr.data.un.sun_family = AF_UNIX; if (virStrcpyStatic(remoteAddr.data.un.sun_path, path) < 0) { - virReportSystemError(ENOMEM, _("Path %s too long for unix socket"), path); + virReportSystemError(ENOMEM, _("Path %1$s too long for unix socket"), path); goto cleanup; } if (remoteAddr.data.un.sun_path[0] == '@') @@ -728,7 +728,7 @@ int virNetSocketNewConnectUNIX(const char *path, if (!spawnDaemonPath || retries == 0 || (errno != ENOENT && errno != ECONNREFUSED)) { - virReportSystemError(errno, _("Failed to connect socket to '%s'"), + virReportSystemError(errno, _("Failed to connect socket to '%1$s'"), path); goto cleanup; } @@ -924,7 +924,7 @@ virNetSocketNewConnectLibSSH2(const char *host, verify = VIR_NET_SSH_HOSTKEY_VERIFY_NORMAL; } else { virReportError(VIR_ERR_INVALID_ARG, - _("Invalid host key verification method: '%s'"), + _("Invalid host key verification method: '%1$s'"), knownHostsVerify); goto error; } @@ -955,7 +955,7 @@ virNetSocketNewConnectLibSSH2(const char *host, ret = virNetSSHSessionAuthAddAgentAuth(sess); } else { virReportError(VIR_ERR_INVALID_ARG, - _("Invalid authentication method: '%s'"), + _("Invalid authentication method: '%1$s'"), authMethod); ret = -1; goto error; @@ -1050,7 +1050,7 @@ virNetSocketNewConnectLibssh(const char *host, verify = VIR_NET_LIBSSH_HOSTKEY_VERIFY_NORMAL; } else { virReportError(VIR_ERR_INVALID_ARG, - _("Invalid host key verification method: '%s'"), + _("Invalid host key verification method: '%1$s'"), knownHostsVerify); goto error; } @@ -1080,7 +1080,7 @@ virNetSocketNewConnectLibssh(const char *host, ret = virNetLibsshSessionAuthAddAgentAuth(sess); } else { virReportError(VIR_ERR_INVALID_ARG, - _("Invalid authentication method: '%s'"), + _("Invalid authentication method: '%1$s'"), authMethod); ret = -1; goto error; @@ -1259,14 +1259,14 @@ virJSONValue *virNetSocketPreExecRestart(virNetSocket *sock) if (virSetInherit(sock->fd, true) < 0) { virReportSystemError(errno, - _("Cannot disable close-on-exec flag on socket %d"), + _("Cannot disable close-on-exec flag on socket %1$d"), sock->fd); goto error; } if (sock->errfd != -1 && virSetInherit(sock->errfd, true) < 0) { virReportSystemError(errno, - _("Cannot disable close-on-exec flag on pipe %d"), + _("Cannot disable close-on-exec flag on pipe %1$d"), sock->errfd); goto error; } @@ -1764,7 +1764,7 @@ static ssize_t virNetSocketReadWire(virNetSocket *sock, char *buf, size_t len) if (ret < 0) { if (errout) virReportSystemError(errno, - _("Cannot recv data: %s"), errout); + _("Cannot recv data: %1$s"), errout); else virReportSystemError(errno, "%s", _("Cannot recv data")); @@ -1778,7 +1778,7 @@ static ssize_t virNetSocketReadWire(virNetSocket *sock, char *buf, size_t len) } else { if (errout) virReportSystemError(EIO, - _("End of file while reading data: %s"), + _("End of file while reading data: %1$s"), errout); else virReportSystemError(EIO, "%s", @@ -1985,7 +1985,7 @@ int virNetSocketSendFD(virNetSocket *sock, int fd) ret = 0; else virReportSystemError(errno, - _("Failed to send file descriptor %d"), + _("Failed to send file descriptor %1$d"), fd); goto cleanup; } diff --git a/src/rpc/virnetsshsession.c b/src/rpc/virnetsshsession.c index a3dd60f5a3..7bf27c161a 100644 --- a/src/rpc/virnetsshsession.c +++ b/src/rpc/virnetsshsession.c @@ -286,7 +286,7 @@ virNetSSHCheckHostKey(virNetSSHSession *sess) if (!key) { libssh2_session_last_error(sess->session, &errmsg, NULL, 0); virReportError(VIR_ERR_SSH, - _("Failed to retrieve ssh host key: %s"), + _("Failed to retrieve ssh host key: %1$s"), errmsg); return -1; } @@ -346,7 +346,7 @@ virNetSSHCheckHostKey(virNetSSHSession *sess) keyhashstr = virBufferContentAndReset(&buff); askKey.type = VIR_CRED_ECHOPROMPT; - askKey.prompt = g_strdup_printf(_("Accept SSH host key with hash '%s' for " "host '%s:%d' (%s/%s)?"), + askKey.prompt = g_strdup_printf(_("Accept SSH host key with hash '%1$s' for host '%2$s:%3$d' (%4$s/%5$s)?"), keyhashstr, sess->hostname, sess->port, "y", "n"); if (sess->cred->cb(&askKey, 1, sess->cred->cbdata)) { @@ -365,7 +365,7 @@ virNetSSHCheckHostKey(virNetSSHSession *sess) if (!askKey.result || STRCASENEQ(askKey.result, "y")) { virReportError(VIR_ERR_SSH, - _("SSH host key for '%s' (%s) was not accepted"), + _("SSH host key for '%1$s' (%2$s) was not accepted"), sess->hostname, keyhashstr); VIR_FREE(keyhashstr); VIR_FREE(askKey.result); @@ -427,7 +427,7 @@ virNetSSHCheckHostKey(virNetSSHSession *sess) NULL) < 0) { libssh2_session_last_error(sess->session, &errmsg, NULL, 0); virReportError(VIR_ERR_SSH, - _("unable to add SSH host key for host '%s': %s"), + _("unable to add SSH host key for host '%1$s': %2$s"), hostnameStr, errmsg); VIR_FREE(hostnameStr); return -1; @@ -442,7 +442,7 @@ virNetSSHCheckHostKey(virNetSSHSession *sess) LIBSSH2_KNOWNHOST_FILE_OPENSSH) < 0) { libssh2_session_last_error(sess->session, &errmsg, NULL, 0); virReportError(VIR_ERR_SSH, - _("failed to write known_host file '%s': %s"), + _("failed to write known_host file '%1$s': %2$s"), sess->knownHostsFile, errmsg); return -1; @@ -458,10 +458,8 @@ virNetSSHCheckHostKey(virNetSSHSession *sess) case LIBSSH2_KNOWNHOST_CHECK_MISMATCH: /* host key verification failed */ virReportError(VIR_ERR_AUTH_FAILED, - _("!!! SSH HOST KEY VERIFICATION FAILED !!!: " - "Identity of host '%s:%d' differs from stored identity. " - "Please verify the new host key '%s' to avoid possible " - "man in the middle attack. The key is stored in '%s'."), + _("!!! SSH HOST KEY VERIFICATION FAILED !!!: Identity of host '%1$s:%2$d' differs from stored identity. " + "Please verify the new host key '%3$s' to avoid possible man in the middle attack. The key is stored in '%4$s'."), sess->hostname, sess->port, knownHostEntry->key, sess->knownHostsFile); return -1; @@ -469,7 +467,7 @@ virNetSSHCheckHostKey(virNetSSHSession *sess) case LIBSSH2_KNOWNHOST_CHECK_FAILURE: libssh2_session_last_error(sess->session, &errmsg, NULL, 0); virReportError(VIR_ERR_SSH, - _("failed to validate SSH host key: %s"), + _("failed to validate SSH host key: %1$s"), errmsg); return -1; @@ -525,7 +523,7 @@ virNetSSHAuthenticateAgent(virNetSSHSession *sess) VIR_WARNINGS_RESET libssh2_session_last_error(sess->session, &errmsg, NULL, 0); virReportError(VIR_ERR_AUTH_FAILED, - _("failed to authenticate using SSH agent: %s"), + _("failed to authenticate using SSH agent: %1$s"), errmsg); return -1; } @@ -549,7 +547,7 @@ virNetSSHAuthenticateAgent(virNetSSHSession *sess) libssh2_session_last_error(sess->session, &errmsg, NULL, 0); virReportError(VIR_ERR_AUTH_FAILED, - _("failed to authenticate using SSH agent: %s"), + _("failed to authenticate using SSH agent: %1$s"), errmsg); return -1; } @@ -586,8 +584,7 @@ virNetSSHAuthenticatePrivkey(virNetSSHSession *sess, VIR_WARNINGS_RESET libssh2_session_last_error(sess->session, &errmsg, NULL, 0); virReportError(VIR_ERR_AUTH_FAILED, - _("authentication with private key '%s' " - "has failed: %s"), + _("authentication with private key '%1$s' has failed: %2$s"), priv->filename, errmsg); return 1; /* auth failed */ } @@ -617,7 +614,7 @@ virNetSSHAuthenticatePrivkey(virNetSSHSession *sess, return -1; } - retr_passphrase.prompt = g_strdup_printf(_("Passphrase for key '%s'"), + retr_passphrase.prompt = g_strdup_printf(_("Passphrase for key '%1$s'"), priv->filename); if (sess->cred->cb(&retr_passphrase, 1, sess->cred->cbdata)) { @@ -643,8 +640,7 @@ virNetSSHAuthenticatePrivkey(virNetSSHSession *sess, if (ret < 0) { libssh2_session_last_error(sess->session, &errmsg, NULL, 0); virReportError(VIR_ERR_AUTH_FAILED, - _("authentication with private key '%s' " - "has failed: %s"), + _("authentication with private key '%1$s' has failed: %2$s"), priv->filename, errmsg); VIR_WARNINGS_NO_WLOGICALOP_EQUAL_EXPR @@ -709,7 +705,7 @@ virNetSSHAuthenticatePassword(virNetSSHSession *sess) /* error path */ libssh2_session_last_error(sess->session, &errmsg, NULL, 0); virReportError(VIR_ERR_AUTH_FAILED, - _("authentication failed: %s"), errmsg); + _("authentication failed: %1$s"), errmsg); /* determine exist status */ if (rc == LIBSSH2_ERROR_AUTHENTICATION_FAILED) @@ -781,14 +777,14 @@ virNetSSHAuthenticateKeyboardInteractive(virNetSSHSession *sess, if (ret < 0) { libssh2_session_last_error(sess->session, &errmsg, NULL, 0); virReportError(VIR_ERR_AUTH_FAILED, - _("keyboard interactive authentication failed: %s"), + _("keyboard interactive authentication failed: %1$s"), errmsg); return -1; } } libssh2_session_last_error(sess->session, &errmsg, NULL, 0); virReportError(VIR_ERR_AUTH_FAILED, - _("keyboard interactive authentication failed: %s"), + _("keyboard interactive authentication failed: %1$s"), errmsg); return 1; } @@ -824,7 +820,7 @@ virNetSSHAuthenticate(virNetSSHSession *sess) libssh2_session_last_error(sess->session, &errmsg, NULL, 0); virReportError(VIR_ERR_SSH, - _("couldn't retrieve authentication methods list: %s"), + _("couldn't retrieve authentication methods list: %1$s"), errmsg); return -1; } @@ -895,7 +891,7 @@ virNetSSHOpenChannel(virNetSSHSession *sess) if (!sess->channel) { libssh2_session_last_error(sess->session, &errmsg, NULL, 0); virReportError(VIR_ERR_SSH, - _("failed to open ssh channel: %s"), + _("failed to open ssh channel: %1$s"), errmsg); return -1; } @@ -903,7 +899,7 @@ virNetSSHOpenChannel(virNetSSHSession *sess) if (libssh2_channel_exec(sess->channel, sess->channelCommand) != 0) { libssh2_session_last_error(sess->session, &errmsg, NULL, 0); virReportError(VIR_ERR_SSH, - _("failed to execute command '%s': %s"), + _("failed to execute command '%1$s': %2$s"), sess->channelCommand, errmsg); return -1; @@ -1080,13 +1076,13 @@ virNetSSHSessionSetHostKeyVerification(virNetSSHSession *sess, LIBSSH2_KNOWNHOST_FILE_OPENSSH) < 0) { libssh2_session_last_error(sess->session, &errmsg, NULL, 0); virReportError(VIR_ERR_SSH, - _("unable to load knownhosts file '%s': %s"), + _("unable to load knownhosts file '%1$s': %2$s"), hostsfile, errmsg); goto error; } } else if (!(flags & VIR_NET_SSH_HOSTKEY_FILE_CREATE)) { virReportError(VIR_ERR_SSH, - _("known hosts file '%s' does not exist"), + _("known hosts file '%1$s' does not exist"), hostsfile); goto error; } @@ -1186,7 +1182,7 @@ virNetSSHSessionConnect(virNetSSHSession *sess, if (ret < 0) { libssh2_session_last_error(sess->session, &errmsg, NULL, 0); virReportError(VIR_ERR_NO_CONNECT, - _("SSH session handshake failed: %s"), + _("SSH session handshake failed: %1$s"), errmsg); goto error; } @@ -1231,8 +1227,7 @@ virNetSSHChannelRead(virNetSSHSession *sess, if (sess->state != VIR_NET_SSH_STATE_HANDSHAKE_COMPLETE) { if (sess->state == VIR_NET_SSH_STATE_ERROR_REMOTE) virReportError(VIR_ERR_SSH, - _("Remote program terminated " - "with non-zero code: %d"), + _("Remote program terminated with non-zero code: %1$d"), sess->channelCommandReturnValue); else virReportError(VIR_ERR_SSH, "%s", @@ -1307,7 +1302,7 @@ virNetSSHChannelRead(virNetSSHSession *sess, if (libssh2_channel_eof(sess->channel)) { if (libssh2_channel_get_exit_status(sess->channel)) { virReportError(VIR_ERR_SSH, - _("Remote command terminated with non-zero code: %d"), + _("Remote command terminated with non-zero code: %1$d"), libssh2_channel_get_exit_status(sess->channel)); sess->channelCommandReturnValue = libssh2_channel_get_exit_status(sess->channel); sess->state = VIR_NET_SSH_STATE_ERROR_REMOTE; @@ -1342,7 +1337,7 @@ virNetSSHChannelWrite(virNetSSHSession *sess, if (sess->state != VIR_NET_SSH_STATE_HANDSHAKE_COMPLETE) { if (sess->state == VIR_NET_SSH_STATE_ERROR_REMOTE) virReportError(VIR_ERR_SSH, - _("Remote program terminated with non-zero code: %d"), + _("Remote program terminated with non-zero code: %1$d"), sess->channelCommandReturnValue); else virReportError(VIR_ERR_SSH, "%s", @@ -1354,7 +1349,7 @@ virNetSSHChannelWrite(virNetSSHSession *sess, if (libssh2_channel_eof(sess->channel)) { if (libssh2_channel_get_exit_status(sess->channel)) { virReportError(VIR_ERR_SSH, - _("Remote program terminated with non-zero code: %d"), + _("Remote program terminated with non-zero code: %1$d"), libssh2_channel_get_exit_status(sess->channel)); sess->state = VIR_NET_SSH_STATE_ERROR_REMOTE; sess->channelCommandReturnValue = libssh2_channel_get_exit_status(sess->channel); @@ -1379,7 +1374,7 @@ virNetSSHChannelWrite(virNetSSHSession *sess, sess->state = VIR_NET_SSH_STATE_ERROR; libssh2_session_last_error(sess->session, &msg, NULL, 0); virReportError(VIR_ERR_SSH, - _("write failed: %s"), msg); + _("write failed: %1$s"), msg); } cleanup: diff --git a/src/rpc/virnettlscontext.c b/src/rpc/virnettlscontext.c index cfd26f0701..f72597ee80 100644 --- a/src/rpc/virnettlscontext.c +++ b/src/rpc/virnettlscontext.c @@ -103,7 +103,7 @@ virNetTLSContextCheckCertFile(const char *type, const char *file, bool allowMiss return 1; virReportSystemError(errno, - _("Cannot read %s '%s'"), + _("Cannot read %1$s '%2$s'"), type, file); return -1; } @@ -134,10 +134,10 @@ static int virNetTLSContextCheckCertTimes(gnutls_x509_crt_t cert, if (gnutls_x509_crt_get_expiration_time(cert) < now) { virReportError(VIR_ERR_SYSTEM_ERROR, (isCA ? - _("The CA certificate %s has expired") : + _("The CA certificate %1$s has expired") : (isServer ? - _("The server certificate %s has expired") : - _("The client certificate %s has expired"))), + _("The server certificate %1$s has expired") : + _("The client certificate %1$s has expired"))), certFile); return -1; } @@ -145,10 +145,10 @@ static int virNetTLSContextCheckCertTimes(gnutls_x509_crt_t cert, if (gnutls_x509_crt_get_activation_time(cert) > now) { virReportError(VIR_ERR_SYSTEM_ERROR, (isCA ? - _("The CA certificate %s is not yet active") : + _("The CA certificate %1$s is not yet active") : (isServer ? - _("The server certificate %s is not yet active") : - _("The client certificate %s is not yet active"))), + _("The server certificate %1$s is not yet active") : + _("The client certificate %1$s is not yet active"))), certFile); return -1; } @@ -170,28 +170,28 @@ static int virNetTLSContextCheckCertBasicConstraints(gnutls_x509_crt_t cert, if (status > 0) { /* It is a CA cert */ if (!isCA) { virReportError(VIR_ERR_SYSTEM_ERROR, isServer ? - _("The certificate %s basic constraints show a CA, but we need one for a server") : - _("The certificate %s basic constraints show a CA, but we need one for a client"), + _("The certificate %1$s basic constraints show a CA, but we need one for a server") : + _("The certificate %1$s basic constraints show a CA, but we need one for a client"), certFile); return -1; } } else if (status == 0) { /* It is not a CA cert */ if (isCA) { virReportError(VIR_ERR_SYSTEM_ERROR, - _("The certificate %s basic constraints do not show a CA"), + _("The certificate %1$s basic constraints do not show a CA"), certFile); return -1; } } else if (status == GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE) { /* Missing basicConstraints */ if (isCA) { virReportError(VIR_ERR_SYSTEM_ERROR, - _("The certificate %s is missing basic constraints for a CA"), + _("The certificate %1$s is missing basic constraints for a CA"), certFile); return -1; } } else { /* General error */ virReportError(VIR_ERR_SYSTEM_ERROR, - _("Unable to query certificate %s basic constraints %s"), + _("Unable to query certificate %1$s basic constraints %2$s"), certFile, gnutls_strerror(status)); return -1; } @@ -217,7 +217,7 @@ static int virNetTLSContextCheckCertKeyUsage(gnutls_x509_crt_t cert, GNUTLS_KEY_DIGITAL_SIGNATURE|GNUTLS_KEY_KEY_ENCIPHERMENT; } else { virReportError(VIR_ERR_SYSTEM_ERROR, - _("Unable to query certificate %s key usage %s"), + _("Unable to query certificate %1$s key usage %2$s"), certFile, gnutls_strerror(status)); return -1; } @@ -227,7 +227,7 @@ static int virNetTLSContextCheckCertKeyUsage(gnutls_x509_crt_t cert, if (!(usage & GNUTLS_KEY_KEY_CERT_SIGN)) { if (critical) { virReportError(VIR_ERR_SYSTEM_ERROR, - _("Certificate %s usage does not permit certificate signing"), + _("Certificate %1$s usage does not permit certificate signing"), certFile); return -1; } else { @@ -239,7 +239,7 @@ static int virNetTLSContextCheckCertKeyUsage(gnutls_x509_crt_t cert, if (!(usage & GNUTLS_KEY_DIGITAL_SIGNATURE)) { if (critical) { virReportError(VIR_ERR_SYSTEM_ERROR, - _("Certificate %s usage does not permit digital signature"), + _("Certificate %1$s usage does not permit digital signature"), certFile); return -1; } else { @@ -250,7 +250,7 @@ static int virNetTLSContextCheckCertKeyUsage(gnutls_x509_crt_t cert, if (!(usage & GNUTLS_KEY_KEY_ENCIPHERMENT)) { if (critical) { virReportError(VIR_ERR_SYSTEM_ERROR, - _("Certificate %s usage does not permit key encipherment"), + _("Certificate %1$s usage does not permit key encipherment"), certFile); return -1; } else { @@ -291,7 +291,7 @@ static int virNetTLSContextCheckCertKeyPurpose(gnutls_x509_crt_t cert, } if (status != GNUTLS_E_SHORT_MEMORY_BUFFER) { virReportError(VIR_ERR_SYSTEM_ERROR, - _("Unable to query certificate %s key purpose %s"), + _("Unable to query certificate %1$s key purpose %2$s"), certFile, gnutls_strerror(status)); return -1; } @@ -301,7 +301,7 @@ static int virNetTLSContextCheckCertKeyPurpose(gnutls_x509_crt_t cert, if (status < 0) { VIR_FREE(buffer); virReportError(VIR_ERR_SYSTEM_ERROR, - _("Unable to query certificate %s key purpose %s"), + _("Unable to query certificate %1$s key purpose %2$s"), certFile, gnutls_strerror(status)); return -1; } @@ -324,7 +324,7 @@ static int virNetTLSContextCheckCertKeyPurpose(gnutls_x509_crt_t cert, if (!allowServer) { if (critical) { virReportError(VIR_ERR_SYSTEM_ERROR, - _("Certificate %s purpose does not allow use for with a TLS server"), + _("Certificate %1$s purpose does not allow use for with a TLS server"), certFile); return -1; } else { @@ -336,7 +336,7 @@ static int virNetTLSContextCheckCertKeyPurpose(gnutls_x509_crt_t cert, if (!allowClient) { if (critical) { virReportError(VIR_ERR_SYSTEM_ERROR, - _("Certificate %s purpose does not allow use for with a TLS client"), + _("Certificate %1$s purpose does not allow use for with a TLS client"), certFile); return -1; } else { @@ -389,7 +389,7 @@ virNetTLSContextCheckCertDN(gnutls_x509_crt_t cert, if (hostname && !gnutls_x509_crt_check_hostname(cert, hostname)) { virReportError(VIR_ERR_RPC, - _("Certificate %s owner does not match the hostname %s"), + _("Certificate %1$s owner does not match the hostname %2$s"), certFile, hostname); return -1; } @@ -438,8 +438,8 @@ static int virNetTLSContextCheckCertPair(gnutls_x509_crt_t cert, NULL, 0, 0, &status) < 0) { virReportError(VIR_ERR_SYSTEM_ERROR, isServer ? - _("Unable to verify server certificate %s against CA certificate %s") : - _("Unable to verify client certificate %s against CA certificate %s"), + _("Unable to verify server certificate %1$s against CA certificate %2$s") : + _("Unable to verify client certificate %1$s against CA certificate %2$s"), certFile, cacertFile); return -1; } @@ -460,7 +460,7 @@ static int virNetTLSContextCheckCertPair(gnutls_x509_crt_t cert, reason = _("The certificate uses an insecure algorithm"); virReportError(VIR_ERR_SYSTEM_ERROR, - _("Our own certificate %s failed validation against %s: %s"), + _("Our own certificate %1$s failed validation against %2$s: %3$s"), certFile, cacertFile, reason); return -1; } @@ -494,8 +494,8 @@ static gnutls_x509_crt_t virNetTLSContextLoadCertFromFile(const char *certFile, if (gnutls_x509_crt_import(cert, &data, GNUTLS_X509_FMT_PEM) < 0) { virReportError(VIR_ERR_SYSTEM_ERROR, isServer ? - _("Unable to import server certificate %s") : - _("Unable to import client certificate %s"), + _("Unable to import server certificate %1$s") : + _("Unable to import client certificate %1$s"), certFile); goto cleanup; } @@ -529,7 +529,7 @@ static int virNetTLSContextLoadCACertListFromFile(const char *certFile, if (gnutls_x509_crt_list_import(certs, &certMax, &data, GNUTLS_X509_FMT_PEM, 0) < 0) { virReportError(VIR_ERR_SYSTEM_ERROR, - _("Unable to import CA certificate list %s"), + _("Unable to import CA certificate list %1$s"), certFile); return -1; } @@ -602,7 +602,7 @@ static int virNetTLSContextLoadCredentials(virNetTLSContext *ctxt, GNUTLS_X509_FMT_PEM); if (err < 0) { virReportError(VIR_ERR_SYSTEM_ERROR, - _("Unable to set x509 CA certificate: %s: %s"), + _("Unable to set x509 CA certificate: %1$s: %2$s"), cacert, gnutls_strerror(err)); return -1; } @@ -620,7 +620,7 @@ static int virNetTLSContextLoadCredentials(virNetTLSContext *ctxt, GNUTLS_X509_FMT_PEM); if (err < 0) { virReportError(VIR_ERR_SYSTEM_ERROR, - _("Unable to set x509 certificate revocation list: %s: %s"), + _("Unable to set x509 certificate revocation list: %1$s: %2$s"), cacrl, gnutls_strerror(err)); return -1; } @@ -645,7 +645,7 @@ static int virNetTLSContextLoadCredentials(virNetTLSContext *ctxt, GNUTLS_X509_FMT_PEM); if (err < 0) { virReportError(VIR_ERR_SYSTEM_ERROR, - _("Unable to set x509 key and certificate: %s, %s: %s"), + _("Unable to set x509 key and certificate: %1$s, %2$s: %3$s"), key, cert, gnutls_strerror(err)); return -1; } @@ -690,7 +690,7 @@ static virNetTLSContext *virNetTLSContextNew(const char *cacert, ctxt->x509cred = NULL; virReportError(VIR_ERR_SYSTEM_ERROR, - _("Unable to allocate x509 credentials: %s"), + _("Unable to allocate x509 credentials: %1$s"), gnutls_strerror(err)); goto error; } @@ -896,7 +896,7 @@ int virNetTLSContextReloadForServer(virNetTLSContext *ctxt, err = gnutls_certificate_allocate_credentials(&ctxt->x509cred); if (err) { virReportError(VIR_ERR_SYSTEM_ERROR, - _("Unable to allocate x509 credentials: %s"), + _("Unable to allocate x509 credentials: %1$s"), gnutls_strerror(err)); goto error; } @@ -946,7 +946,7 @@ static int virNetTLSContextValidCertificate(virNetTLSContext *ctxt, if ((ret = gnutls_certificate_verify_peers2(sess->session, &status)) < 0) { virReportError(VIR_ERR_SYSTEM_ERROR, - _("Unable to verify TLS peer: %s"), + _("Unable to verify TLS peer: %1$s"), gnutls_strerror(ret)); goto authdeny; } @@ -967,7 +967,7 @@ static int virNetTLSContextValidCertificate(virNetTLSContext *ctxt, reason = _("The certificate uses an insecure algorithm"); virReportError(VIR_ERR_SYSTEM_ERROR, - _("Certificate failed validation: %s"), + _("Certificate failed validation: %1$s"), reason); goto authdeny; } @@ -1016,7 +1016,7 @@ static int virNetTLSContextValidCertificate(virNetTLSContext *ctxt, } if (ret != 0) { virReportError(VIR_ERR_SYSTEM_ERROR, - _("Failed to get certificate %s distinguished name: %s"), + _("Failed to get certificate %1$s distinguished name: %2$s"), "[session]", gnutls_strerror(ret)); goto authfail; } @@ -1160,7 +1160,7 @@ virNetTLSSession *virNetTLSSessionNew(virNetTLSContext *ctxt, if ((err = gnutls_init(&sess->session, ctxt->isServer ? GNUTLS_SERVER : GNUTLS_CLIENT)) != 0) { virReportError(VIR_ERR_SYSTEM_ERROR, - _("Failed to initialize TLS session: %s"), + _("Failed to initialize TLS session: %1$s"), gnutls_strerror(err)); goto error; } @@ -1174,7 +1174,7 @@ virNetTLSSession *virNetTLSSessionNew(virNetTLSContext *ctxt, priority, NULL)) != 0) { virReportError(VIR_ERR_SYSTEM_ERROR, - _("Failed to set TLS session priority to %s: %s"), + _("Failed to set TLS session priority to %1$s: %2$s"), priority, gnutls_strerror(err)); goto error; } @@ -1183,7 +1183,7 @@ virNetTLSSession *virNetTLSSessionNew(virNetTLSContext *ctxt, GNUTLS_CRD_CERTIFICATE, ctxt->x509cred)) != 0) { virReportError(VIR_ERR_SYSTEM_ERROR, - _("Failed set TLS x509 credentials: %s"), + _("Failed set TLS x509 credentials: %1$s"), gnutls_strerror(err)); goto error; } @@ -1313,7 +1313,7 @@ int virNetTLSSessionHandshake(virNetTLSSession *sess) #endif virReportError(VIR_ERR_AUTH_FAILED, - _("TLS handshake failed %s"), + _("TLS handshake failed %1$s"), gnutls_strerror(ret)); ret = -1; -- 2.39.2

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com&gt; --- src/secret/secret_driver.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/secret/secret_driver.c b/src/secret/secret_driver.c index 43d2a0c05a..c7bd65b4e9 100644 --- a/src/secret/secret_driver.c +++ b/src/secret/secret_driver.c @@ -83,7 +83,7 @@ secretObjFromSecret(virSecretPtr secret) virUUIDFormat(secret->uuid, uuidstr); if (!(obj = virSecretObjListFindByUUID(driver->secrets, uuidstr))) { virReportError(VIR_ERR_NO_SECRET, - _("no secret with matching uuid '%s'"), uuidstr); + _("no secret with matching uuid '%1$s'"), uuidstr); return NULL; } return obj; @@ -164,7 +164,7 @@ secretLookupByUUID(virConnectPtr conn, virUUIDFormat(uuid, uuidstr); if (!(obj = virSecretObjListFindByUUID(driver->secrets, uuidstr))) { virReportError(VIR_ERR_NO_SECRET, - _("no secret with matching uuid '%s'"), uuidstr); + _("no secret with matching uuid '%1$s'"), uuidstr); goto cleanup; } @@ -195,7 +195,7 @@ secretLookupByUsage(virConnectPtr conn, if (!(obj = virSecretObjListFindByUsage(driver->secrets, usageType, usageID))) { virReportError(VIR_ERR_NO_SECRET, - _("no secret with matching usage '%s'"), usageID); + _("no secret with matching usage '%1$s'"), usageID); goto cleanup; } @@ -524,13 +524,13 @@ secretStateInitialize(bool privileged, } if (g_mkdir_with_parents(driver->configDir, S_IRWXU) < 0) { - virReportSystemError(errno, _("cannot create config directory '%s'"), + virReportSystemError(errno, _("cannot create config directory '%1$s'"), driver->configDir); goto error; } 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; } @@ -594,8 +594,7 @@ secretConnectOpen(virConnectPtr conn, if (STRNEQ(root, driver->embeddedRoot)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Cannot open embedded driver at path '%s', " - "already open with path '%s'"), + _("Cannot open embedded driver at path '%1$s', already open with path '%2$s'"), root, driver->embeddedRoot); return VIR_DRV_OPEN_ERROR; } -- 2.39.2

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com&gt; --- src/storage_file/storage_file_backend.c | 8 ++-- src/storage_file/storage_file_backend_fs.c | 6 +-- .../storage_file_backend_gluster.c | 16 +++---- src/storage_file/storage_file_probe.c | 13 +++-- src/storage_file/storage_source.c | 36 +++++++------- .../storage_source_backingstore.c | 47 +++++++++---------- 6 files changed, 59 insertions(+), 67 deletions(-) diff --git a/src/storage_file/storage_file_backend.c b/src/storage_file/storage_file_backend.c index 94944ea356..03583803de 100644 --- a/src/storage_file/storage_file_backend.c +++ b/src/storage_file/storage_file_backend.c @@ -90,8 +90,7 @@ virStorageFileBackendRegister(virStorageFileBackend *backend) if (virStorageFileBackendsCount >= VIR_STORAGE_BACKENDS_MAX) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Too many drivers, cannot register storage file " - "backend '%s'"), + _("Too many drivers, cannot register storage file backend '%1$s'"), virStorageTypeToString(backend->type)); return -1; } @@ -130,12 +129,11 @@ virStorageFileBackendForType(int type, if (type == VIR_STORAGE_TYPE_NETWORK) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("missing storage backend for network files " - "using %s protocol"), + _("missing storage backend for network files using %1$s protocol"), virStorageNetProtocolTypeToString(protocol)); } else { virReportError(VIR_ERR_INTERNAL_ERROR, - _("missing storage backend for '%s' storage"), + _("missing storage backend for '%1$s' storage"), virStorageTypeToString(type)); } diff --git a/src/storage_file/storage_file_backend_fs.c b/src/storage_file/storage_file_backend_fs.c index c657cb0277..1de822200d 100644 --- a/src/storage_file/storage_file_backend_fs.c +++ b/src/storage_file/storage_file_backend_fs.c @@ -102,20 +102,20 @@ virStorageFileBackendFileRead(virStorageSource *src, if ((fd = virFileOpenAs(src->path, O_RDONLY, 0, drv->uid, drv->gid, 0)) < 0) { - virReportSystemError(-fd, _("Failed to open file '%s'"), + virReportSystemError(-fd, _("Failed to open file '%1$s'"), src->path); return -1; } if (offset > 0) { if (lseek(fd, offset, SEEK_SET) == (off_t) -1) { - virReportSystemError(errno, _("cannot seek into '%s'"), src->path); + virReportSystemError(errno, _("cannot seek into '%1$s'"), src->path); return -1; } } if ((ret = virFileReadHeaderFD(fd, len, buf)) < 0) { - virReportSystemError(errno, _("cannot read header '%s'"), src->path); + virReportSystemError(errno, _("cannot read header '%1$s'"), src->path); return -1; } diff --git a/src/storage_file/storage_file_backend_gluster.c b/src/storage_file/storage_file_backend_gluster.c index 72341cf2c5..d018d5422e 100644 --- a/src/storage_file/storage_file_backend_gluster.c +++ b/src/storage_file/storage_file_backend_gluster.c @@ -83,7 +83,7 @@ virStorageFileBackendGlusterInitServer(virStorageFileBackendGlusterPriv *priv, if (glfs_set_volfile_server(priv->vol, transport, hoststr, port) < 0) { virReportSystemError(errno, - _("failed to set gluster volfile server '%s'"), + _("failed to set gluster volfile server '%1$s'"), hoststr); return -1; } @@ -101,7 +101,7 @@ virStorageFileBackendGlusterInit(virStorageSource *src) if (!src->volume) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("missing gluster volume name for path '%s'"), + _("missing gluster volume name for path '%1$s'"), src->path); return -1; } @@ -115,7 +115,7 @@ virStorageFileBackendGlusterInit(virStorageSource *src) if (!(priv->vol = glfs_new(src->volume))) { virReportError(VIR_ERR_OPERATION_FAILED, - _("failed to create glfs object for '%s'"), src->volume); + _("failed to create glfs object for '%1$s'"), src->volume); goto error; } @@ -126,8 +126,8 @@ virStorageFileBackendGlusterInit(virStorageSource *src) if (glfs_init(priv->vol) < 0) { virReportSystemError(errno, - _("failed to initialize gluster connection " - "(src=%p priv=%p)"), src, priv); + _("failed to initialize gluster connection (src=%1$p priv=%2$p)"), + src, priv); goto error; } @@ -197,14 +197,14 @@ virStorageFileBackendGlusterRead(virStorageSource *src, *buf = NULL; if (!(fd = glfs_open(priv->vol, src->path, O_RDONLY))) { - virReportSystemError(errno, _("Failed to open file '%s'"), + virReportSystemError(errno, _("Failed to open file '%1$s'"), src->path); return -1; } if (offset > 0) { if (glfs_lseek(fd, offset, SEEK_SET) == (off_t) -1) { - virReportSystemError(errno, _("cannot seek into '%s'"), src->path); + virReportSystemError(errno, _("cannot seek into '%1$s'"), src->path); goto cleanup; } } @@ -219,7 +219,7 @@ virStorageFileBackendGlusterRead(virStorageSource *src, continue; if (r < 0) { VIR_FREE(*buf); - virReportSystemError(errno, _("unable to read '%s'"), src->path); + virReportSystemError(errno, _("unable to read '%1$s'"), src->path); return r; } if (r == 0) diff --git a/src/storage_file/storage_file_probe.c b/src/storage_file/storage_file_probe.c index 9465af5d96..a96d01ecc7 100644 --- a/src/storage_file/storage_file_probe.c +++ b/src/storage_file/storage_file_probe.c @@ -900,7 +900,7 @@ virStorageFileProbeGetMetadata(virStorageSource *meta, if (meta->format <= VIR_STORAGE_FILE_NONE || meta->format >= VIR_STORAGE_FILE_LAST) { - virReportSystemError(EINVAL, _("unknown storage file meta->format %d"), + virReportSystemError(EINVAL, _("unknown storage file meta->format %1$d"), meta->format); return -1; } @@ -916,8 +916,7 @@ virStorageFileProbeGetMetadata(virStorageSource *meta, } else { if (meta->encryption->format != expt_fmt) { virReportError(VIR_ERR_XML_ERROR, - _("encryption format %d doesn't match " - "expected format %d"), + _("encryption format %1$d doesn't match expected format %2$d"), meta->encryption->format, expt_fmt); return -1; } @@ -1004,12 +1003,12 @@ virStorageFileProbeFormat(const char *path, uid_t uid, gid_t gid) g_autofree char *header = NULL; if ((fd = virFileOpenAs(path, O_RDONLY, 0, uid, gid, 0)) < 0) { - virReportSystemError(-fd, _("Failed to open file '%s'"), path); + virReportSystemError(-fd, _("Failed to open file '%1$s'"), path); return -1; } if (fstat(fd, &sb) < 0) { - virReportSystemError(errno, _("cannot stat file '%s'"), path); + virReportSystemError(errno, _("cannot stat file '%1$s'"), path); return -1; } @@ -1018,12 +1017,12 @@ virStorageFileProbeFormat(const char *path, uid_t uid, gid_t gid) return VIR_STORAGE_FILE_DIR; if (lseek(fd, 0, SEEK_SET) == (off_t)-1) { - virReportSystemError(errno, _("cannot set to start of '%s'"), path); + virReportSystemError(errno, _("cannot set to start of '%1$s'"), path); return -1; } if ((len = virFileReadHeaderFD(fd, len, &header)) < 0) { - virReportSystemError(errno, _("cannot read header '%s'"), path); + virReportSystemError(errno, _("cannot read header '%1$s'"), path); return -1; } diff --git a/src/storage_file/storage_source.c b/src/storage_file/storage_source.c index 0846c400c8..47fc1edbd2 100644 --- a/src/storage_file/storage_source.c +++ b/src/storage_file/storage_source.c @@ -159,7 +159,7 @@ virStorageSourceGetMetadataFromFD(const char *path, if (fstat(fd, &sb) < 0) { virReportSystemError(errno, - _("cannot stat file '%s'"), path); + _("cannot stat file '%1$s'"), path); return NULL; } @@ -175,12 +175,12 @@ virStorageSourceGetMetadataFromFD(const char *path, } if (lseek(fd, 0, SEEK_SET) == (off_t)-1) { - virReportSystemError(errno, _("cannot seek to start of '%s'"), meta->path); + virReportSystemError(errno, _("cannot seek to start of '%1$s'"), meta->path); return NULL; } if ((len = virFileReadHeaderFD(fd, len, &buf)) < 0) { - virReportSystemError(errno, _("cannot read header '%s'"), meta->path); + virReportSystemError(errno, _("cannot read header '%1$s'"), meta->path); return NULL; } @@ -243,7 +243,7 @@ virStorageSourceChainLookup(virStorageSource *chain, idx != 0 && STRNEQ(diskTarget, target)) { virReportError(VIR_ERR_INVALID_ARG, - _("requested target '%s' does not match target '%s'"), + _("requested target '%1$s' does not match target '%2$s'"), target, diskTarget); return NULL; } @@ -301,20 +301,20 @@ virStorageSourceChainLookup(virStorageSource *chain, error: if (idx) { virReportError(VIR_ERR_INVALID_ARG, - _("could not find backing store index '%u' in chain for '%s'"), + _("could not find backing store index '%1$u' in chain for '%2$s'"), idx, NULLSTR(start)); } else if (name) { if (startFrom) virReportError(VIR_ERR_INVALID_ARG, - _("could not find image '%s' beneath '%s' in chain for '%s'"), + _("could not find image '%1$s' beneath '%2$s' in chain for '%3$s'"), name, NULLSTR(startFrom->path), NULLSTR(start)); else virReportError(VIR_ERR_INVALID_ARG, - _("could not find image '%s' in chain for '%s'"), + _("could not find image '%1$s' in chain for '%2$s'"), name, NULLSTR(start)); } else { virReportError(VIR_ERR_INVALID_ARG, - _("could not find base image in chain for '%s'"), + _("could not find base image in chain for '%1$s'"), NULLSTR(start)); } *parent = NULL; @@ -645,7 +645,7 @@ virStorageSourceUpdateBackingSizes(virStorageSource *src, */ if ((end = lseek(fd, 0, SEEK_END)) == (off_t)-1) { virReportSystemError(errno, - _("failed to seek to end of %s"), src->path); + _("failed to seek to end of %1$s"), src->path); return -1; } src->physical = end; @@ -679,7 +679,7 @@ virStorageSourceUpdateCapacity(virStorageSource *src, * physical size. */ if (format == VIR_STORAGE_FILE_NONE) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("no disk format for %s was specified"), + _("no disk format for %1$s was specified"), src->path); return -1; } @@ -1269,24 +1269,21 @@ virStorageSourceReportBrokenChain(int errcode, if (src == parent) { virReportSystemError(errcode, - _("Cannot access storage file '%s' " - "(as uid:%u, gid:%u)"), + _("Cannot access storage file '%1$s' (as uid:%2$u, gid:%3$u)"), src->path, access_user, access_group); } else { virReportSystemError(errcode, - _("Cannot access backing file '%s' " - "of storage file '%s' (as uid:%u, gid:%u)"), + _("Cannot access backing file '%1$s' of storage file '%2$s' (as uid:%3$u, gid:%4$u)"), src->path, parent->path, access_user, access_group); } } else { if (src == parent) { virReportSystemError(errcode, - _("Cannot access storage file '%s'"), + _("Cannot access storage file '%1$s'"), src->path); } else { virReportSystemError(errcode, - _("Cannot access backing file '%s' " - "of storage file '%s'"), + _("Cannot access backing file '%1$s' of storage file '%2$s'"), src->path, parent->path); } } @@ -1360,7 +1357,7 @@ virStorageSourceGetMetadataRecurse(virStorageSource *src, if (depth > max_depth) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("backing store for %s is self-referential or too deeply nested"), + _("backing store for %1$s is self-referential or too deeply nested"), NULLSTR(src->path)); return -1; } @@ -1411,8 +1408,7 @@ virStorageSourceGetMetadataRecurse(virStorageSource *src, if (rv == -2) { virReportError(VIR_ERR_OPERATION_INVALID, - _("format of backing image '%s' of image '%s' was not specified in the image metadata " - "(See https://libvirt.org/kbase/backing_chains.html for troubleshooting)"), + _("format of backing image '%1$s' of image '%2$s' was not specified in the image metadata (See https://libvirt.org/kbase/backing_chains.html for troubleshooting)"), src->backingStoreRaw, NULLSTR(src->path)); } diff --git a/src/storage_file/storage_source_backingstore.c b/src/storage_file/storage_source_backingstore.c index e48ae725ab..a4ee2a5d78 100644 --- a/src/storage_file/storage_source_backingstore.c +++ b/src/storage_file/storage_source_backingstore.c @@ -46,7 +46,7 @@ virStorageSourceParseBackingURI(virStorageSource *src, if (!(uri = virURIParse(uristr))) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("failed to parse backing file location '%s'"), + _("failed to parse backing file location '%1$s'"), uristr); return -1; } @@ -60,7 +60,7 @@ virStorageSourceParseBackingURI(virStorageSource *src, if (!scheme[0] || (src->protocol = virStorageNetProtocolTypeFromString(scheme[0])) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("invalid backing protocol '%s'"), + _("invalid backing protocol '%1$s'"), NULLSTR(scheme[0])); return -1; } @@ -68,7 +68,7 @@ virStorageSourceParseBackingURI(virStorageSource *src, if (scheme[1] && (src->hosts->transport = virStorageNetHostTransportTypeFromString(scheme[1])) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("invalid protocol transport type '%s'"), + _("invalid protocol transport type '%1$s'"), scheme[1]); return -1; } @@ -114,8 +114,8 @@ virStorageSourceParseBackingURI(virStorageSource *src, if (!(tmp = strchr(src->path, '/')) || tmp == src->path) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("missing volume name or file name in " - "gluster source path '%s'"), src->path); + _("missing volume name or file name in gluster source path '%1$s'"), + src->path); return -1; } @@ -238,7 +238,7 @@ virStorageSourceParseRBDColonString(const char *rbdstr, /* formulate authdef for src->auth */ if (src->auth) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("duplicate 'id' found in '%s'"), src->path); + _("duplicate 'id' found in '%1$s'"), src->path); return -1; } @@ -357,7 +357,7 @@ virStorageSourceParseNBDColonString(const char *nbdstr, malformed: virReportError(VIR_ERR_INTERNAL_ERROR, - _("malformed nbd string '%s'"), nbdstr); + _("malformed nbd string '%1$s'"), nbdstr); return -1; } @@ -371,7 +371,7 @@ virStorageSourceParseBackingColon(virStorageSource *src, if (!(p = strchr(path, ':'))) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("invalid backing protocol string '%s'"), + _("invalid backing protocol string '%1$s'"), path); return -1; } @@ -380,7 +380,7 @@ virStorageSourceParseBackingColon(virStorageSource *src, if ((src->protocol = virStorageNetProtocolTypeFromString(protocol)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("invalid backing protocol '%s'"), + _("invalid backing protocol '%1$s'"), protocol); return -1; } @@ -400,7 +400,7 @@ virStorageSourceParseBackingColon(virStorageSource *src, case VIR_STORAGE_NET_PROTOCOL_LAST: case VIR_STORAGE_NET_PROTOCOL_NONE: virReportError(VIR_ERR_INTERNAL_ERROR, - _("backing store parser is not implemented for protocol %s"), + _("backing store parser is not implemented for protocol %1$s"), protocol); return -1; @@ -415,7 +415,7 @@ virStorageSourceParseBackingColon(virStorageSource *src, case VIR_STORAGE_NET_PROTOCOL_VXHS: case VIR_STORAGE_NET_PROTOCOL_NFS: virReportError(VIR_ERR_INTERNAL_ERROR, - _("malformed backing store path for protocol %s"), + _("malformed backing store path for protocol %1$s"), protocol); return -1; } @@ -465,8 +465,7 @@ virStorageSourceParseBackingJSONUriStr(virStorageSource *src, if (src->protocol != protocol) { virReportError(VIR_ERR_INVALID_ARG, - _("expected protocol '%s' but got '%s' in URI JSON volume " - "definition"), + _("expected protocol '%1$s' but got '%2$s' in URI JSON volume definition"), virStorageNetProtocolTypeToString(protocol), virStorageNetProtocolTypeToString(src->protocol)); return -1; @@ -490,7 +489,7 @@ virStorageSourceParseBackingJSONUriCookies(virStorageSource *src, if (!(cookiestr = virJSONValueObjectGetString(json, "cookie"))) { virReportError(VIR_ERR_INVALID_ARG, - _("wrong format of 'cookie' field in backing store definition '%s'"), + _("wrong format of 'cookie' field in backing store definition '%1$s'"), jsonstr); return -1; } @@ -509,7 +508,7 @@ virStorageSourceParseBackingJSONUriCookies(virStorageSource *src, if (!(cookievalue = strchr(cookiename, '='))) { virReportError(VIR_ERR_INVALID_ARG, - _("malformed http cookie '%s' in backing store definition '%s'"), + _("malformed http cookie '%1$s' in backing store definition '%2$s'"), cookies[i], jsonstr); return -1; } @@ -553,7 +552,7 @@ virStorageSourceParseBackingJSONUri(virStorageSource *src, } else { if (virJSONValueObjectGetBoolean(json, "sslverify", &tmp) < 0) { virReportError(VIR_ERR_INVALID_ARG, - _("malformed 'sslverify' field in backing store definition '%s'"), + _("malformed 'sslverify' field in backing store definition '%1$s'"), jsonstr); return -1; } @@ -572,7 +571,7 @@ virStorageSourceParseBackingJSONUri(virStorageSource *src, if (virJSONValueObjectHasKey(json, "readahead") && virJSONValueObjectGetNumberUlong(json, "readahead", &src->readahead) < 0) { virReportError(VIR_ERR_INVALID_ARG, - _("malformed 'readahead' field in backing store definition '%s'"), + _("malformed 'readahead' field in backing store definition '%1$s'"), jsonstr); return -1; } @@ -580,7 +579,7 @@ virStorageSourceParseBackingJSONUri(virStorageSource *src, if (virJSONValueObjectHasKey(json, "timeout") && virJSONValueObjectGetNumberUlong(json, "timeout", &src->timeout) < 0) { virReportError(VIR_ERR_INVALID_ARG, - _("malformed 'timeout' field in backing store definition '%s'"), + _("malformed 'timeout' field in backing store definition '%1$s'"), jsonstr); return -1; } @@ -666,7 +665,7 @@ virStorageSourceParseBackingJSONSocketAddress(virStorageNetHostDef *host, host->socket = g_strdup(socket); } else { virReportError(VIR_ERR_INTERNAL_ERROR, - _("backing store protocol '%s' is not yet supported"), + _("backing store protocol '%1$s' is not yet supported"), type); return -1; } @@ -1015,7 +1014,7 @@ virStorageSourceParseBackingJSONRaw(virStorageSource *src, /* 'raw' is a format driver so it can have protocol driver children */ if (!(file = virJSONValueObjectGetObject(json, "file"))) { virReportError(VIR_ERR_INVALID_ARG, - _("JSON backing volume definition '%s' lacks 'file' object"), + _("JSON backing volume definition '%1$s' lacks 'file' object"), jsonstr); return -1; } @@ -1181,7 +1180,7 @@ virStorageSourceParseBackingJSONInternal(virStorageSource *src, if (!(drvname = virJSONValueObjectGetString(json, "driver"))) { virReportError(VIR_ERR_INVALID_ARG, - _("JSON backing volume definition '%s' lacks driver name"), + _("JSON backing volume definition '%1$s' lacks driver name"), jsonstr); return -1; } @@ -1192,7 +1191,7 @@ virStorageSourceParseBackingJSONInternal(virStorageSource *src, if (jsonParsers[i].formatdriver && !allowformat) { virReportError(VIR_ERR_INVALID_ARG, - _("JSON backing volume definition '%s' must not have nested format drivers"), + _("JSON backing volume definition '%1$s' must not have nested format drivers"), jsonstr); return -1; } @@ -1201,8 +1200,8 @@ virStorageSourceParseBackingJSONInternal(virStorageSource *src, } virReportError(VIR_ERR_INTERNAL_ERROR, - _("missing parser implementation for JSON backing volume " - "driver '%s'"), drvname); + _("missing parser implementation for JSON backing volume driver '%1$s'"), + drvname); return -1; } -- 2.39.2

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com&gt; --- src/util/iohelper.c | 10 +- src/util/viralloc.c | 2 +- src/util/virauth.c | 6 +- src/util/virauthconfig.c | 4 +- src/util/virbitmap.c | 4 +- src/util/virccw.c | 2 +- src/util/vircgroup.c | 42 +++---- src/util/vircgroupbackend.c | 2 +- src/util/vircgroupbackend.h | 4 +- src/util/vircgroupv1.c | 78 ++++++------- src/util/vircgroupv2.c | 80 ++++++------- src/util/vircgroupv2devices.c | 4 +- src/util/vircommand.c | 38 +++--- src/util/virconf.c | 40 +++---- src/util/vircrypto.c | 14 +-- src/util/virdaemon.c | 8 +- src/util/virdevmapper.c | 8 +- src/util/virdnsmasq.c | 15 ++- src/util/virerror.c | 212 +++++++++++++++++----------------- src/util/virerror.h | 14 +-- src/util/vireventthread.c | 2 +- tests/virerrortest.c | 7 +- 22 files changed, 298 insertions(+), 298 deletions(-) diff --git a/src/util/iohelper.c b/src/util/iohelper.c index dd77bda723..0a57672bb4 100644 --- a/src/util/iohelper.c +++ b/src/util/iohelper.c @@ -44,9 +44,9 @@ G_GNUC_NORETURN static void usage(int status) { if (status) { - fprintf(stderr, _("%s: try --help for more details"), program_name); + fprintf(stderr, _("%1$s: try --help for more details"), program_name); } else { - printf(_("Usage: %s FILENAME FD"), program_name); + printf(_("Usage: %1$s FILENAME FD"), program_name); } exit(status); } @@ -61,7 +61,7 @@ main(int argc, char **argv) if (virGettextInitialize() < 0 || virErrorInitialize() < 0) { - fprintf(stderr, _("%s: initialization failed"), program_name); + fprintf(stderr, _("%1$s: initialization failed"), program_name); exit(EXIT_FAILURE); } @@ -71,7 +71,7 @@ main(int argc, char **argv) usage(EXIT_SUCCESS); if (argc == 3) { /* FILENAME FD */ if (virStrToLong_i(argv[2], NULL, 10, &fd) < 0) { - fprintf(stderr, _("%s: malformed fd %s"), + fprintf(stderr, _("%1$s: malformed fd %2$s"), program_name, argv[3]); exit(EXIT_FAILURE); } @@ -85,7 +85,7 @@ main(int argc, char **argv) return 0; error: - fprintf(stderr, _("%s: failure with %s: %s"), + fprintf(stderr, _("%1$s: failure with %2$s: %3$s"), program_name, path, virGetLastErrorMessage()); exit(EXIT_FAILURE); } diff --git a/src/util/viralloc.c b/src/util/viralloc.c index 4ebbf1cf8c..7aa14cccb2 100644 --- a/src/util/viralloc.c +++ b/src/util/viralloc.c @@ -248,7 +248,7 @@ virInsertElementsN(void *ptrptr, at = *countptr; } else if (at > *countptr) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("out of bounds index - count %zu at %zu"), + _("out of bounds index - count %1$zu at %2$zu"), *countptr, at); return -1; } diff --git a/src/util/virauth.c b/src/util/virauth.c index 7b4a1bd8a5..d6917bde9f 100644 --- a/src/util/virauth.c +++ b/src/util/virauth.c @@ -153,10 +153,10 @@ virAuthGetUsernamePath(const char *path, memset(&cred, 0, sizeof(virConnectCredential)); if (defaultUsername != NULL) { - prompt = g_strdup_printf(_("Enter username for %s [%s]"), hostname, + prompt = g_strdup_printf(_("Enter username for %1$s [%2$s]"), hostname, defaultUsername); } else { - prompt = g_strdup_printf(_("Enter username for %s"), hostname); + prompt = g_strdup_printf(_("Enter username for %1$s"), hostname); } for (ncred = 0; ncred < auth->ncredtype; ncred++) { @@ -230,7 +230,7 @@ virAuthGetPasswordPath(const char *path, return NULL; } - prompt = g_strdup_printf(_("Enter %s's password for %s"), username, hostname); + prompt = g_strdup_printf(_("Enter %1$s's password for %2$s"), username, hostname); if (!(cred = virAuthAskCredential(auth, prompt, false))) return NULL; diff --git a/src/util/virauthconfig.c b/src/util/virauthconfig.c index 818df7a252..0c9eeae76e 100644 --- a/src/util/virauthconfig.c +++ b/src/util/virauthconfig.c @@ -109,7 +109,7 @@ virAuthConfigLookup(virAuthConfig *auth, if (!(authcred = g_key_file_get_string(auth->keyfile, authgroup, "credentials", NULL))) { virReportError(VIR_ERR_CONF_SYNTAX, - _("Missing item 'credentials' in group '%s' in '%s'"), + _("Missing item 'credentials' in group '%1$s' in '%2$s'"), authgroup, auth->path); return -1; } @@ -118,7 +118,7 @@ virAuthConfigLookup(virAuthConfig *auth, if (!g_key_file_has_group(auth->keyfile, credgroup)) { virReportError(VIR_ERR_CONF_SYNTAX, - _("Missing group 'credentials-%s' referenced from group '%s' in '%s'"), + _("Missing group 'credentials-%1$s' referenced from group '%2$s' in '%3$s'"), authcred, authgroup, auth->path); return -1; } diff --git a/src/util/virbitmap.c b/src/util/virbitmap.c index 48ffed0a0f..e48224d709 100644 --- a/src/util/virbitmap.c +++ b/src/util/virbitmap.c @@ -478,7 +478,7 @@ virBitmapParseInternal(const char *str, error: virReportError(VIR_ERR_INVALID_ARG, - _("Failed to parse bitmap '%s'"), str); + _("Failed to parse bitmap '%1$s'"), str); return -1; } @@ -996,7 +996,7 @@ virBitmapNewString(const char *string) if (strspn(string, "0123456789abcdefABCDEF") != len) { virReportError(VIR_ERR_INVALID_ARG, - _("Invalid hexadecimal string '%s'"), string); + _("Invalid hexadecimal string '%1$s'"), string); return NULL; } diff --git a/src/util/virccw.c b/src/util/virccw.c index d741743050..c6be013e16 100644 --- a/src/util/virccw.c +++ b/src/util/virccw.c @@ -64,7 +64,7 @@ virCCWDeviceAddressFromString(const char *address) &ccw->ssid, &ccw->devno) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to parse CCW address '%s'"), + _("Failed to parse CCW address '%1$s'"), address); return NULL; } diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index 73675b4478..b424e1b5d4 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -353,7 +353,7 @@ virCgroupDetectPlacement(virCgroup *group, mapping = fopen(procfile, "r"); if (mapping == NULL) { virReportSystemError(errno, - _("Unable to open '%s'"), + _("Unable to open '%1$s'"), procfile); goto cleanup; } @@ -464,14 +464,14 @@ virCgroupGetBlockDevString(const char *path) if (stat(path, &sb) < 0) { virReportSystemError(errno, - _("Path '%s' is not accessible"), + _("Path '%1$s' is not accessible"), path); return NULL; } if (!S_ISBLK(sb.st_mode)) { virReportSystemError(EINVAL, - _("Path '%s' must be a block device"), + _("Path '%1$s' must be a block device"), path); return NULL; } @@ -524,12 +524,12 @@ virCgroupSetValueRaw(const char *path, if (errno == EINVAL && (tmp = strrchr(path, '/'))) { virReportSystemError(errno, - _("Invalid value '%s' for '%s'"), + _("Invalid value '%1$s' for '%2$s'"), value, tmp + 1); return -1; } virReportSystemError(errno, - _("Unable to write to '%s'"), path); + _("Unable to write to '%1$s'"), path); return -1; } @@ -549,7 +549,7 @@ virCgroupGetValueRaw(const char *path, if ((rc = virFileReadAll(path, 1024*1024, value)) < 0) { virReportSystemError(errno, - _("Unable to read from '%s'"), path); + _("Unable to read from '%1$s'"), path); return -1; } @@ -656,7 +656,7 @@ virCgroupGetValueI64(virCgroup *group, if (virStrToLong_ll(strval, NULL, 10, value) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to parse '%s' as an integer"), + _("Unable to parse '%1$s' as an integer"), strval); return -1; } @@ -678,7 +678,7 @@ virCgroupGetValueU64(virCgroup *group, if (virStrToLong_ull(strval, NULL, 10, value) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to parse '%s' as an integer"), + _("Unable to parse '%1$s' as an integer"), strval); return -1; } @@ -947,7 +947,7 @@ virCgroupNewPartition(const char *path, if (!g_path_is_absolute(path)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Partition path '%s' must start with '/'"), + _("Partition path '%1$s' must start with '/'"), path); return -1; } @@ -1125,7 +1125,7 @@ virCgroupNewThread(virCgroup *domain, break; case VIR_CGROUP_THREAD_LAST: virReportError(VIR_ERR_INTERNAL_ERROR, - _("unexpected name value %d"), nameval); + _("unexpected name value %1$d"), nameval); return -1; } @@ -1508,7 +1508,7 @@ virCgroupPathOfController(virCgroup *group, { if (controller >= VIR_CGROUP_CONTROLLER_LAST) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Invalid controller id '%d'"), controller); + _("Invalid controller id '%1$d'"), controller); return -1; } @@ -2187,7 +2187,7 @@ virCgroupAllowDevicePath(virCgroup *group, return 1; virReportSystemError(errno, - _("Path '%s' is not accessible"), + _("Path '%1$s' is not accessible"), path); return -1; } @@ -2254,7 +2254,7 @@ virCgroupDenyDevicePath(virCgroup *group, return 1; virReportSystemError(errno, - _("Path '%s' is not accessible"), + _("Path '%1$s' is not accessible"), path); return -1; } @@ -2383,7 +2383,7 @@ virCgroupGetPercpuStats(virCgroup *group, if (start_cpu >= total_cpus) { virReportError(VIR_ERR_INVALID_ARG, - _("start_cpu %d larger than maximum of %d"), + _("start_cpu %1$d larger than maximum of %2$d"), start_cpu, total_cpus - 1); return -1; } @@ -2582,7 +2582,7 @@ virCgroupRemoveRecursively(char *grppath) if (errno == ENOENT) return 0; rc = -errno; - VIR_ERROR(_("Unable to open %s (%d)"), grppath, errno); + VIR_ERROR(_("Unable to open %1$s (%2$d)"), grppath, errno); return rc; } @@ -2601,13 +2601,13 @@ virCgroupRemoveRecursively(char *grppath) } if (direrr < 0) { rc = -errno; - VIR_ERROR(_("Failed to readdir for %s (%d)"), grppath, errno); + VIR_ERROR(_("Failed to readdir for %1$s (%2$d)"), grppath, errno); } VIR_DEBUG("Removing cgroup %s", grppath); if (rmdir(grppath) != 0 && errno != ENOENT) { rc = -errno; - VIR_ERROR(_("Unable to remove %s (%d)"), grppath, errno); + VIR_ERROR(_("Unable to remove %1$s (%2$d)"), grppath, errno); } return rc; @@ -2677,7 +2677,7 @@ virCgroupKillInternal(virCgroup *group, } virReportSystemError(errno, - _("Failed to read %s"), + _("Failed to read %1$s"), keypath); goto cleanup; } else { @@ -2688,7 +2688,7 @@ virCgroupKillInternal(virCgroup *group, if (feof(fp)) break; virReportSystemError(errno, - _("Failed to read %s"), + _("Failed to read %1$s"), keypath); goto cleanup; } @@ -2701,7 +2701,7 @@ virCgroupKillInternal(virCgroup *group, if (kill((pid_t)*pid_value, signum) < 0) { if (errno != ESRCH) { virReportSystemError(errno, - _("Failed to kill process %lld"), + _("Failed to kill process %1$lld"), *pid_value); goto cleanup; } @@ -3025,7 +3025,7 @@ virCgroupGetInode(virCgroup *cgroup) return -1; if (stat(path, &st) < 0) { - virReportSystemError(errno, _("failed to get stat for '%s'"), path); + virReportSystemError(errno, _("failed to get stat for '%1$s'"), path); return -1; } diff --git a/src/util/vircgroupbackend.c b/src/util/vircgroupbackend.c index 6d6f82cbb1..ee049c13b9 100644 --- a/src/util/vircgroupbackend.c +++ b/src/util/vircgroupbackend.c @@ -43,7 +43,7 @@ virCgroupBackendRegister(virCgroupBackend *backend) { if (virCgroupBackends[backend->type]) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Cgroup backend '%s' already registered."), + _("Cgroup backend '%1$s' already registered."), virCgroupBackendTypeToString(backend->type)); return; } diff --git a/src/util/vircgroupbackend.h b/src/util/vircgroupbackend.h index c4d56896b0..ee2f6c1ec7 100644 --- a/src/util/vircgroupbackend.h +++ b/src/util/vircgroupbackend.h @@ -466,13 +466,13 @@ virCgroupBackendForController(virCgroup *group, virCgroupBackend *backend = virCgroupBackendForController(group, controller); \ if (!backend) { \ virReportError(VIR_ERR_INTERNAL_ERROR, \ - _("failed to get cgroup backend for '%s' controller '%u'"), \ + _("failed to get cgroup backend for '%1$s' controller '%2$u'"), \ #func, controller); \ return ret; \ } \ if (!backend->func) { \ virReportError(VIR_ERR_OPERATION_UNSUPPORTED, \ - _("operation '%s' not supported for backend '%s'"), \ + _("operation '%1$s' not supported for backend '%2$s'"), \ #func, virCgroupBackendTypeToString(backend->type)); \ return ret; \ } \ diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c index cbee08e931..c0cac2a6b6 100644 --- a/src/util/vircgroupv1.c +++ b/src/util/vircgroupv1.c @@ -230,7 +230,7 @@ virCgroupV1ResolveMountLink(const char *mntDir, dirName = strrchr(tmp, '/'); if (!dirName) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Missing '/' separator in cgroup mount '%s'"), tmp); + _("Missing '/' separator in cgroup mount '%1$s'"), tmp); return -1; } @@ -246,7 +246,7 @@ virCgroupV1ResolveMountLink(const char *mntDir, VIR_WARN("Controller %s co-mounted at %s is missing symlink at %s", typeStr, tmp, linkSrc); } else { - virReportSystemError(errno, _("Cannot stat %s"), linkSrc); + virReportSystemError(errno, _("Cannot stat %1$s"), linkSrc); return -1; } } else { @@ -409,7 +409,7 @@ virCgroupV1ValidatePlacement(virCgroup *group, if (!group->legacy[i].placement) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not find placement for v1 controller %s"), + _("Could not find placement for v1 controller %1$s"), virCgroupV1ControllerTypeToString(i)); return -1; } @@ -478,7 +478,7 @@ virCgroupV1DetectControllers(virCgroup *group, if (STREQ_NULLABLE(group->legacy[i].mountPoint, group->legacy[j].mountPoint)) { virReportSystemError(EINVAL, - _("V1 controller '%s' is not wanted, but '%s' is co-mounted"), + _("V1 controller '%1$s' is not wanted, but '%2$s' is co-mounted"), virCgroupV1ControllerTypeToString(i), virCgroupV1ControllerTypeToString(j)); return -1; @@ -547,14 +547,14 @@ virCgroupV1PathOfController(virCgroup *group, { if (group->legacy[controller].mountPoint == NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("v1 controller '%s' is not mounted"), + _("v1 controller '%1$s' is not mounted"), virCgroupV1ControllerTypeToString(controller)); return -1; } if (group->legacy[controller].placement == NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("v1 controller '%s' is not enabled for group"), + _("v1 controller '%1$s' is not enabled for group"), virCgroupV1ControllerTypeToString(controller)); return -1; } @@ -670,7 +670,7 @@ virCgroupV1MakeGroup(virCgroup *parent, continue; } else { virReportSystemError(errno, - _("Failed to create v1 controller %s for group"), + _("Failed to create v1 controller %1$s for group"), virCgroupV1ControllerTypeToString(i)); return -1; } @@ -828,7 +828,7 @@ virCgroupV1IdentifyRoot(virCgroup *group) continue; if (!(tmp = strrchr(group->legacy[i].mountPoint, '/'))) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not find directory separator in %s"), + _("Could not find directory separator in %1$s"), group->legacy[i].mountPoint); return NULL; } @@ -860,7 +860,7 @@ virCgroupV1BindMount(virCgroup *group, if (g_mkdir_with_parents(root, 0777) < 0) { virReportSystemError(errno, - _("Unable to create directory %s"), + _("Unable to create directory %1$s"), root); return -1; } @@ -869,7 +869,7 @@ virCgroupV1BindMount(virCgroup *group, if (mount("tmpfs", root, "tmpfs", MS_NOSUID|MS_NODEV|MS_NOEXEC, opts) < 0) { virReportSystemError(errno, - _("Failed to mount %s on %s type %s"), + _("Failed to mount %1$s on %2$s type %3$s"), "tmpfs", root, "tmpfs"); return -1; } @@ -886,7 +886,7 @@ virCgroupV1BindMount(virCgroup *group, group->legacy[i].mountPoint); if (g_mkdir_with_parents(group->legacy[i].mountPoint, 0777) < 0) { virReportSystemError(errno, - _("Unable to create directory %s"), + _("Unable to create directory %1$s"), group->legacy[i].mountPoint); return -1; } @@ -894,7 +894,7 @@ virCgroupV1BindMount(virCgroup *group, if (mount(src, group->legacy[i].mountPoint, "none", MS_BIND, NULL) < 0) { virReportSystemError(errno, - _("Failed to bind cgroup '%s' on '%s'"), + _("Failed to bind cgroup '%1$s' on '%2$s'"), src, group->legacy[i].mountPoint); return -1; } @@ -907,7 +907,7 @@ virCgroupV1BindMount(virCgroup *group, if (symlink(group->legacy[i].mountPoint, group->legacy[i].linkPoint) < 0) { virReportSystemError(errno, - _("Unable to symlink directory %s to %s"), + _("Unable to symlink directory %1$s to %2$s"), group->legacy[i].mountPoint, group->legacy[i].linkPoint); return -1; @@ -952,7 +952,7 @@ virCgroupV1SetOwner(virCgroup *cgroup, if (chown(entry, uid, gid) < 0) { virReportSystemError(errno, - _("cannot chown '%s' to (%u, %u)"), + _("cannot chown '%1$s' to (%2$u, %3$u)"), entry, uid, gid); return -1; } @@ -962,7 +962,7 @@ virCgroupV1SetOwner(virCgroup *cgroup, if (chown(base, uid, gid) < 0) { virReportSystemError(errno, - _("cannot chown '%s' to (%u, %u)"), + _("cannot chown '%1$s' to (%2$u, %3$u)"), base, uid, gid); return -1; } @@ -1042,7 +1042,7 @@ virCgroupV1GetBlkioWeight(virCgroup *group, if (virStrToLong_ui(value, NULL, 10, weight) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to parse '%s' as an integer"), + _("Unable to parse '%1$s' as an integer"), value); return -1; } @@ -1102,7 +1102,7 @@ virCgroupV1GetBlkioIoServiced(virCgroup *group, p1 += strlen(value_names[i]); if (virStrToLong_ll(p1, &p1, 10, &stats_val) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Cannot parse byte %sstat '%s'"), + _("Cannot parse byte %1$sstat '%2$s'"), value_names[i], p1); return -1; @@ -1112,7 +1112,7 @@ virCgroupV1GetBlkioIoServiced(virCgroup *group, (stats_val > 0 && *bytes_ptrs[i] > (LLONG_MAX - stats_val))) { virReportError(VIR_ERR_OVERFLOW, - _("Sum of byte %sstat overflows"), + _("Sum of byte %1$sstat overflows"), value_names[i]); return -1; } @@ -1123,7 +1123,7 @@ virCgroupV1GetBlkioIoServiced(virCgroup *group, p2 += strlen(value_names[i]); if (virStrToLong_ll(p2, &p2, 10, &stats_val) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Cannot parse %srequest stat '%s'"), + _("Cannot parse %1$srequest stat '%2$s'"), value_names[i], p2); return -1; @@ -1133,7 +1133,7 @@ virCgroupV1GetBlkioIoServiced(virCgroup *group, (stats_val > 0 && *requests_ptrs[i] > (LLONG_MAX - stats_val))) { virReportError(VIR_ERR_OVERFLOW, - _("Sum of %srequest stat overflows"), + _("Sum of %1$srequest stat overflows"), value_names[i]); return -1; } @@ -1188,14 +1188,14 @@ virCgroupV1GetBlkioIoDeviceServiced(virCgroup *group, if (!(p1 = strstr(str1, str3))) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Cannot find byte stats for block device '%s'"), + _("Cannot find byte stats for block device '%1$s'"), str3); return -1; } if (!(p2 = strstr(str2, str3))) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Cannot find request stats for block device '%s'"), + _("Cannot find request stats for block device '%1$s'"), str3); return -1; } @@ -1203,28 +1203,28 @@ virCgroupV1GetBlkioIoDeviceServiced(virCgroup *group, for (i = 0; i < G_N_ELEMENTS(value_names); i++) { if (!(p1 = strstr(p1, value_names[i]))) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Cannot find byte %sstats for block device '%s'"), + _("Cannot find byte %1$sstats for block device '%2$s'"), value_names[i], str3); return -1; } if (virStrToLong_ll(p1 + strlen(value_names[i]), &p1, 10, bytes_ptrs[i]) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Cannot parse %sstat '%s'"), + _("Cannot parse %1$sstat '%2$s'"), value_names[i], p1 + strlen(value_names[i])); return -1; } if (!(p2 = strstr(p2, value_names[i]))) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Cannot find request %sstats for block device '%s'"), + _("Cannot find request %1$sstats for block device '%2$s'"), value_names[i], str3); return -1; } if (virStrToLong_ll(p2 + strlen(value_names[i]), &p2, 10, requests_ptrs[i]) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Cannot parse %sstat '%s'"), + _("Cannot parse %1$sstat '%2$s'"), value_names[i], p2 + strlen(value_names[i])); return -1; } @@ -1302,7 +1302,7 @@ virCgroupV1GetBlkioDeviceWeight(virCgroup *group, *weight = 0; } else if (virStrToLong_ui(str, NULL, 10, weight) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to parse '%s' as an integer"), + _("Unable to parse '%1$s' as an integer"), str); return -1; } @@ -1353,7 +1353,7 @@ virCgroupV1GetBlkioDeviceReadIops(virCgroup *group, *riops = 0; } else if (virStrToLong_ui(str, NULL, 10, riops) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to parse '%s' as an integer"), + _("Unable to parse '%1$s' as an integer"), str); return -1; } @@ -1404,7 +1404,7 @@ virCgroupV1GetBlkioDeviceWriteIops(virCgroup *group, *wiops = 0; } else if (virStrToLong_ui(str, NULL, 10, wiops) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to parse '%s' as an integer"), + _("Unable to parse '%1$s' as an integer"), str); return -1; } @@ -1455,7 +1455,7 @@ virCgroupV1GetBlkioDeviceReadBps(virCgroup *group, *rbps = 0; } else if (virStrToLong_ull(str, NULL, 10, rbps) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to parse '%s' as an integer"), + _("Unable to parse '%1$s' as an integer"), str); return -1; } @@ -1506,7 +1506,7 @@ virCgroupV1GetBlkioDeviceWriteBps(virCgroup *group, *wbps = 0; } else if (virStrToLong_ull(str, NULL, 10, wbps) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to parse '%s' as an integer"), + _("Unable to parse '%1$s' as an integer"), str); return -1; } @@ -1567,7 +1567,7 @@ virCgroupV1SetMemory(virCgroup *group, if (kb > maxkb) { virReportError(VIR_ERR_INVALID_ARG, - _("Memory '%llu' must be less than %llu"), + _("Memory '%1$llu' must be less than %2$llu"), kb, maxkb); return -1; } @@ -1710,7 +1710,7 @@ virCgroupV1SetMemorySoftLimit(virCgroup *group, if (kb > maxkb) { virReportError(VIR_ERR_INVALID_ARG, - _("Memory '%llu' must be less than %llu"), + _("Memory '%1$llu' must be less than %2$llu"), kb, maxkb); return -1; } @@ -1755,7 +1755,7 @@ virCgroupV1SetMemSwapHardLimit(virCgroup *group, if (kb > maxkb) { virReportError(VIR_ERR_INVALID_ARG, - _("Memory '%llu' must be less than %llu"), + _("Memory '%1$llu' must be less than %2$llu"), kb, maxkb); return -1; } @@ -1906,7 +1906,7 @@ virCgroupV1SetCpuShares(virCgroup *group, if (shares < VIR_CGROUP_CPU_SHARES_MIN || shares > VIR_CGROUP_CPU_SHARES_MAX) { virReportError(VIR_ERR_INVALID_ARG, - _("shares '%llu' must be in range [%llu, %llu]"), + _("shares '%1$llu' must be in range [%2$llu, %3$llu]"), shares, VIR_CGROUP_CPU_SHARES_MIN, VIR_CGROUP_CPU_SHARES_MAX); @@ -1942,7 +1942,7 @@ virCgroupV1SetCpuCfsPeriod(virCgroup *group, if (cfs_period < VIR_CGROUP_CPU_PERIOD_MIN || cfs_period > VIR_CGROUP_CPU_PERIOD_MAX) { virReportError(VIR_ERR_INVALID_ARG, - _("cfs_period '%llu' must be in range (%llu, %llu)"), + _("cfs_period '%1$llu' must be in range (%2$llu, %3$llu)"), cfs_period, VIR_CGROUP_CPU_PERIOD_MIN, VIR_CGROUP_CPU_PERIOD_MAX); @@ -1973,7 +1973,7 @@ virCgroupV1SetCpuCfsQuota(virCgroup *group, (cfs_quota < VIR_CGROUP_CPU_QUOTA_MIN || cfs_quota > VIR_CGROUP_CPU_QUOTA_MAX)) { virReportError(VIR_ERR_INVALID_ARG, - _("cfs_quota '%lld' must be in range (%llu, %llu)"), + _("cfs_quota '%1$lld' must be in range (%2$llu, %3$llu)"), cfs_quota, VIR_CGROUP_CPU_QUOTA_MIN, VIR_CGROUP_CPU_QUOTA_MAX); @@ -2049,14 +2049,14 @@ virCgroupV1GetCpuacctStat(virCgroup *group, if (!(p = STRSKIP(str, "user ")) || virStrToLong_ull(p, &p, 10, user) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Cannot parse user stat '%s'"), + _("Cannot parse user stat '%1$s'"), p); return -1; } if (!(p = STRSKIP(p, "\nsystem ")) || virStrToLong_ull(p, NULL, 10, sys) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Cannot parse sys stat '%s'"), + _("Cannot parse sys stat '%1$s'"), p); return -1; } diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c index 219b9c7f21..db115e25f7 100644 --- a/src/util/vircgroupv2.c +++ b/src/util/vircgroupv2.c @@ -279,7 +279,7 @@ virCgroupV2ParseControllersFile(virCgroup *group, rc = virFileReadAll(contFile, 1024 * 1024, &contStr); if (rc < 0) { - virReportSystemError(errno, _("Unable to read from '%s'"), contFile); + virReportSystemError(errno, _("Unable to read from '%1$s'"), contFile); return -1; } @@ -360,7 +360,7 @@ virCgroupV2PathOfController(virCgroup *group, { if (!virCgroupV2HasController(group, controller)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("v2 controller '%s' is not available"), + _("v2 controller '%1$s' is not available"), virCgroupV2ControllerTypeToString(controller)); return -1; } @@ -398,7 +398,7 @@ virCgroupV2EnableController(virCgroup *group, if (virFileWriteStr(path, val, 0) < 0) { if (report) { virReportSystemError(errno, - _("Failed to enable controller '%s' for '%s'"), + _("Failed to enable controller '%1$s' for '%2$s'"), val, path); } return -2; @@ -439,7 +439,7 @@ virCgroupV2MakeGroup(virCgroup *parent, if (!virFileExists(path) && (!create || (mkdir(path, 0755) < 0 && errno != EEXIST))) { - virReportSystemError(errno, _("Failed to create v2 cgroup '%s'"), + virReportSystemError(errno, _("Failed to create v2 cgroup '%1$s'"), path); return -1; } @@ -590,7 +590,7 @@ virCgroupV2BindMount(virCgroup *group, VIR_DEBUG("Mounting cgroups at '%s'", group->unified.mountPoint); if (g_mkdir_with_parents(group->unified.mountPoint, 0777) < 0) { - virReportSystemError(errno, _("Unable to create directory %s"), + virReportSystemError(errno, _("Unable to create directory %1$s"), group->unified.mountPoint); return -1; } @@ -598,7 +598,7 @@ virCgroupV2BindMount(virCgroup *group, src = g_strdup_printf("%s%s", oldroot, group->unified.mountPoint); if (mount(src, group->unified.mountPoint, "none", MS_BIND, NULL) < 0) { - virReportSystemError(errno, _("Failed to bind cgroup '%s' on '%s'"), + virReportSystemError(errno, _("Failed to bind cgroup '%1$s' on '%2$s'"), src, group->unified.mountPoint); return -1; } @@ -622,7 +622,7 @@ virCgroupV2SetOwner(virCgroup *cgroup, return -1; if (chown(base, uid, gid) < 0) { - virReportSystemError(errno, _("cannot chown '%s' to (%u, %u)"), + virReportSystemError(errno, _("cannot chown '%1$s' to (%2$u, %3$u)"), base, uid, gid); return -1; } @@ -710,7 +710,7 @@ virCgroupV2GetBlkioWeight(virCgroup *group, if (virStrToLong_ui(tmp, &tmp, 10, weight) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to parse '%s' as an integer"), + _("Unable to parse '%1$s' as an integer"), tmp); return -1; } @@ -763,7 +763,7 @@ virCgroupV2GetBlkioIoServiced(virCgroup *group, p1 += strlen(value_names[i]); if (virStrToLong_ll(p1, &p1, 10, &stats_val) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Cannot parse byte '%s' stat '%s'"), + _("Cannot parse byte '%1$s' stat '%2$s'"), value_names[i], p1); return -1; } @@ -771,7 +771,7 @@ virCgroupV2GetBlkioIoServiced(virCgroup *group, if (stats_val < 0 || (stats_val > 0 && *value_ptrs[i] > (LLONG_MAX - stats_val))) { virReportError(VIR_ERR_OVERFLOW, - _("Sum of byte '%s' stat overflows"), + _("Sum of byte '%1$s' stat overflows"), value_names[i]); return -1; } @@ -820,7 +820,7 @@ virCgroupV2GetBlkioIoDeviceServiced(virCgroup *group, if (!(p1 = strstr(str1, str2))) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Cannot find byte stats for block device '%s'"), + _("Cannot find byte stats for block device '%1$s'"), str2); return -1; } @@ -828,7 +828,7 @@ virCgroupV2GetBlkioIoDeviceServiced(virCgroup *group, for (i = 0; i < G_N_ELEMENTS(value_names); i++) { if (!(p1 = strstr(p1, value_names[i]))) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Cannot find byte '%s' stats for block device '%s'"), + _("Cannot find byte '%1$s' stats for block device '%2$s'"), value_names[i], str2); return -1; } @@ -836,7 +836,7 @@ virCgroupV2GetBlkioIoDeviceServiced(virCgroup *group, p1 += strlen(value_names[i]); if (virStrToLong_ll(p1, &p1, 10, value_ptrs[i]) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Cannot parse '%s' stat '%s'"), + _("Cannot parse '%1$s' stat '%2$s'"), value_names[i], p1); return -1; } @@ -915,7 +915,7 @@ virCgroupV2GetBlkioDeviceWeight(virCgroup *group, *weight = 0; } else if (virStrToLong_ui(str, &tmp, 10, weight) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to parse '%s' as an integer"), + _("Unable to parse '%1$s' as an integer"), str); return -1; } @@ -973,7 +973,7 @@ virCgroupV2GetBlkioDeviceReadIops(virCgroup *group, } else { if (!(tmp = strstr(str, name))) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to find '%s' limit for block device '%s'"), + _("Unable to find '%1$s' limit for block device '%2$s'"), name, path); return -1; } @@ -983,7 +983,7 @@ virCgroupV2GetBlkioDeviceReadIops(virCgroup *group, *riops = 0; } else if (virStrToLong_ui(tmp, &tmp, 10, riops) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to parse '%s' as an integer"), + _("Unable to parse '%1$s' as an integer"), str); return -1; } @@ -1042,7 +1042,7 @@ virCgroupV2GetBlkioDeviceWriteIops(virCgroup *group, } else { if (!(tmp = strstr(str, name))) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to find '%s' limit for block device '%s'"), + _("Unable to find '%1$s' limit for block device '%2$s'"), name, path); return -1; } @@ -1052,7 +1052,7 @@ virCgroupV2GetBlkioDeviceWriteIops(virCgroup *group, *wiops = 0; } else if (virStrToLong_ui(tmp, &tmp, 10, wiops) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to parse '%s' as an integer"), + _("Unable to parse '%1$s' as an integer"), str); return -1; } @@ -1111,7 +1111,7 @@ virCgroupV2GetBlkioDeviceReadBps(virCgroup *group, } else { if (!(tmp = strstr(str, name))) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to find '%s' limit for block device '%s'"), + _("Unable to find '%1$s' limit for block device '%2$s'"), name, path); return -1; } @@ -1121,7 +1121,7 @@ virCgroupV2GetBlkioDeviceReadBps(virCgroup *group, *rbps = 0; } else if (virStrToLong_ull(tmp, &tmp, 10, rbps) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to parse '%s' as an integer"), + _("Unable to parse '%1$s' as an integer"), str); return -1; } @@ -1180,7 +1180,7 @@ virCgroupV2GetBlkioDeviceWriteBps(virCgroup *group, } else { if (!(tmp = strstr(str, name))) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to find '%s' limit for block device '%s'"), + _("Unable to find '%1$s' limit for block device '%2$s'"), name, path); return -1; } @@ -1190,7 +1190,7 @@ virCgroupV2GetBlkioDeviceWriteBps(virCgroup *group, *wbps = 0; } else if (virStrToLong_ull(tmp, &tmp, 10, wbps) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to parse '%s' as an integer"), + _("Unable to parse '%1$s' as an integer"), str); return -1; } @@ -1208,7 +1208,7 @@ virCgroupV2SetMemory(virCgroup *group, if (kb > maxkb) { virReportError(VIR_ERR_INVALID_ARG, - _("Memory '%llu' must be less than %llu"), + _("Memory '%1$llu' must be less than %2$llu"), kb, maxkb); return -1; } @@ -1271,7 +1271,7 @@ virCgroupV2GetMemoryStat(virCgroup *group, if (virStrToLong_ull(valueStr + 1, NULL, 10, &value) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to parse '%s' as an integer"), + _("Unable to parse '%1$s' as an integer"), valueStr + 1); return -1; } @@ -1348,7 +1348,7 @@ virCgroupV2GetMemoryHardLimit(virCgroup *group, if (virStrToLong_ull(value, NULL, 10, &max) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to parse value '%s' as number."), + _("Failed to parse value '%1$s' as number."), value); return -1; } @@ -1369,7 +1369,7 @@ virCgroupV2SetMemorySoftLimit(virCgroup *group, if (kb > maxkb) { virReportError(VIR_ERR_INVALID_ARG, - _("Memory '%llu' must be less than %llu"), + _("Memory '%1$llu' must be less than %2$llu"), kb, maxkb); return -1; } @@ -1407,7 +1407,7 @@ virCgroupV2GetMemorySoftLimit(virCgroup *group, if (virStrToLong_ull(value, NULL, 10, &high) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to parse value '%s' as number."), + _("Failed to parse value '%1$s' as number."), value); return -1; } @@ -1428,7 +1428,7 @@ virCgroupV2SetMemSwapHardLimit(virCgroup *group, if (kb > maxkb) { virReportError(VIR_ERR_INVALID_ARG, - _("Memory '%llu' must be less than %llu"), + _("Memory '%1$llu' must be less than %2$llu"), kb, maxkb); return -1; } @@ -1467,7 +1467,7 @@ virCgroupV2GetMemSwapHardLimit(virCgroup *group, if (virStrToLong_ull(value, NULL, 10, &max) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to parse value '%s' as number."), + _("Failed to parse value '%1$s' as number."), value); return -1; } @@ -1502,7 +1502,7 @@ virCgroupV2SetCpuShares(virCgroup *group, if (shares < VIR_CGROUPV2_WEIGHT_MIN || shares > VIR_CGROUPV2_WEIGHT_MAX) { virReportError(VIR_ERR_INVALID_ARG, - _("shares '%llu' must be in range [%llu, %llu]"), + _("shares '%1$llu' must be in range [%2$llu, %3$llu]"), shares, VIR_CGROUPV2_WEIGHT_MIN, VIR_CGROUPV2_WEIGHT_MAX); @@ -1542,7 +1542,7 @@ virCgroupV2SetCpuCfsPeriod(virCgroup *group, if (cfs_period < VIR_CGROUP_CPU_PERIOD_MIN || cfs_period > VIR_CGROUP_CPU_PERIOD_MAX) { virReportError(VIR_ERR_INVALID_ARG, - _("cfs_period '%llu' must be in range (%llu, %llu)"), + _("cfs_period '%1$llu' must be in range (%2$llu, %3$llu)"), VIR_CGROUP_CPU_PERIOD_MIN, VIR_CGROUP_CPU_PERIOD_MAX, cfs_period); @@ -1588,7 +1588,7 @@ virCgroupV2GetCpuCfsPeriod(virCgroup *group, if (virStrToLong_ull(tmp, &tmp, 10, cfs_period) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to parse value '%s' from cpu.max."), str); + _("Failed to parse value '%1$s' from cpu.max."), str); return -1; } @@ -1604,7 +1604,7 @@ virCgroupV2SetCpuCfsQuota(virCgroup *group, (cfs_quota < VIR_CGROUP_CPU_QUOTA_MIN || cfs_quota > VIR_CGROUP_CPU_QUOTA_MAX)) { virReportError(VIR_ERR_INVALID_ARG, - _("cfs_quota '%lld' must be in range (%llu, %llu)"), + _("cfs_quota '%1$lld' must be in range (%2$llu, %3$llu)"), cfs_quota, VIR_CGROUP_CPU_QUOTA_MIN, VIR_CGROUP_CPU_QUOTA_MAX); @@ -1642,7 +1642,7 @@ virCgroupV2GetCpuCfsQuota(virCgroup *group, if (virStrToLong_ll(str, &tmp, 10, cfs_quota) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to parse value '%s' from cpu.max."), str); + _("Failed to parse value '%1$s' from cpu.max."), str); return -1; } @@ -1679,14 +1679,14 @@ virCgroupV2GetCpuacctUsage(virCgroup *group, if (!(tmp = strstr(str, "usage_usec "))) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("cannot parse cpu usage stat '%s'"), str); + _("cannot parse cpu usage stat '%1$s'"), str); return -1; } tmp += strlen("usage_usec "); if (virStrToLong_ull(tmp, &tmp, 10, usage) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to parse value '%s' as number."), tmp); + _("Failed to parse value '%1$s' as number."), tmp); return -1; } @@ -1713,27 +1713,27 @@ virCgroupV2GetCpuacctStat(virCgroup *group, if (!(tmp = strstr(str, "user_usec "))) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("cannot parse cpu user stat '%s'"), str); + _("cannot parse cpu user stat '%1$s'"), str); return -1; } tmp += strlen("user_usec "); if (virStrToLong_ull(tmp, &tmp, 10, &userVal) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to parse value '%s' as number."), tmp); + _("Failed to parse value '%1$s' as number."), tmp); return -1; } if (!(tmp = strstr(str, "system_usec "))) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("cannot parse cpu sys stat '%s'"), str); + _("cannot parse cpu sys stat '%1$s'"), str); return -1; } tmp += strlen("system_usec "); if (virStrToLong_ull(tmp, &tmp, 10, &sysVal) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to parse value '%s' as number."), tmp); + _("Failed to parse value '%1$s' as number."), tmp); return -1; } diff --git a/src/util/vircgroupv2devices.c b/src/util/vircgroupv2devices.c index 05818c4130..f740127bbc 100644 --- a/src/util/vircgroupv2devices.c +++ b/src/util/vircgroupv2devices.c @@ -297,7 +297,7 @@ virCgroupV2DevicesAttachProg(virCgroup *group, cgroupfd = open(path, O_RDONLY); if (cgroupfd < 0) { - virReportSystemError(errno, _("unable to open '%s'"), path); + virReportSystemError(errno, _("unable to open '%1$s'"), path); goto cleanup; } @@ -375,7 +375,7 @@ virCgroupV2DevicesDetectProg(virCgroup *group) cgroupfd = open(path, O_RDONLY); if (cgroupfd < 0) { - virReportSystemError(errno, _("unable to open '%s'"), path); + virReportSystemError(errno, _("unable to open '%1$s'"), path); return -1; } diff --git a/src/util/vircommand.c b/src/util/vircommand.c index 1144dfb597..180e36e1d9 100644 --- a/src/util/vircommand.c +++ b/src/util/vircommand.c @@ -371,7 +371,7 @@ getDevNull(int *null) { if (*null == -1 && (*null = open("/dev/null", O_RDWR|O_CLOEXEC)) < 0) { virReportSystemError(errno, - _("cannot open %s"), + _("cannot open %1$s"), "/dev/null"); return -1; } @@ -427,7 +427,7 @@ virCommandHandshakeChild(virCommand *cmd) } if (c != '1') { virReportSystemError(EINVAL, - _("Unexpected confirm code '%c' from parent"), + _("Unexpected confirm code '%1$c' from parent"), c); return -1; } @@ -452,7 +452,7 @@ virExecCommon(virCommand *cmd, gid_t *groups, int ngroups) if (cmd->schedCore > 0 && virProcessSchedCoreShareFrom(cmd->schedCore) < 0) { virReportSystemError(errno, - _("Unable to run among %llu"), + _("Unable to run among %1$llu"), (unsigned long long) cmd->schedCore); return -1; } @@ -471,7 +471,7 @@ virExecCommon(virCommand *cmd, gid_t *groups, int ngroups) VIR_DEBUG("Running child in %s", cmd->pwd); if (chdir(cmd->pwd) < 0) { virReportSystemError(errno, - _("Unable to change to %s"), cmd->pwd); + _("Unable to change to %1$s"), cmd->pwd); return -1; } } @@ -500,7 +500,7 @@ virCommandMassCloseGetFDsLinux(virCommand *cmd G_GNUC_UNUSED, if (virStrToLong_i(entry->d_name, NULL, 10, &fd) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unable to parse FD: %s"), + _("unable to parse FD: %1$s"), entry->d_name); return -1; } @@ -567,7 +567,7 @@ virCommandMassClose(virCommand *cmd, int tmpfd = fd; VIR_MASS_CLOSE(tmpfd); } else if (virSetInherit(fd, true) < 0) { - virReportSystemError(errno, _("failed to preserve fd %d"), fd); + virReportSystemError(errno, _("failed to preserve fd %1$d"), fd); return -1; } } @@ -620,7 +620,7 @@ virCommandMassClose(virCommand *cmd, int tmpfd = fd; VIR_MASS_CLOSE(tmpfd); } else if (virSetInherit(fd, true) < 0) { - virReportSystemError(errno, _("failed to preserve fd %d"), fd); + virReportSystemError(errno, _("failed to preserve fd %1$d"), fd); return -1; } } @@ -655,7 +655,7 @@ virExec(virCommand *cmd) if (!g_path_is_absolute(cmd->args[0])) { if (!(binary = binarystr = virFindFileInPath(cmd->args[0]))) { virReportSystemError(ENOENT, - _("Cannot find '%s' in path"), + _("Cannot find '%1$s' in path"), cmd->args[0]); return -1; } @@ -874,8 +874,7 @@ virExec(virCommand *cmd) VIR_DEBUG("Setting child security label to %s", cmd->seLinuxLabel); if (setexeccon_raw(cmd->seLinuxLabel) == -1) { virReportSystemError(errno, - _("unable to set SELinux security context " - "'%s' for '%s'"), + _("unable to set SELinux security context '%1$s' for '%2$s'"), cmd->seLinuxLabel, cmd->args[0]); if (security_getenforce() == 1) goto fork_error; @@ -887,8 +886,7 @@ virExec(virCommand *cmd) VIR_DEBUG("Setting child AppArmor profile to %s", cmd->appArmorProfile); if (aa_change_profile(cmd->appArmorProfile) < 0) { virReportSystemError(errno, - _("unable to set AppArmor profile '%s' " - "for '%s'"), + _("unable to set AppArmor profile '%1$s' for '%2$s'"), cmd->appArmorProfile, cmd->args[0]); goto fork_error; } @@ -911,7 +909,7 @@ virExec(virCommand *cmd) ret = errno == ENOENT ? EXIT_ENOENT : EXIT_CANNOT_INVOKE; virReportSystemError(errno, - _("cannot execute binary %s"), + _("cannot execute binary %1$s"), cmd->args[0]); fork_error: @@ -2342,7 +2340,7 @@ int virCommandExec(virCommand *cmd, gid_t *groups, int ngroups) execve(cmd->args[0], cmd->args, cmd->env); virReportSystemError(errno, - _("cannot execute binary %s"), + _("cannot execute binary %1$s"), cmd->args[0]); return -1; } @@ -2557,7 +2555,7 @@ virCommandRunAsync(virCommand *cmd, pid_t *pid) if (cmd->pid != -1) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("command is already running as pid %lld"), + _("command is already running as pid %1$lld"), (long long) cmd->pid); goto cleanup; } @@ -2569,7 +2567,7 @@ virCommandRunAsync(virCommand *cmd, pid_t *pid) } if (cmd->pwd && (cmd->flags & VIR_EXEC_DAEMON)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("daemonized command cannot set working directory %s"), + _("daemonized command cannot set working directory %1$s"), cmd->pwd); goto cleanup; } @@ -2723,7 +2721,7 @@ virCommandWait(virCommand *cmd, int *exitstatus) bool haveErrMsg = cmd->errbuf && *cmd->errbuf && (*cmd->errbuf)[0]; virReportError(VIR_ERR_INTERNAL_ERROR, - _("Child process (%s) unexpected %s%s%s"), + _("Child process (%1$s) unexpected %2$s%3$s%4$s"), str ? str : cmd->args[0], NULLSTR(st), haveErrMsg ? ": " : "", haveErrMsg ? *cmd->errbuf : ""); @@ -3231,7 +3229,7 @@ virCommandRunRegex(virCommand *cmd, reg[i] = g_regex_new(regex[i], G_REGEX_OPTIMIZE, 0, &err); if (!reg[i]) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to compile regex %s"), err->message); + _("Failed to compile regex %1$s"), err->message); for (j = 0; j < i; j++) g_regex_unref(reg[j]); VIR_FREE(reg); @@ -3397,7 +3395,7 @@ virCommandRunRegex(virCommand *cmd G_GNUC_UNUSED, int *exitstatus G_GNUC_UNUSED) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("%s not implemented on Win32"), __FUNCTION__); + _("%1$s not implemented on Win32"), __FUNCTION__); return -1; } @@ -3408,7 +3406,7 @@ virCommandRunNul(virCommand *cmd G_GNUC_UNUSED, void *data G_GNUC_UNUSED) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("%s not implemented on Win32"), __FUNCTION__); + _("%1$s not implemented on Win32"), __FUNCTION__); return -1; } #endif /* WIN32 */ diff --git a/src/util/virconf.c b/src/util/virconf.c index c39489973b..934632a35f 100644 --- a/src/util/virconf.c +++ b/src/util/virconf.c @@ -106,7 +106,7 @@ virConfErrorHelper(const char *file, const char *func, size_t line, /* Construct the string 'filename:line: info' if we have that. */ if (ctxt && ctxt->filename) { virReportErrorHelper(VIR_FROM_CONF, error, file, func, line, - _("%s:%d: %s"), ctxt->filename, ctxt->line, info); + _("%1$s:%2$d: %3$s"), ctxt->filename, ctxt->line, info); } else { virReportErrorHelper(VIR_FROM_CONF, error, file, func, line, "%s", info); @@ -870,7 +870,7 @@ int virConfGetValueString(virConf *conf, if (cval->type != VIR_CONF_STRING) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("%s: expected a string for '%s' parameter"), + _("%1$s: expected a string for '%2$s' parameter"), conf->filename, setting); return -1; } @@ -924,7 +924,7 @@ int virConfGetValueStringList(virConf *conf, for (len = 0, eval = cval->list; eval; len++, eval = eval->next) { if (eval->type != VIR_CONF_STRING) { virReportError(VIR_ERR_CONF_SYNTAX, - _("%s: expected a string list for '%s' parameter"), + _("%1$s: expected a string list for '%2$s' parameter"), conf->filename, setting); return -1; } @@ -950,8 +950,8 @@ int virConfGetValueStringList(virConf *conf, case VIR_CONF_NONE: virReportError(VIR_ERR_INTERNAL_ERROR, compatString ? - _("%s: expected a string or string list for '%s' parameter") : - _("%s: expected a string list for '%s' parameter"), + _("%1$s: expected a string or string list for '%2$s' parameter") : + _("%1$s: expected a string list for '%2$s' parameter"), conf->filename, setting); return -1; @@ -994,14 +994,14 @@ int virConfGetValueBool(virConf *conf, if (cval->type != VIR_CONF_ULLONG) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("%s: expected a bool for '%s' parameter"), + _("%1$s: expected a bool for '%2$s' parameter"), conf->filename, setting); return -1; } if (((unsigned long long)cval->l) > 1) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("%s: value for '%s' parameter must be 0 or 1"), + _("%1$s: value for '%2$s' parameter must be 0 or 1"), conf->filename, setting); return -1; } @@ -1043,14 +1043,14 @@ int virConfGetValueInt(virConf *conf, if (cval->type != VIR_CONF_LLONG && cval->type != VIR_CONF_ULLONG) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("%s: expected a signed integer for '%s' parameter"), + _("%1$s: expected a signed integer for '%2$s' parameter"), conf->filename, setting); return -1; } if (cval->l > INT_MAX || cval->l < INT_MIN) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("%s: value for '%s' parameter must be in range %d:%d"), + _("%1$s: value for '%2$s' parameter must be in range %3$d:%4$d"), conf->filename, setting, INT_MIN, INT_MAX); return -1; } @@ -1091,14 +1091,14 @@ int virConfGetValueUInt(virConf *conf, if (cval->type != VIR_CONF_ULLONG) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("%s: expected an unsigned integer for '%s' parameter"), + _("%1$s: expected an unsigned integer for '%2$s' parameter"), conf->filename, setting); return -1; } if (((unsigned long long)cval->l) > UINT_MAX) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("%s: value for '%s' parameter must be in range 0:%u"), + _("%1$s: value for '%2$s' parameter must be in range 0:%3$u"), conf->filename, setting, UINT_MAX); return -1; } @@ -1139,7 +1139,7 @@ int virConfGetValueSizeT(virConf *conf, if (cval->type != VIR_CONF_ULLONG) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("%s: expected an unsigned integer for '%s' parameter"), + _("%1$s: expected an unsigned integer for '%2$s' parameter"), conf->filename, setting); return -1; } @@ -1147,7 +1147,7 @@ int virConfGetValueSizeT(virConf *conf, #if ULLONG_MAX > SIZE_MAX if (((unsigned long long)cval->l) > SIZE_MAX) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("%s: value for '%s' parameter must be in range 0:%zu"), + _("%1$s: value for '%2$s' parameter must be in range 0:%3$zu"), conf->filename, setting, SIZE_MAX); return -1; } @@ -1190,7 +1190,7 @@ int virConfGetValueSSizeT(virConf *conf, if (cval->type == VIR_CONF_ULLONG) { if (((unsigned long long)cval->l) > SSIZE_MAX) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("%s: value for '%s' parameter must be in range %zd:%zd"), + _("%1$s: value for '%2$s' parameter must be in range %3$zd:%4$zd"), conf->filename, setting, (ssize_t)-SSIZE_MAX - 1, (ssize_t)SSIZE_MAX); return -1; } @@ -1198,14 +1198,14 @@ int virConfGetValueSSizeT(virConf *conf, #if SSIZE_MAX < LLONG_MAX if (cval->l < (-SSIZE_MAX - 1) || cval->l > SSIZE_MAX) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("%s: value for '%s' parameter must be in range %zd:%zd"), + _("%1$s: value for '%2$s' parameter must be in range %3$zd:%4$zd"), conf->filename, setting, (ssize_t)-SSIZE_MAX - 1, (ssize_t)SSIZE_MAX); return -1; } #endif } else { virReportError(VIR_ERR_INTERNAL_ERROR, - _("%s: expected a signed integer for '%s' parameter"), + _("%1$s: expected a signed integer for '%2$s' parameter"), conf->filename, setting); return -1; } @@ -1247,13 +1247,13 @@ int virConfGetValueLLong(virConf *conf, if (cval->type == VIR_CONF_ULLONG) { if (((unsigned long long)cval->l) > LLONG_MAX) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("%s: value for '%s' parameter must be in range %lld:%lld"), + _("%1$s: value for '%2$s' parameter must be in range %3$lld:%4$lld"), conf->filename, setting, LLONG_MIN, LLONG_MAX); return -1; } } else if (cval->type != VIR_CONF_LLONG) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("%s: expected a signed integer for '%s' parameter"), + _("%1$s: expected a signed integer for '%2$s' parameter"), conf->filename, setting); return -1; } @@ -1293,7 +1293,7 @@ int virConfGetValueULLong(virConf *conf, if (cval->type != VIR_CONF_ULLONG) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("%s: expected an unsigned integer for '%s' parameter"), + _("%1$s: expected an unsigned integer for '%2$s' parameter"), conf->filename, setting); return -1; } @@ -1332,7 +1332,7 @@ virConfSetValue(virConf *conf, if (*value && (*value)->type == VIR_CONF_STRING && !(*value)->str) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("expecting a value for value of type %s"), + _("expecting a value for value of type %1$s"), virConfTypeToString(VIR_CONF_STRING)); g_clear_pointer(value, virConfFreeValue); return -1; diff --git a/src/util/vircrypto.c b/src/util/vircrypto.c index 12d051a55a..3ce23264ca 100644 --- a/src/util/vircrypto.c +++ b/src/util/vircrypto.c @@ -56,14 +56,14 @@ virCryptoHashBuf(virCryptoHash hash, int rc; if (hash >= VIR_CRYPTO_HASH_LAST) { virReportError(VIR_ERR_INVALID_ARG, - _("Unknown crypto hash %d"), hash); + _("Unknown crypto hash %1$d"), hash); return -1; } rc = gnutls_hash_fast(hashinfo[hash].algorithm, input, strlen(input), output); if (rc < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to compute hash of data: %s"), + _("Unable to compute hash of data: %1$s"), gnutls_strerror(rc)); return -1; } @@ -133,7 +133,7 @@ virCryptoEncryptDataAESgnutls(gnutls_cipher_algorithm_t gnutls_enc_alg, if ((rc = gnutls_cipher_init(&handle, gnutls_enc_alg, &enc_key, &iv_buf)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("failed to initialize cipher: '%s'"), + _("failed to initialize cipher: '%1$s'"), gnutls_strerror(rc)); return -1; } @@ -160,7 +160,7 @@ virCryptoEncryptDataAESgnutls(gnutls_cipher_algorithm_t gnutls_enc_alg, if (rc < 0) { virSecureErase(ciphertext, ciphertextlen); virReportError(VIR_ERR_INTERNAL_ERROR, - _("failed to encrypt the data: '%s'"), + _("failed to encrypt the data: '%1$s'"), gnutls_strerror(rc)); return -1; } @@ -202,14 +202,14 @@ virCryptoEncryptData(virCryptoCipher algorithm, case VIR_CRYPTO_CIPHER_AES256CBC: if (enckeylen != 32) { virReportError(VIR_ERR_INVALID_ARG, - _("AES256CBC encryption invalid keylen=%zu"), + _("AES256CBC encryption invalid keylen=%1$zu"), enckeylen); return -1; } if (ivlen != 16) { virReportError(VIR_ERR_INVALID_ARG, - _("AES256CBC initialization vector invalid len=%zu"), + _("AES256CBC initialization vector invalid len=%1$zu"), ivlen); return -1; } @@ -230,6 +230,6 @@ virCryptoEncryptData(virCryptoCipher algorithm, } virReportError(VIR_ERR_INVALID_ARG, - _("algorithm=%d is not supported"), algorithm); + _("algorithm=%1$d is not supported"), algorithm); return -1; } diff --git a/src/util/virdaemon.c b/src/util/virdaemon.c index 00bd7095f6..7a288f81e4 100644 --- a/src/util/virdaemon.c +++ b/src/util/virdaemon.c @@ -123,14 +123,14 @@ virDaemonForkIntoBackground(const char *argv0) if (ret != 1) { fprintf(stderr, - _("%s: error: unable to determine if daemon is " - "running: %s\n"), argv0, + _("%1$s: error: unable to determine if daemon is running: %2$s\n"), + argv0, g_strerror(errno)); exit(EXIT_FAILURE); } else if (status != 0) { fprintf(stderr, - _("%s: error: %s. Check /var/log/messages or run without " - "--daemon for more info.\n"), argv0, + _("%1$s: error: %2$s. Check /var/log/messages or run without --daemon for more info.\n"), + argv0, virDaemonErrTypeToString(status)); exit(EXIT_FAILURE); } diff --git a/src/util/virdevmapper.c b/src/util/virdevmapper.c index 7796e7719b..33cf3e202b 100644 --- a/src/util/virdevmapper.c +++ b/src/util/virdevmapper.c @@ -82,7 +82,7 @@ virDevMapperGetMajor(unsigned int *major) if (!lines[i]) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to find major for %s"), + _("Unable to find major for %1$s"), DM_NAME); return -1; } @@ -154,7 +154,7 @@ virDMOpen(void) if (dm.version[0] != DM_VERSION_MAJOR) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, - _("Unsupported device-mapper version. Expected %d got %d"), + _("Unsupported device-mapper version. Expected %1$d got %2$d"), DM_VERSION_MAJOR, dm.version[0]); return -1; } @@ -185,7 +185,7 @@ virDMSanitizepath(const char *path) /* It's a path. Check if the last component is DM name */ if (stat(path, &sb[0]) < 0) { virReportError(errno, - _("Unable to stat %p"), + _("Unable to stat %1$p"), path); return NULL; } @@ -252,7 +252,7 @@ virDevMapperGetTargetsImpl(int controlFD, return 0; virReportSystemError(errno, - _("Unable to query dependencies for %s"), + _("Unable to query dependencies for %1$s"), path); return -1; } diff --git a/src/util/virdnsmasq.c b/src/util/virdnsmasq.c index 342b489ab7..91106b5a28 100644 --- a/src/util/virdnsmasq.c +++ b/src/util/virdnsmasq.c @@ -230,7 +230,7 @@ addnhostsSave(dnsmasqAddnHostsfile *addnhostsfile) addnhostsfile->nhosts); if (err < 0) { - virReportSystemError(-err, _("cannot write config file '%s'"), + virReportSystemError(-err, _("cannot write config file '%1$s'"), addnhostsfile->path); return -1; } @@ -245,7 +245,7 @@ genericFileDelete(char *path) return 0; if (unlink(path) < 0) { - virReportSystemError(errno, _("cannot remove config file '%s'"), + virReportSystemError(errno, _("cannot remove config file '%1$s'"), path); return -1; } @@ -400,7 +400,7 @@ hostsfileSave(dnsmasqHostsfile *hostsfile) hostsfile->nhosts); if (err < 0) { - virReportSystemError(-err, _("cannot write config file '%s'"), + virReportSystemError(-err, _("cannot write config file '%1$s'"), hostsfile->path); return -1; } @@ -509,7 +509,7 @@ dnsmasqSave(const dnsmasqContext *ctx) int ret = 0; if (g_mkdir_with_parents(ctx->config_dir, 0777) < 0) { - virReportSystemError(errno, _("cannot create config directory '%s'"), + virReportSystemError(errno, _("cannot create config directory '%1$s'"), ctx->config_dir); return -1; } @@ -556,8 +556,7 @@ dnsmasqReload(pid_t pid G_GNUC_UNUSED) #ifndef WIN32 if (kill(pid, SIGHUP) != 0) { virReportSystemError(errno, - _("Failed to make dnsmasq (PID: %d)" - " reload config files."), + _("Failed to make dnsmasq (PID: %1$d) reload config files."), pid); return -1; } @@ -617,7 +616,7 @@ dnsmasqCapsSetFromBuffer(dnsmasqCaps *caps, const char *buf) if (version < DNSMASQ_MIN_MAJOR * 1000000 + DNSMASQ_MIN_MINOR * 1000) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("dnsmasq version >= %u.%u required but %lu.%lu found"), + _("dnsmasq version >= %1$u.%2$u required but %3$lu.%4$lu found"), DNSMASQ_MIN_MAJOR, DNSMASQ_MIN_MINOR, version / 1000000, version % 1000000 / 1000); @@ -636,7 +635,7 @@ dnsmasqCapsSetFromBuffer(dnsmasqCaps *caps, const char *buf) else len = p - buf; virReportError(VIR_ERR_INTERNAL_ERROR, - _("cannot parse %s version number in '%.*s'"), + _("cannot parse %1$s version number in '%3$.*2$s'"), caps->binaryPath, len, buf); return -1; diff --git a/src/util/virerror.c b/src/util/virerror.c index d114c0a346..0bfa803b1f 100644 --- a/src/util/virerror.c +++ b/src/util/virerror.c @@ -957,115 +957,115 @@ static const virErrorMsgTuple virErrorMsgStrings[] = { [VIR_ERR_OK] = { NULL, NULL }, [VIR_ERR_INTERNAL_ERROR] = { N_("internal error"), - N_("internal error: %s") }, + N_("internal error: %1$s") }, [VIR_ERR_NO_MEMORY] = { N_("out of memory"), - N_("out of memory: %s") }, + N_("out of memory: %1$s") }, [VIR_ERR_NO_SUPPORT] = { N_("this function is not supported by the connection driver"), - N_("this function is not supported by the connection driver: %s") }, + N_("this function is not supported by the connection driver: %1$s") }, [VIR_ERR_UNKNOWN_HOST] = { N_("unknown host"), - N_("unknown host %s") }, + N_("unknown host %1$s") }, [VIR_ERR_NO_CONNECT] = { N_("no connection driver available"), - N_("no connection driver available for %s") }, + N_("no connection driver available for %1$s") }, [VIR_ERR_INVALID_CONN] = { N_("invalid connection pointer in"), - N_("invalid connection pointer in %s") }, + N_("invalid connection pointer in %1$s") }, [VIR_ERR_INVALID_DOMAIN] = { N_("invalid domain pointer in"), - N_("invalid domain pointer in %s") }, + N_("invalid domain pointer in %1$s") }, [VIR_ERR_INVALID_ARG] = { N_("invalid argument"), - N_("invalid argument: %s") }, + N_("invalid argument: %1$s") }, [VIR_ERR_OPERATION_FAILED] = { N_("operation failed"), - N_("operation failed: %s") }, + N_("operation failed: %1$s") }, [VIR_ERR_GET_FAILED] = { N_("GET operation failed"), - N_("GET operation failed: %s") }, + N_("GET operation failed: %1$s") }, [VIR_ERR_POST_FAILED] = { N_("POST operation failed"), - N_("POST operation failed: %s") }, + N_("POST operation failed: %1$s") }, [VIR_ERR_HTTP_ERROR] = { N_("got unknown HTTP error code"), - N_("got unknown HTTP error code %s") }, + N_("got unknown HTTP error code %1$s") }, [VIR_ERR_SEXPR_SERIAL] = { N_("failed to serialize S-Expr"), - N_("failed to serialize S-Expr: %s") }, + N_("failed to serialize S-Expr: %1$s") }, [VIR_ERR_NO_XEN] = { N_("could not use Xen hypervisor entry"), - N_("could not use Xen hypervisor entry %s") }, + N_("could not use Xen hypervisor entry %1$s") }, [VIR_ERR_XEN_CALL] = { N_("failed Xen syscall"), - N_("failed Xen syscall %s") }, + N_("failed Xen syscall %1$s") }, [VIR_ERR_OS_TYPE] = { N_("unknown OS type"), - N_("unknown OS type %s") }, + N_("unknown OS type %1$s") }, [VIR_ERR_NO_KERNEL] = { N_("missing kernel information"), - N_("missing kernel information: %s") }, + N_("missing kernel information: %1$s") }, [VIR_ERR_NO_ROOT] = { N_("missing root device information"), - N_("missing root device information in %s") }, + N_("missing root device information in %1$s") }, [VIR_ERR_NO_SOURCE] = { N_("missing source information for device"), - N_("missing source information for device %s") }, + N_("missing source information for device %1$s") }, [VIR_ERR_NO_TARGET] = { N_("missing target information for device"), - N_("missing target information for device %s") }, + N_("missing target information for device %1$s") }, [VIR_ERR_NO_NAME] = { N_("missing name information"), - N_("missing name information in %s") }, + N_("missing name information in %1$s") }, [VIR_ERR_NO_OS] = { N_("missing operating system information"), - N_("missing operating system information for %s") }, + N_("missing operating system information for %1$s") }, [VIR_ERR_NO_DEVICE] = { N_("missing devices information"), - N_("missing devices information for %s") }, + N_("missing devices information for %1$s") }, [VIR_ERR_NO_XENSTORE] = { N_("could not connect to Xen Store"), - N_("could not connect to Xen Store %s") }, + N_("could not connect to Xen Store %1$s") }, [VIR_ERR_DRIVER_FULL] = { N_("too many drivers registered"), - N_("too many drivers registered in %s") }, + N_("too many drivers registered in %1$s") }, [VIR_ERR_CALL_FAILED] = { N_("library call failed"), - N_("library call failed: %s") }, + N_("library call failed: %1$s") }, [VIR_ERR_XML_ERROR] = { N_("XML description is invalid or not well formed"), - N_("XML error: %s") }, + N_("XML error: %1$s") }, [VIR_ERR_DOM_EXIST] = { N_("this domain exists already"), - N_("domain %s exists already") }, + N_("domain %1$s exists already") }, [VIR_ERR_OPERATION_DENIED] = { N_("operation forbidden for read only access"), - N_("operation forbidden: %s") }, + N_("operation forbidden: %1$s") }, [VIR_ERR_OPEN_FAILED] = { N_("failed to open configuration file"), - N_("failed to open configuration file %s") }, + N_("failed to open configuration file %1$s") }, [VIR_ERR_READ_FAILED] = { N_("failed to read configuration file"), - N_("failed to read configuration file %s") }, + N_("failed to read configuration file %1$s") }, [VIR_ERR_PARSE_FAILED] = { N_("failed to parse configuration file"), - N_("failed to parse configuration file %s") }, + N_("failed to parse configuration file %1$s") }, [VIR_ERR_CONF_SYNTAX] = { N_("configuration file syntax error"), - N_("configuration file syntax error: %s") }, + N_("configuration file syntax error: %1$s") }, [VIR_ERR_WRITE_FAILED] = { N_("failed to write configuration file"), - N_("failed to write configuration file: %s") }, + N_("failed to write configuration file: %1$s") }, [VIR_ERR_XML_DETAIL] = { N_("parser error"), "%s" }, [VIR_ERR_INVALID_NETWORK] = { N_("invalid network pointer in"), - N_("invalid network pointer in %s") }, + N_("invalid network pointer in %1$s") }, [VIR_ERR_NETWORK_EXIST] = { N_("this network exists already"), - N_("network %s exists already") }, + N_("network %1$s exists already") }, [VIR_ERR_SYSTEM_ERROR] = { N_("system call error"), "%s" }, @@ -1077,214 +1077,214 @@ static const virErrorMsgTuple virErrorMsgStrings[] = { "%s" }, [VIR_WAR_NO_NETWORK] = { N_("Failed to find the network"), - N_("Failed to find the network: %s") }, + N_("Failed to find the network: %1$s") }, [VIR_ERR_NO_DOMAIN] = { N_("Domain not found"), - N_("Domain not found: %s") }, + N_("Domain not found: %1$s") }, [VIR_ERR_NO_NETWORK] = { N_("Network not found"), - N_("Network not found: %s") }, + N_("Network not found: %1$s") }, [VIR_ERR_INVALID_MAC] = { N_("invalid MAC address"), - N_("invalid MAC address: %s") }, + N_("invalid MAC address: %1$s") }, [VIR_ERR_AUTH_FAILED] = { N_("authentication failed"), - N_("authentication failed: %s") }, + N_("authentication failed: %1$s") }, [VIR_ERR_INVALID_STORAGE_POOL] = { N_("invalid storage pool pointer in"), - N_("invalid storage pool pointer in %s") }, + N_("invalid storage pool pointer in %1$s") }, [VIR_ERR_INVALID_STORAGE_VOL] = { N_("invalid storage volume pointer in"), - N_("invalid storage volume pointer in %s") }, + N_("invalid storage volume pointer in %1$s") }, [VIR_WAR_NO_STORAGE] = { N_("Failed to find a storage driver"), - N_("Failed to find a storage driver: %s") }, + N_("Failed to find a storage driver: %1$s") }, [VIR_ERR_NO_STORAGE_POOL] = { N_("Storage pool not found"), - N_("Storage pool not found: %s") }, + N_("Storage pool not found: %1$s") }, [VIR_ERR_NO_STORAGE_VOL] = { N_("Storage volume not found"), - N_("Storage volume not found: %s") }, + N_("Storage volume not found: %1$s") }, [VIR_WAR_NO_NODE] = { N_("Failed to find a node driver"), - N_("Failed to find a node driver: %s") }, + N_("Failed to find a node driver: %1$s") }, [VIR_ERR_INVALID_NODE_DEVICE] = { N_("invalid node device pointer"), - N_("invalid node device pointer in %s") }, + N_("invalid node device pointer in %1$s") }, [VIR_ERR_NO_NODE_DEVICE] = { N_("Node device not found"), - N_("Node device not found: %s") }, + N_("Node device not found: %1$s") }, [VIR_ERR_NO_SECURITY_MODEL] = { N_("Security model not found"), - N_("Security model not found: %s") }, + N_("Security model not found: %1$s") }, [VIR_ERR_OPERATION_INVALID] = { N_("Requested operation is not valid"), - N_("Requested operation is not valid: %s") }, + N_("Requested operation is not valid: %1$s") }, [VIR_WAR_NO_INTERFACE] = { N_("Failed to find the interface"), - N_("Failed to find the interface: %s") }, + N_("Failed to find the interface: %1$s") }, [VIR_ERR_NO_INTERFACE] = { N_("Interface not found"), - N_("Interface not found: %s") }, + N_("Interface not found: %1$s") }, [VIR_ERR_INVALID_INTERFACE] = { N_("invalid interface pointer in"), - N_("invalid interface pointer in %s") }, + N_("invalid interface pointer in %1$s") }, [VIR_ERR_MULTIPLE_INTERFACES] = { N_("multiple matching interfaces found"), - N_("multiple matching interfaces found: %s") }, + N_("multiple matching interfaces found: %1$s") }, [VIR_WAR_NO_NWFILTER] = { N_("Failed to start the nwfilter driver"), - N_("Failed to start the nwfilter driver: %s") }, + N_("Failed to start the nwfilter driver: %1$s") }, [VIR_ERR_INVALID_NWFILTER] = { N_("Invalid network filter"), - N_("Invalid network filter: %s") }, + N_("Invalid network filter: %1$s") }, [VIR_ERR_NO_NWFILTER] = { N_("Network filter not found"), - N_("Network filter not found: %s") }, + N_("Network filter not found: %1$s") }, [VIR_ERR_BUILD_FIREWALL] = { N_("Error while building firewall"), - N_("Error while building firewall: %s") }, + N_("Error while building firewall: %1$s") }, [VIR_WAR_NO_SECRET] = { N_("Failed to find a secret storage driver"), - N_("Failed to find a secret storage driver: %s") }, + N_("Failed to find a secret storage driver: %1$s") }, [VIR_ERR_INVALID_SECRET] = { N_("Invalid secret"), - N_("Invalid secret: %s") }, + N_("Invalid secret: %1$s") }, [VIR_ERR_NO_SECRET] = { N_("Secret not found"), - N_("Secret not found: %s") }, + N_("Secret not found: %1$s") }, [VIR_ERR_CONFIG_UNSUPPORTED] = { N_("unsupported configuration"), - N_("unsupported configuration: %s") }, + N_("unsupported configuration: %1$s") }, [VIR_ERR_OPERATION_TIMEOUT] = { N_("Timed out during operation"), - N_("Timed out during operation: %s") }, + N_("Timed out during operation: %1$s") }, [VIR_ERR_MIGRATE_PERSIST_FAILED] = { N_("Failed to make domain persistent after migration"), - N_("Failed to make domain persistent after migration: %s") }, + N_("Failed to make domain persistent after migration: %1$s") }, [VIR_ERR_HOOK_SCRIPT_FAILED] = { N_("Hook script execution failed"), - N_("Hook script execution failed: %s") }, + N_("Hook script execution failed: %1$s") }, [VIR_ERR_INVALID_DOMAIN_SNAPSHOT] = { N_("Invalid domain snapshot"), - N_("Invalid domain snapshot: %s") }, + N_("Invalid domain snapshot: %1$s") }, [VIR_ERR_NO_DOMAIN_SNAPSHOT] = { N_("Domain snapshot not found"), - N_("Domain snapshot not found: %s") }, + N_("Domain snapshot not found: %1$s") }, [VIR_ERR_INVALID_STREAM] = { N_("invalid stream pointer"), - N_("invalid stream pointer in %s") }, + N_("invalid stream pointer in %1$s") }, [VIR_ERR_ARGUMENT_UNSUPPORTED] = { N_("argument unsupported"), - N_("argument unsupported: %s") }, + N_("argument unsupported: %1$s") }, [VIR_ERR_STORAGE_PROBE_FAILED] = { N_("Storage pool probe failed"), - N_("Storage pool probe failed: %s") }, + N_("Storage pool probe failed: %1$s") }, [VIR_ERR_STORAGE_POOL_BUILT] = { N_("Storage pool already built"), - N_("Storage pool already built: %s") }, + N_("Storage pool already built: %1$s") }, [VIR_ERR_SNAPSHOT_REVERT_RISKY] = { N_("revert requires force"), - N_("revert requires force: %s") }, + N_("revert requires force: %1$s") }, [VIR_ERR_OPERATION_ABORTED] = { N_("operation aborted"), - N_("operation aborted: %s") }, + N_("operation aborted: %1$s") }, [VIR_ERR_AUTH_CANCELLED] = { N_("authentication cancelled"), - N_("authentication cancelled: %s") }, + N_("authentication cancelled: %1$s") }, [VIR_ERR_NO_DOMAIN_METADATA] = { N_("metadata not found"), - N_("metadata not found: %s") }, + N_("metadata not found: %1$s") }, [VIR_ERR_MIGRATE_UNSAFE] = { N_("Unsafe migration"), - N_("Unsafe migration: %s") }, + N_("Unsafe migration: %1$s") }, [VIR_ERR_OVERFLOW] = { N_("numerical overflow"), - N_("numerical overflow: %s") }, + N_("numerical overflow: %1$s") }, [VIR_ERR_BLOCK_COPY_ACTIVE] = { N_("block copy still active"), - N_("block copy still active: %s") }, + N_("block copy still active: %1$s") }, [VIR_ERR_OPERATION_UNSUPPORTED] = { N_("Operation not supported"), - N_("Operation not supported: %s") }, + N_("Operation not supported: %1$s") }, [VIR_ERR_SSH] = { N_("SSH transport error"), - N_("SSH transport error: %s") }, + N_("SSH transport error: %1$s") }, [VIR_ERR_AGENT_UNRESPONSIVE] = { N_("Guest agent is not responding"), - N_("Guest agent is not responding: %s") }, + N_("Guest agent is not responding: %1$s") }, [VIR_ERR_RESOURCE_BUSY] = { N_("resource busy"), - N_("resource busy: %s") }, + N_("resource busy: %1$s") }, [VIR_ERR_ACCESS_DENIED] = { N_("access denied"), - N_("access denied: %s") }, + N_("access denied: %1$s") }, [VIR_ERR_DBUS_SERVICE] = { N_("error from service"), - N_("error from service: %s") }, + N_("error from service: %1$s") }, [VIR_ERR_STORAGE_VOL_EXIST] = { N_("this storage volume exists already"), - N_("storage volume %s exists already") }, + N_("storage volume %1$s exists already") }, [VIR_ERR_CPU_INCOMPATIBLE] = { N_("the CPU is incompatible with host CPU"), - N_("the CPU is incompatible with host CPU: %s") }, + N_("the CPU is incompatible with host CPU: %1$s") }, [VIR_ERR_XML_INVALID_SCHEMA] = { N_("XML document failed to validate against schema"), - N_("XML document failed to validate against schema: %s") }, + N_("XML document failed to validate against schema: %1$s") }, [VIR_ERR_MIGRATE_FINISH_OK] = { N_("migration successfully aborted"), - N_("migration successfully aborted: %s") }, + N_("migration successfully aborted: %1$s") }, [VIR_ERR_AUTH_UNAVAILABLE] = { N_("authentication unavailable"), - N_("authentication unavailable: %s") }, + N_("authentication unavailable: %1$s") }, [VIR_ERR_NO_SERVER] = { N_("Server not found"), - N_("Server not found: %s") }, + N_("Server not found: %1$s") }, [VIR_ERR_NO_CLIENT] = { N_("Client not found"), - N_("Client not found: %s") }, + N_("Client not found: %1$s") }, [VIR_ERR_AGENT_UNSYNCED] = { N_("guest agent replied with wrong id to guest-sync command"), - N_("guest agent replied with wrong id to guest-sync command: %s") }, + N_("guest agent replied with wrong id to guest-sync command: %1$s") }, [VIR_ERR_LIBSSH] = { N_("libssh transport error"), - N_("libssh transport error: %s") }, + N_("libssh transport error: %1$s") }, [VIR_ERR_DEVICE_MISSING] = { N_("device not found"), - N_("device not found: %s") }, + N_("device not found: %1$s") }, [VIR_ERR_INVALID_NWFILTER_BINDING] = { N_("Invalid network filter binding"), - N_("Invalid network filter binding: %s") }, + N_("Invalid network filter binding: %1$s") }, [VIR_ERR_NO_NWFILTER_BINDING] = { N_("Network filter binding not found"), - N_("Network filter binding not found: %s") }, + N_("Network filter binding not found: %1$s") }, [VIR_ERR_INVALID_DOMAIN_CHECKPOINT] = { N_("Invalid domain checkpoint"), - N_("Invalid domain checkpoint: %s") }, + N_("Invalid domain checkpoint: %1$s") }, [VIR_ERR_NO_DOMAIN_CHECKPOINT] = { N_("Domain checkpoint not found"), - N_("Domain checkpoint not found: %s") }, + N_("Domain checkpoint not found: %1$s") }, [VIR_ERR_NO_DOMAIN_BACKUP] = { N_("Domain backup job id not found"), - N_("Domain backup job id not found: %s") }, + N_("Domain backup job id not found: %1$s") }, [VIR_ERR_INVALID_NETWORK_PORT] = { N_("Invalid network port pointer"), - N_("Invalid network port pointer: %s") }, + N_("Invalid network port pointer: %1$s") }, [VIR_ERR_NETWORK_PORT_EXIST] = { N_("this network port exists already"), - N_("network port %s exists already") }, + N_("network port %1$s exists already") }, [VIR_ERR_NO_NETWORK_PORT] = { N_("network port not found"), - N_("network port not found: %s") }, + N_("network port not found: %1$s") }, [VIR_ERR_NO_HOSTNAME] = { N_("no hostname found"), - N_("no hostname found: %s") }, + N_("no hostname found: %1$s") }, [VIR_ERR_CHECKPOINT_INCONSISTENT] = { N_("checkpoint inconsistent"), - N_("checkpoint inconsistent: %s") }, + N_("checkpoint inconsistent: %1$s") }, [VIR_ERR_MULTIPLE_DOMAINS] = { N_("multiple matching domains found"), - N_("multiple matching domains found: %s") }, + N_("multiple matching domains found: %1$s") }, }; G_STATIC_ASSERT(G_N_ELEMENTS(virErrorMsgStrings) == VIR_ERR_NUMBER_LAST); diff --git a/src/util/virerror.h b/src/util/virerror.h index bec3863c3f..ee85247433 100644 --- a/src/util/virerror.h +++ b/src/util/virerror.h @@ -76,7 +76,7 @@ void virReportSystemErrorFull(int domcode, #argname, \ NULL, \ 0, 0, \ - _("%s in %s must be NULL"), \ + _("%1$s in %2$s must be NULL"), \ #argname, __FUNCTION__) #define virReportInvalidNonNullArg(argname) \ virRaiseErrorFull(__FILE__, __FUNCTION__, __LINE__, \ @@ -87,7 +87,7 @@ void virReportSystemErrorFull(int domcode, #argname, \ NULL, \ 0, 0, \ - _("%s in %s must not be NULL"), \ + _("%1$s in %2$s must not be NULL"), \ #argname, __FUNCTION__) #define virReportInvalidEmptyStringArg(argname) \ virRaiseErrorFull(__FILE__, __FUNCTION__, __LINE__, \ @@ -98,7 +98,7 @@ void virReportSystemErrorFull(int domcode, #argname, \ NULL, \ 0, 0, \ - _("string %s in %s must not be empty"), \ + _("string %1$s in %2$s must not be empty"), \ #argname, __FUNCTION__) #define virReportInvalidPositiveArg(argname) \ virRaiseErrorFull(__FILE__, __FUNCTION__, __LINE__, \ @@ -109,7 +109,7 @@ void virReportSystemErrorFull(int domcode, #argname, \ NULL, \ 0, 0, \ - _("%s in %s must be greater than zero"), \ + _("%1$s in %2$s must be greater than zero"), \ #argname, __FUNCTION__) #define virReportInvalidNonZeroArg(argname) \ virRaiseErrorFull(__FILE__, __FUNCTION__, __LINE__, \ @@ -120,7 +120,7 @@ void virReportSystemErrorFull(int domcode, #argname, \ NULL, \ 0, 0, \ - _("%s in %s must not be zero"), \ + _("%1$s in %2$s must not be zero"), \ #argname, __FUNCTION__) #define virReportInvalidZeroArg(argname) \ virRaiseErrorFull(__FILE__, __FUNCTION__, __LINE__, \ @@ -131,7 +131,7 @@ void virReportSystemErrorFull(int domcode, #argname, \ NULL, \ 0, 0, \ - _("%s in %s must be zero"), \ + _("%1$s in %2$s must be zero"), \ #argname, __FUNCTION__) #define virReportInvalidNonNegativeArg(argname) \ virRaiseErrorFull(__FILE__, __FUNCTION__, __LINE__, \ @@ -142,7 +142,7 @@ void virReportSystemErrorFull(int domcode, #argname, \ NULL, \ 0, 0, \ - _("%s in %s must be zero or greater"), \ + _("%1$s in %2$s must be zero or greater"), \ #argname, __FUNCTION__) #define virReportInvalidArg(argname, fmt, ...) \ virRaiseErrorFull(__FILE__, __FUNCTION__, __LINE__, \ diff --git a/src/util/vireventthread.c b/src/util/vireventthread.c index 8342f420f6..20d52b9efb 100644 --- a/src/util/vireventthread.c +++ b/src/util/vireventthread.c @@ -162,7 +162,7 @@ virEventThreadStart(virEventThread *evt, const char *name) if (!evt->thread) { virEventThreadDataFree(data); virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to start event thread: %s"), + _("Unable to start event thread: %1$s"), gerr->message); return -1; } diff --git a/tests/virerrortest.c b/tests/virerrortest.c index 85f4071ae8..c1b1a2ba65 100644 --- a/tests/virerrortest.c +++ b/tests/virerrortest.c @@ -29,8 +29,11 @@ virErrorTestMsgFormatInfoOne(const char *msg) char *next; int ret = 0; + if (STREQ(msg, "%s")) + return 0; + for (next = (char *)msg; (next = strchr(next, '%')); next++) { - if (next[1] != 's') { + if (!STRPREFIX(next + 1, "1$s")) { VIR_TEST_VERBOSE("\nerror message '%s' contains disallowed printf modifiers", msg); ret = -1; } else { @@ -44,7 +47,7 @@ virErrorTestMsgFormatInfoOne(const char *msg) } if (!found) { - VIR_TEST_VERBOSE("\nerror message '%s' does not contain any %%s modifiers", msg); + VIR_TEST_VERBOSE("\nerror message '%s' does not contain correct %%s modifiers", msg); ret = -1; } -- 2.39.2

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com&gt; --- src/util/virnetdevbandwidth.c | 7 +- src/util/virnetdevbridge.c | 64 +++++++++--------- src/util/virnetdevip.c | 28 ++++---- src/util/virnetdevmacvlan.c | 4 +- src/util/virnetdevmidonet.c | 4 +- src/util/virnetdevopenvswitch.c | 28 ++++---- src/util/virnetdevtap.c | 24 +++---- src/util/virnetdevveth.c | 4 +- src/util/virnetdevvportprofile.c | 39 +++++------ src/util/virnetlink.c | 14 ++-- src/util/virnodesuspend.c | 2 +- src/util/virnuma.c | 26 ++++---- src/util/virnvme.c | 6 +- src/util/virobject.c | 6 +- src/util/virpci.c | 108 ++++++++++++++----------------- src/util/virperf.c | 8 +-- src/util/virpidfile.c | 14 ++-- src/util/virpolkit.c | 2 +- src/util/virportallocator.c | 10 +-- src/util/virprocess.c | 61 ++++++++--------- src/util/virrandom.c | 2 +- src/util/virresctrl.c | 86 +++++++++++------------- src/util/virrotatingfile.c | 30 ++++----- src/util/virscsi.c | 6 +- src/util/virscsihost.c | 7 +- src/util/virscsivhost.c | 6 +- src/util/virsecret.c | 5 +- src/util/virsocketaddr.c | 51 ++++++--------- src/util/virstoragefile.c | 2 +- src/util/virstring.c | 8 +-- src/util/virsysinfo.c | 16 ++--- src/util/virsystemd.c | 2 +- src/util/virthreadjob.c | 4 +- src/util/virtpm.c | 10 +-- src/util/virtypedparam-public.c | 25 +++---- src/util/virtypedparam.c | 29 ++++----- src/util/viruri.c | 11 ++-- src/util/virusb.c | 16 ++--- src/util/virutil.c | 35 +++++----- src/util/virvhba.c | 7 +- src/util/virxml.c | 72 ++++++++++----------- 41 files changed, 415 insertions(+), 474 deletions(-) diff --git a/src/util/virnetdevbandwidth.c b/src/util/virnetdevbandwidth.c index e67cbd164d..52fb94a9fc 100644 --- a/src/util/virnetdevbandwidth.c +++ b/src/util/virnetdevbandwidth.c @@ -548,7 +548,7 @@ virNetDevBandwidthPlug(const char *brname, char ifmacStr[VIR_MAC_STRING_BUFLEN]; if (id <= 2) { - virReportError(VIR_ERR_INTERNAL_ERROR, _("Invalid class ID %d"), id); + virReportError(VIR_ERR_INTERNAL_ERROR, _("Invalid class ID %1$d"), id); return -1; } @@ -556,8 +556,7 @@ virNetDevBandwidthPlug(const char *brname, if (!net_bandwidth || !net_bandwidth->in) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Bridge '%s' has no QoS set, therefore " - "unable to set 'floor' on '%s'"), + _("Bridge '%1$s' has no QoS set, therefore unable to set 'floor' on '%2$s'"), brname, ifmacStr); return -1; } @@ -613,7 +612,7 @@ virNetDevBandwidthUnplug(const char *brname, g_autofree char *qdisc_id = NULL; if (id <= 2) { - virReportError(VIR_ERR_INTERNAL_ERROR, _("Invalid class ID %d"), id); + virReportError(VIR_ERR_INTERNAL_ERROR, _("Invalid class ID %1$d"), id); return -1; } diff --git a/src/util/virnetdevbridge.c b/src/util/virnetdevbridge.c index f1a1c7f509..b870e26e5f 100644 --- a/src/util/virnetdevbridge.c +++ b/src/util/virnetdevbridge.c @@ -70,7 +70,7 @@ static int virNetDevBridgeCmd(const char *brname, if (virStrcpyStatic(ifd.ifd_name, brname) < 0) { virReportSystemError(ERANGE, - _("Network interface name '%s' is too long"), + _("Network interface name '%1$s' is too long"), brname); return -1; } @@ -117,7 +117,7 @@ static int virNetDevBridgeSet(const char *brname, paramid = BRCTL_SET_BRIDGE_FORWARD_DELAY; } else { virReportSystemError(EINVAL, - _("Unable to set bridge %s %s via ioctl"), + _("Unable to set bridge %1$s %2$s via ioctl"), brname, paramname); return -1; } @@ -126,7 +126,7 @@ static int virNetDevBridgeSet(const char *brname, ifr->ifr_data = (char*)&args; if (ioctl(fd, SIOCDEVPRIVATE, ifr) < 0) { virReportSystemError(errno, - _("Failed to set bridge %s %s via ioctl"), + _("Failed to set bridge %1$s %2$s via ioctl"), brname, paramname); return -1; } @@ -154,7 +154,7 @@ static int virNetDevBridgeGet(const char *brname, if (virStrToLong_ul(valuestr, NULL, 10, value) < 0) { virReportSystemError(EINVAL, - _("Unable to get bridge %s %s"), + _("Unable to get bridge %1$s %2$s"), brname, paramname); return -1; } @@ -168,7 +168,7 @@ static int virNetDevBridgeGet(const char *brname, ifr.ifr_data = (char*)&args; if (ioctl(fd, SIOCDEVPRIVATE, ifr) < 0) { virReportSystemError(errno, - _("Unable to get bridge %s %s"), brname, paramname); + _("Unable to get bridge %1$s %2$s"), brname, paramname); return -1; } @@ -178,7 +178,7 @@ static int virNetDevBridgeGet(const char *brname, *value = info.forward_delay; } else { virReportSystemError(EINVAL, - _("Unable to get bridge %s %s"), brname, paramname); + _("Unable to get bridge %1$s %2$s"), brname, paramname); return -1; } } @@ -210,7 +210,7 @@ virNetDevBridgePortSet(const char *brname, if (ret < 0) { virReportSystemError(errno, - _("Unable to set bridge %s port %s %s to %s"), + _("Unable to set bridge %1$s port %2$s %3$s to %4$s"), brname, ifname, paramname, valuestr); } @@ -235,7 +235,7 @@ virNetDevBridgePortGet(const char *brname, if (virStrToLong_ul(valuestr, NULL, 10, value) < 0) { virReportSystemError(EINVAL, - _("Unable to get bridge %s port %s %s"), + _("Unable to get bridge %1$s port %2$s %3$s"), brname, ifname, paramname); return -1; } @@ -404,7 +404,7 @@ virNetDevBridgeCreateWithIoctl(const char *brname, if (ioctl(fd, SIOCBRADDBR, brname) < 0) { virReportSystemError(errno, - _("Unable to create bridge %s"), brname); + _("Unable to create bridge %1$s"), brname); return -1; } @@ -441,7 +441,7 @@ virNetDevBridgeCreate(const char *brname, } # endif if (error < 0) - virReportSystemError(-error, _("error creating bridge interface %s"), + virReportSystemError(-error, _("error creating bridge interface %1$s"), brname); return -1; @@ -497,7 +497,7 @@ virNetDevBridgeCreate(const char *brname, const virMacAddr *mac G_GNUC_UNUSED) { virReportSystemError(ENOSYS, - _("Unable to create bridge %s"), brname); + _("Unable to create bridge %1$s"), brname); return -1; } #endif @@ -523,7 +523,7 @@ virNetDevBridgeDeleteWithIoctl(const char *brname) if (ioctl(fd, SIOCBRDELBR, brname) < 0) { virReportSystemError(errno, - _("Unable to delete bridge %s"), brname); + _("Unable to delete bridge %1$s"), brname); return -1; } @@ -568,7 +568,7 @@ virNetDevBridgeDelete(const char *brname) if (ioctl(s, SIOCIFDESTROY, &ifr) < 0) { virReportSystemError(errno, - _("Unable to remove bridge %s"), + _("Unable to remove bridge %1$s"), brname); return -1; } @@ -579,7 +579,7 @@ virNetDevBridgeDelete(const char *brname) int virNetDevBridgeDelete(const char *brname G_GNUC_UNUSED) { virReportSystemError(ENOSYS, - _("Unable to delete bridge %s"), brname); + _("Unable to delete bridge %1$s"), brname); return EINVAL; } #endif @@ -605,13 +605,13 @@ int virNetDevBridgeAddPort(const char *brname, if (!(ifr.ifr_ifindex = if_nametoindex(ifname))) { virReportSystemError(ENODEV, - _("Unable to get interface index for %s"), ifname); + _("Unable to get interface index for %1$s"), ifname); return -1; } if (ioctl(fd, SIOCBRADDIF, &ifr) < 0) { virReportSystemError(errno, - _("Unable to add bridge %s port %s"), brname, ifname); + _("Unable to add bridge %1$s port %2$s"), brname, ifname); return -1; } @@ -626,14 +626,14 @@ int virNetDevBridgeAddPort(const char *brname, memset(&req, 0, sizeof(req)); if (virStrcpyStatic(req.ifbr_ifsname, ifname) < 0) { virReportSystemError(ERANGE, - _("Network interface name '%s' is too long"), + _("Network interface name '%1$s' is too long"), ifname); return -1; } if (virNetDevBridgeCmd(brname, BRDGADD, &req, sizeof(req)) < 0) { virReportSystemError(errno, - _("Unable to add bridge %s port %s"), brname, ifname); + _("Unable to add bridge %1$s port %2$s"), brname, ifname); return -1; } @@ -644,7 +644,7 @@ int virNetDevBridgeAddPort(const char *brname, const char *ifname) { virReportSystemError(ENOSYS, - _("Unable to add bridge %s port %s"), brname, ifname); + _("Unable to add bridge %1$s port %2$s"), brname, ifname); return -1; } #endif @@ -670,14 +670,14 @@ int virNetDevBridgeRemovePort(const char *brname, if (!(ifr.ifr_ifindex = if_nametoindex(ifname))) { virReportSystemError(ENODEV, - _("Unable to get interface index for %s"), ifname); + _("Unable to get interface index for %1$s"), ifname); return -1; } if (ioctl(fd, SIOCBRDELIF, &ifr) < 0) { virReportSystemError(errno, - _("Unable to remove bridge %s port %s"), brname, ifname); + _("Unable to remove bridge %1$s port %2$s"), brname, ifname); return -1; } @@ -692,14 +692,14 @@ int virNetDevBridgeRemovePort(const char *brname, memset(&req, 0, sizeof(req)); if (virStrcpyStatic(req.ifbr_ifsname, ifname) < 0) { virReportSystemError(ERANGE, - _("Network interface name '%s' is too long"), + _("Network interface name '%1$s' is too long"), ifname); return -1; } if (virNetDevBridgeCmd(brname, BRDGDEL, &req, sizeof(req)) < 0) { virReportSystemError(errno, - _("Unable to remove bridge %s port %s"), brname, ifname); + _("Unable to remove bridge %1$s port %2$s"), brname, ifname); return -1; } @@ -710,7 +710,7 @@ int virNetDevBridgeRemovePort(const char *brname, const char *ifname) { virReportSystemError(ENOSYS, - _("Unable to remove bridge %s port %s"), brname, ifname); + _("Unable to remove bridge %1$s port %2$s"), brname, ifname); return -1; } #endif @@ -823,7 +823,7 @@ int virNetDevBridgeSetSTPDelay(const char *brname, if (virNetDevBridgeCmd(brname, BRDGSFD, &param, sizeof(param)) < 0) { virReportSystemError(errno, - _("Unable to set STP delay on %s"), brname); + _("Unable to set STP delay on %1$s"), brname); return -1; } @@ -833,7 +833,7 @@ int virNetDevBridgeGetSTPDelay(const char *brname, int *delay G_GNUC_UNUSED) { virReportSystemError(ENOSYS, - _("Unable to get STP delay on %s on this platform"), + _("Unable to get STP delay on %1$s on this platform"), brname); return -1; } @@ -850,7 +850,7 @@ int virNetDevBridgeGetSTP(const char *brname, bool *enable G_GNUC_UNUSED) { virReportSystemError(ENOSYS, - _("Unable to get STP on %s on this platform"), + _("Unable to get STP on %1$s on this platform"), brname); return -1; } @@ -859,7 +859,7 @@ int virNetDevBridgeSetSTPDelay(const char *brname, int delay G_GNUC_UNUSED) { virReportSystemError(ENOSYS, - _("Unable to set STP delay on %s on this platform"), + _("Unable to set STP delay on %1$s on this platform"), brname); return -1; } @@ -867,7 +867,7 @@ int virNetDevBridgeGetSTPDelay(const char *brname, int *delay G_GNUC_UNUSED) { virReportSystemError(ENOSYS, - _("Unable to get STP delay on %s on this platform"), + _("Unable to get STP delay on %1$s on this platform"), brname); return -1; } @@ -877,7 +877,7 @@ int virNetDevBridgeSetSTP(const char *brname, { virReportSystemError(ENOSYS, - _("Unable to set STP on %s on this platform"), + _("Unable to set STP on %1$s on this platform"), brname); return -1; } @@ -885,7 +885,7 @@ int virNetDevBridgeGetSTP(const char *brname, bool *enable G_GNUC_UNUSED) { virReportSystemError(ENOSYS, - _("Unable to get STP on %s on this platform"), + _("Unable to get STP on %1$s on this platform"), brname); return -1; } @@ -1047,7 +1047,7 @@ virNetDevBridgeFDBAddDel(const virMacAddr *mac, const char *ifname, VIR_DEBUG("fdb entry for %s already exists", ifname); } else { virReportSystemError(-err->error, - _("error adding fdb entry for %s"), ifname); + _("error adding fdb entry for %1$s"), ifname); return -1; } } diff --git a/src/util/virnetdevip.c b/src/util/virnetdevip.c index 034b392ee7..d1e717641c 100644 --- a/src/util/virnetdevip.c +++ b/src/util/virnetdevip.c @@ -181,7 +181,7 @@ virNetDevIPAddrAdd(const char *ifname, if (virSocketAddrBroadcastByPrefix(addr, prefix, broadcast) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to determine broadcast address for '%s/%d'"), + _("Failed to determine broadcast address for '%1$s/%2$d'"), ipStr, prefix); return -1; } @@ -206,7 +206,7 @@ virNetDevIPAddrAdd(const char *ifname, if (virNetlinkGetErrorCode(resp, recvbuflen) < 0) { virReportError(VIR_ERR_SYSTEM_ERROR, - _("Failed to add IP address %s/%d%s%s%s%s to %s"), + _("Failed to add IP address %1$s/%2$d%3$s%4$s%5$s%6$s to %7$s"), ipStr, prefix, peerStr ? " peer " : "", peerStr ? peerStr : "", bcastStr ? " bcast " : "", bcastStr ? bcastStr : "", @@ -248,7 +248,7 @@ virNetDevIPAddrDel(const char *ifname, if (virNetlinkGetErrorCode(resp, recvbuflen) < 0) { virReportError(VIR_ERR_SYSTEM_ERROR, - _("Error removing IP address from %s"), ifname); + _("Error removing IP address from %1$s"), ifname); return -1; } @@ -352,7 +352,7 @@ virNetDevIPRouteAdd(const char *ifname, return -1; if ((errCode = virNetlinkGetErrorCode(resp, recvbuflen)) < 0) { - virReportSystemError(errCode, _("Error adding route to %s"), ifname); + virReportSystemError(errCode, _("Error adding route to %1$s"), ifname); return -1; } @@ -538,8 +538,8 @@ virNetDevIPCheckIPv6Forwarding(void) if ((len = virFileReadAll(PROC_NET_IPV6_ROUTE, MAX_ROUTE_SIZE, &buf)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to read %s " - "for ipv6 forwarding checks"), PROC_NET_IPV6_ROUTE); + _("Unable to read %1$s for ipv6 forwarding checks"), + PROC_NET_IPV6_ROUTE); return false; } @@ -592,10 +592,8 @@ virNetDevIPCheckIPv6Forwarding(void) */ if (ret == 1 || (ret == 0 && all_accept_ra == 1)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Check the host setup: interface %s has kernel " - "autoconfigured IPv6 routes and enabling forwarding " - " without accept_ra set to 2 will cause the kernel " - "to flush them, breaking networking."), iface_val); + _("Check the host setup: interface %1$s has kernel autoconfigured IPv6 routes and enabling forwarding without accept_ra set to 2 will cause the kernel to flush them, breaking networking."), + iface_val); return false; } } @@ -638,7 +636,7 @@ virNetDevGetIPv4AddressIoctl(const char *ifname, if (ioctl(fd, SIOCGIFADDR, (char *)&ifr) < 0) { virReportSystemError(errno, - _("Unable to get IPv4 address for interface %s via ioctl"), + _("Unable to get IPv4 address for interface %1$s via ioctl"), ifname); goto cleanup; } @@ -684,7 +682,7 @@ virNetDevGetifaddrsAddress(const char *ifname, if (getifaddrs(&ifap) < 0) { virReportSystemError(errno, - _("Could not get interface list for '%s'"), + _("Could not get interface list for '%1$s'"), ifname); return -1; } @@ -714,7 +712,7 @@ virNetDevGetifaddrsAddress(const char *ifname, } virReportError(VIR_ERR_INTERNAL_ERROR, - _("no IP address found for interface '%s'"), + _("no IP address found for interface '%1$s'"), ifname); cleanup: freeifaddrs(ifap); @@ -875,7 +873,7 @@ virNetDevIPInfoAddToDev(const char *ifname, NULL, ip->prefix)) < 0) { ipStr = virSocketAddrFormat(&ip->address); virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to determine prefix for IP address '%s'"), + _("Failed to determine prefix for IP address '%1$s'"), NULLSTR(ipStr)); return -1; } @@ -890,7 +888,7 @@ virNetDevIPInfoAddToDev(const char *ifname, if ((prefix = virNetDevIPRouteGetPrefix(route)) < 0) { ipStr = virSocketAddrFormat(&route->address); virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to determine prefix for route with destination '%s'"), + _("Failed to determine prefix for route with destination '%1$s'"), NULLSTR(ipStr)); return -1; } diff --git a/src/util/virnetdevmacvlan.c b/src/util/virnetdevmacvlan.c index 94968a8b4d..db5f41bae8 100644 --- a/src/util/virnetdevmacvlan.c +++ b/src/util/virnetdevmacvlan.c @@ -113,7 +113,7 @@ virNetDevMacVLanCreate(const char *ifname, char macstr[VIR_MAC_STRING_BUFLEN]; virReportSystemError(-error, - _("error creating %s interface %s@%s (%s)"), + _("error creating %1$s interface %2$s@%3$s (%4$s)"), type, ifname, srcdev, virMacAddrFormat(macaddress, macstr)); return -1; @@ -177,7 +177,7 @@ virNetDevMacVLanTapOpen(const char *ifname, } else { /* However, if haven't succeeded, quit. */ virReportSystemError(errno, - _("cannot open macvtap tap device %s"), + _("cannot open macvtap tap device %1$s"), tapname); goto cleanup; } diff --git a/src/util/virnetdevmidonet.c b/src/util/virnetdevmidonet.c index 202808ef0f..7a285d2bab 100644 --- a/src/util/virnetdevmidonet.c +++ b/src/util/virnetdevmidonet.c @@ -49,7 +49,7 @@ virNetDevMidonetBindPort(const char *ifname, if (virCommandRun(cmd, NULL) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to bind port %s to the virtual port %s"), + _("Unable to bind port %1$s to the virtual port %2$s"), ifname, virtportuuid); return -1; } @@ -78,7 +78,7 @@ virNetDevMidonetUnbindPort(const virNetDevVPortProfile *virtualport) if (virCommandRun(cmd, NULL) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to unbind the virtual port %s from Midonet"), + _("Unable to unbind the virtual port %1$s from Midonet"), virtportuuid); return -1; } diff --git a/src/util/virnetdevopenvswitch.c b/src/util/virnetdevopenvswitch.c index 7418716600..dbdd645f8e 100644 --- a/src/util/virnetdevopenvswitch.c +++ b/src/util/virnetdevopenvswitch.c @@ -185,7 +185,7 @@ int virNetDevOpenvswitchAddPort(const char *brname, const char *ifname, if (virCommandRun(cmd, NULL) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to add port %s to OVS bridge %s"), + _("Unable to add port %1$s to OVS bridge %2$s"), ifname, brname); return -1; } @@ -209,7 +209,7 @@ int virNetDevOpenvswitchRemovePort(const char *brname G_GNUC_UNUSED, const char if (virCommandRun(cmd, NULL) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to delete port %s from OVS"), ifname); + _("Unable to delete port %1$s from OVS"), ifname); return -1; } @@ -238,8 +238,8 @@ int virNetDevOpenvswitchGetMigrateData(char **migrate, const char *ifname) /* Run the command */ if (virCommandRun(cmd, NULL) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to run command to get OVS port data for " - "interface %s"), ifname); + _("Unable to run command to get OVS port data for interface %1$s"), + ifname); return -1; } @@ -276,8 +276,8 @@ int virNetDevOpenvswitchSetMigrateData(char *migrate, const char *ifname) /* Run the command */ if (virCommandRun(cmd, NULL) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to run command to set OVS port data for " - "interface %s"), ifname); + _("Unable to run command to set OVS port data for interface %1$s"), + ifname); return -1; } @@ -443,8 +443,8 @@ virNetDevOpenvswitchInterfaceGetMaster(const char *ifname, char **master) if (virCommandRun(cmd, &exitstatus) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to run command to get OVS master for " - "interface %s"), ifname); + _("Unable to run command to get OVS master for interface %1$s"), + ifname); return -1; } @@ -614,7 +614,7 @@ int virNetDevOpenvswitchUpdateVlan(const char *ifname, if (virCommandRun(cmd, NULL) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to set vlan configuration on port %s"), ifname); + _("Unable to set vlan configuration on port %1$s"), ifname); return -1; } @@ -730,7 +730,7 @@ virNetDevOpenvswitchInterfaceClearRxQos(const char *ifname) if (virCommandRun(cmd, NULL) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to reset ingress on port %s"), ifname); + _("Unable to reset ingress on port %1$s"), ifname); return -1; } @@ -806,10 +806,10 @@ virNetDevOpenvswitchInterfaceSetTxQos(const char *ifname, if (virCommandRun(cmd, NULL) < 0) { if (queue_uuid && *queue_uuid) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to set queue configuration on port %s"), ifname); + _("Unable to set queue configuration on port %1$s"), ifname); } else { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to create and set qos configuration on port %s"), ifname); + _("Unable to create and set qos configuration on port %1$s"), ifname); } return -1; } @@ -829,7 +829,7 @@ virNetDevOpenvswitchInterfaceSetTxQos(const char *ifname, virCommandAddArgList(qoscmd, vmid_ex_id, ifname_ex_id, NULL); if (virCommandRun(qoscmd, NULL) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to set qos configuration on port %s"), ifname); + _("Unable to set qos configuration on port %1$s"), ifname); return -1; } } @@ -853,7 +853,7 @@ virNetDevOpenvswitchInterfaceSetRxQos(const char *ifname, if (virCommandRun(cmd, NULL) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to set vlan configuration on port %s"), ifname); + _("Unable to set vlan configuration on port %1$s"), ifname); return -1; } diff --git a/src/util/virnetdevtap.c b/src/util/virnetdevtap.c index 2101d7847c..b85b753c96 100644 --- a/src/util/virnetdevtap.c +++ b/src/util/virnetdevtap.c @@ -105,7 +105,7 @@ virNetDevTapGetRealDeviceName(char *ifname G_GNUC_UNUSED) if ((ifindex = if_nametoindex(ifname)) == 0) { virReportSystemError(errno, - _("Unable to get interface index for '%s'"), + _("Unable to get interface index for '%1$s'"), ifname); return NULL; } @@ -119,7 +119,7 @@ virNetDevTapGetRealDeviceName(char *ifname G_GNUC_UNUSED) if (sysctl(name, 6, NULL, &len, 0, 0) < 0) { virReportSystemError(errno, - _("Unable to get driver name for '%s'"), + _("Unable to get driver name for '%1$s'"), ifname); return NULL; } @@ -128,7 +128,7 @@ virNetDevTapGetRealDeviceName(char *ifname G_GNUC_UNUSED) if (sysctl(name, 6, ret, &len, 0, 0) < 0) { virReportSystemError(errno, - _("Unable to get driver name for '%s'"), + _("Unable to get driver name for '%1$s'"), ifname); VIR_FREE(ret); return NULL; @@ -195,7 +195,7 @@ int virNetDevTapCreate(char **ifname, return -1; } else if (rc > 0) { virReportError(VIR_ERR_OPERATION_INVALID, - _("The %s interface already exists"), + _("The %1$s interface already exists"), *ifname); return -1; } @@ -208,7 +208,7 @@ int virNetDevTapCreate(char **ifname, for (i = 0; i < tapfdSize; i++) { if ((fd = open(tunpath, O_RDWR)) < 0) { virReportSystemError(errno, - _("Unable to open %s, is tun module loaded?"), + _("Unable to open %1$s, is tun module loaded?"), tunpath); goto cleanup; } @@ -225,7 +225,7 @@ int virNetDevTapCreate(char **ifname, if (virStrcpyStatic(ifr.ifr_name, *ifname) < 0) { virReportSystemError(ERANGE, - _("Network interface name '%s' is too long"), + _("Network interface name '%1$s' is too long"), *ifname); goto cleanup; @@ -233,7 +233,7 @@ int virNetDevTapCreate(char **ifname, if (ioctl(fd, TUNSETIFF, &ifr) < 0) { virReportSystemError(errno, - _("Unable to create tap device %s"), + _("Unable to create tap device %1$s"), NULLSTR(*ifname)); goto cleanup; } @@ -248,7 +248,7 @@ int virNetDevTapCreate(char **ifname, if ((flags & VIR_NETDEV_TAP_CREATE_PERSIST) && ioctl(fd, TUNSETPERSIST, 1) < 0) { virReportSystemError(errno, - _("Unable to set tap device %s to persistent"), + _("Unable to set tap device %1$s to persistent"), NULLSTR(*ifname)); goto cleanup; } @@ -281,7 +281,7 @@ int virNetDevTapDelete(const char *ifname, if ((fd = open(tunpath, O_RDWR)) < 0) { virReportSystemError(errno, - _("Unable to open %s, is tun module loaded?"), + _("Unable to open %1$s, is tun module loaded?"), tunpath); return -1; } @@ -291,7 +291,7 @@ int virNetDevTapDelete(const char *ifname, if (virStrcpyStatic(try.ifr_name, ifname) < 0) { virReportSystemError(ERANGE, - _("Network interface name '%s' is too long"), + _("Network interface name '%1$s' is too long"), ifname); goto cleanup; } @@ -357,7 +357,7 @@ int virNetDevTapCreate(char **ifname, if ((*tapfd = open(dev_path, O_RDWR)) < 0) { virReportSystemError(errno, - _("Unable to open %s"), + _("Unable to open %1$s"), dev_path); goto cleanup; } @@ -386,7 +386,7 @@ int virNetDevTapDelete(const char *ifname, if (ioctl(s, SIOCIFDESTROY, &ifr) < 0) { virReportSystemError(errno, - _("Unable to remove tap device %s"), + _("Unable to remove tap device %1$s"), ifname); goto cleanup; } diff --git a/src/util/virnetdevveth.c b/src/util/virnetdevveth.c index ad1f517039..4365345664 100644 --- a/src/util/virnetdevveth.c +++ b/src/util/virnetdevveth.c @@ -42,7 +42,7 @@ virNetDevVethCreateInternal(const char *veth1, const char *veth2) if (virNetlinkNewLink(veth1, "veth", &data, &error) < 0) { if (error != 0) { virReportSystemError(-error, - _("unable to create %s <-> %s veth pair"), + _("unable to create %1$s <-> %2$s veth pair"), veth1, veth2); } return -1; @@ -83,7 +83,7 @@ virNetDevVethDeleteInternal(const char *veth) return 0; } virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to delete veth device %s"), veth); + _("Failed to delete veth device %1$s"), veth); return -1; } diff --git a/src/util/virnetdevvportprofile.c b/src/util/virnetdevvportprofile.c index ae23f795b2..cf92f1838b 100644 --- a/src/util/virnetdevvportprofile.c +++ b/src/util/virnetdevvportprofile.c @@ -205,7 +205,7 @@ virNetDevVPortProfileCheckComplete(virNetDevVPortProfile *virtport, if (missing) { virReportError(VIR_ERR_XML_ERROR, - _("missing %s in <virtualport type='%s'>"), missing, + _("missing %1$s in <virtualport type='%2$s'>"), missing, virNetDevVPortTypeToString(virtport->virtPortType)); return -1; } @@ -262,7 +262,7 @@ virNetDevVPortProfileCheckNoExtras(const virNetDevVPortProfile *virtport) if (extra) { virReportError(VIR_ERR_XML_ERROR, - _("extra %s unsupported in <virtualport type='%s'>"), + _("extra %1$s unsupported in <virtualport type='%2$s'>"), extra, virNetDevVPortTypeToString(virtport->virtPortType)); return -1; @@ -290,8 +290,7 @@ virNetDevVPortProfileMerge(virNetDevVPortProfile *orig, if (otype != VIR_NETDEV_VPORT_PROFILE_NONE && otype != mods->virtPortType) { virReportError(VIR_ERR_XML_ERROR, - _("attempt to merge virtualports " - "with mismatched types (%s and %s)"), + _("attempt to merge virtualports with mismatched types (%1$s and %2$s)"), virNetDevVPortTypeToString(otype), virNetDevVPortTypeToString(mods->virtPortType)); return -1; @@ -305,8 +304,7 @@ virNetDevVPortProfileMerge(virNetDevVPortProfile *orig, if (orig->managerID_specified && (orig->managerID != mods->managerID)) { virReportError(VIR_ERR_XML_ERROR, - _("attempt to merge virtualports " - "with mismatched managerids (%d and %d)"), + _("attempt to merge virtualports with mismatched managerids (%1$d and %2$d)"), orig->managerID, mods->managerID); return -1; } @@ -320,8 +318,7 @@ virNetDevVPortProfileMerge(virNetDevVPortProfile *orig, if (orig->typeID_specified && (orig->typeID != mods->typeID)) { virReportError(VIR_ERR_XML_ERROR, - _("attempt to merge virtualports " - "with mismatched typeids (%d and %d)"), + _("attempt to merge virtualports with mismatched typeids (%1$d and %2$d)"), orig->typeID, mods->typeID); return -1; } @@ -335,8 +332,7 @@ virNetDevVPortProfileMerge(virNetDevVPortProfile *orig, if (orig->typeIDVersion_specified && (orig->typeIDVersion != mods->typeIDVersion)) { virReportError(VIR_ERR_XML_ERROR, - _("attempt to merge virtualports with " - "mismatched typeidversions (%d and %d)"), + _("attempt to merge virtualports with mismatched typeidversions (%1$d and %2$d)"), orig->typeIDVersion, mods->typeIDVersion); return -1; } @@ -354,8 +350,7 @@ virNetDevVPortProfileMerge(virNetDevVPortProfile *orig, char modsuuid[VIR_UUID_STRING_BUFLEN]; virReportError(VIR_ERR_XML_ERROR, - _("attempt to merge virtualports with " - "mismatched instanceids ('%s' and '%s')"), + _("attempt to merge virtualports with mismatched instanceids ('%1$s' and '%2$s')"), virUUIDFormat(orig->instanceID, origuuid), virUUIDFormat(mods->instanceID, modsuuid)); return -1; @@ -374,8 +369,7 @@ virNetDevVPortProfileMerge(virNetDevVPortProfile *orig, char modsuuid[VIR_UUID_STRING_BUFLEN]; virReportError(VIR_ERR_XML_ERROR, - _("attempt to merge virtualports with " - "mismatched interfaceids ('%s' and '%s')"), + _("attempt to merge virtualports with mismatched interfaceids ('%1$s' and '%2$s')"), virUUIDFormat(orig->interfaceID, origuuid), virUUIDFormat(mods->interfaceID, modsuuid)); return -1; @@ -391,8 +385,7 @@ virNetDevVPortProfileMerge(virNetDevVPortProfile *orig, if (orig->profileID[0] && STRNEQ(orig->profileID, mods->profileID)) { virReportError(VIR_ERR_XML_ERROR, - _("attempt to merge virtualports with " - "mismatched profileids ('%s' and '%s')"), + _("attempt to merge virtualports with mismatched profileids ('%1$s' and '%2$s')"), orig->profileID, mods->profileID); return -1; } @@ -485,7 +478,7 @@ virNetDevVPortProfileGetLldpadPid(void) } } else { virReportSystemError(errno, - _("Error opening file %s"), LLDPAD_PID_FILE); + _("Error opening file %1$s"), LLDPAD_PID_FILE); } VIR_FORCE_CLOSE(fd); @@ -577,8 +570,7 @@ virNetDevVPortProfileGetStatus(struct nlattr **tb, int32_t vf, virUUIDFormat(instanceId, instanceIdStr); virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not find vf/instanceId %u/%s " - " in netlink response"), + _("Could not find vf/instanceId %1$u/%2$s in netlink response"), vf, instanceIdStr); /* go through all the entries again. This seems tedious, @@ -812,7 +804,7 @@ virNetDevVPortProfileOpSetLink(const char *ifname, int ifindex, if (err->error) { virReportSystemError(-err->error, - _("error during virtual port configuration of ifindex %d"), + _("error during virtual port configuration of ifindex %1$d"), ifindex); goto cleanup; } @@ -978,8 +970,7 @@ virNetDevVPortProfileOpCommon(const char *ifname, int ifindex, /* keep trying... */ } else { virReportSystemError(EINVAL, - _("error %d during port-profile setlink on " - "interface %s (%d)"), + _("error %1$d during port-profile setlink on interface %2$s (%3$d)"), status, ifname, ifindex); rc = -1; break; @@ -1080,7 +1071,7 @@ virNetDevVPortProfileOp8021Qbg(const char *ifname, break; default: virReportError(VIR_ERR_INTERNAL_ERROR, - _("operation type %d not supported"), virtPortOp); + _("operation type %1$d not supported"), virtPortOp); return -1; } @@ -1189,7 +1180,7 @@ virNetDevVPortProfileOp8021Qbh(const char *ifname, case VIR_NETDEV_VPORT_PROFILE_LINK_OP_PREASSOCIATE: virReportError(VIR_ERR_INTERNAL_ERROR, - _("operation type %d not supported"), virtPortOp); + _("operation type %1$d not supported"), virtPortOp); rc = -1; break; default: diff --git a/src/util/virnetlink.c b/src/util/virnetlink.c index 98f75652e9..f18a08c277 100644 --- a/src/util/virnetlink.c +++ b/src/util/virnetlink.c @@ -218,8 +218,8 @@ virNetlinkCreateSocket(int protocol) } if (nl_connect(nlhandle, protocol) < 0) { virReportSystemError(errno, - _("cannot connect to netlink socket " - "with protocol %d"), protocol); + _("cannot connect to netlink socket with protocol %1$d"), + protocol); goto error; } @@ -255,7 +255,7 @@ virNetlinkSendRequest(struct nl_msg *nl_msg, uint32_t src_pid, if (protocol >= MAX_LINKS) { virReportSystemError(EINVAL, - _("invalid protocol argument: %d"), protocol); + _("invalid protocol argument: %1$d"), protocol); goto error; } @@ -541,7 +541,7 @@ virNetlinkDumpLink(const char *ifname, int ifindex, if (virNetlinkTalk(ifname, nl_msg, src_pid, dst_pid, &resp, &resp_len, &error, NULL) < 0) { virReportSystemError(-error, - _("error dumping %s (%d) interface"), + _("error dumping %1$s (%2$d) interface"), ifname, ifindex); return -1; } @@ -692,7 +692,7 @@ virNetlinkDelLink(const char *ifname, virNetlinkTalkFallback fallback) if (virNetlinkTalk(ifname, nl_msg, 0, 0, &resp, &resp_len, &error, fallback) < 0) { virReportSystemError(-error, - _("error destroying network device %s"), + _("error destroying network device %1$s"), ifname); return -1; } @@ -953,7 +953,7 @@ virNetlinkEventServiceIsRunning(unsigned int protocol) { if (protocol >= MAX_LINKS) { virReportSystemError(EINVAL, - _("invalid protocol argument: %d"), protocol); + _("invalid protocol argument: %1$d"), protocol); return false; } @@ -1003,7 +1003,7 @@ virNetlinkEventServiceStart(unsigned int protocol, unsigned int groups) if (protocol >= MAX_LINKS) { virReportSystemError(EINVAL, - _("invalid protocol argument: %d"), protocol); + _("invalid protocol argument: %1$d"), protocol); return -EINVAL; } diff --git a/src/util/virnodesuspend.c b/src/util/virnodesuspend.c index 5feef79c43..01f387d6fa 100644 --- a/src/util/virnodesuspend.c +++ b/src/util/virnodesuspend.c @@ -66,7 +66,7 @@ static int virNodeSuspendSetNodeWakeup(unsigned long long alarmTime) if (alarmTime < MIN_TIME_REQ_FOR_SUSPEND) { virReportError(VIR_ERR_INVALID_ARG, - _("Suspend duration is too short, must be at least %u seconds"), + _("Suspend duration is too short, must be at least %1$u seconds"), MIN_TIME_REQ_FOR_SUSPEND); return -1; } diff --git a/src/util/virnuma.c b/src/util/virnuma.c index 43e299f4bb..d78fc78ac1 100644 --- a/src/util/virnuma.c +++ b/src/util/virnuma.c @@ -112,7 +112,7 @@ virNumaSetupMemoryPolicy(virDomainNumatuneMemMode mode, while ((bit = virBitmapNextSetBit(nodeset, bit)) >= 0) { if (bit > maxnode) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("NUMA node %d is out of range"), bit); + _("NUMA node %1$d is out of range"), bit); return -1; } nodemask_set(&mask, bit); @@ -348,7 +348,7 @@ virNumaNodesetToCPUset(virBitmap *nodeset, /* Error is reported for cases other than non-existent NUMA node. */ if (rc == -2) { virReportError(VIR_ERR_OPERATION_FAILED, - _("NUMA node %zu is not available"), + _("NUMA node %1$zu is not available"), i); } return -1; @@ -568,16 +568,16 @@ virNumaGetHugePageInfoPath(char **path, if (node != -1) { if (!virNumaNodeIsAvailable(node)) { virReportError(VIR_ERR_OPERATION_FAILED, - _("NUMA node %d is not available"), + _("NUMA node %1$d is not available"), node); } else { virReportError(VIR_ERR_OPERATION_FAILED, - _("page size %u is not available on node %d"), + _("page size %1$u is not available on node %2$d"), page_size, node); } } else { virReportError(VIR_ERR_OPERATION_FAILED, - _("page size %u is not available"), + _("page size %1$u is not available"), page_size); } return -1; @@ -638,7 +638,7 @@ virNumaGetHugePageInfo(int node, if (virStrToLong_ull(buf, &end, 10, page_avail) < 0 || *end != '\n') { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unable to parse: %s"), + _("unable to parse: %1$s"), buf); return -1; } @@ -657,7 +657,7 @@ virNumaGetHugePageInfo(int node, if (virStrToLong_ull(buf, &end, 10, page_free) < 0 || *end != '\n') { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unable to parse: %s"), + _("unable to parse: %1$s"), buf); return -1; } @@ -809,7 +809,7 @@ virNumaGetPages(int node, if (virStrToLong_ui(page_name, &end, 10, &page_size) < 0 || STRCASENEQ(end, "kB")) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unable to parse %s"), + _("unable to parse %1$s"), entry->d_name); return -1; } @@ -902,7 +902,7 @@ virNumaSetPagePoolSize(int node, if (virStrToLong_ull(nr_buf, &end, 10, &nr_count) < 0 || *end != '\n') { virReportError(VIR_ERR_OPERATION_FAILED, - _("invalid number '%s' in '%s'"), + _("invalid number '%1$s' in '%2$s'"), nr_buf, nr_path); return -1; } @@ -933,7 +933,7 @@ virNumaSetPagePoolSize(int node, if (virFileWriteStr(nr_path, nr_buf, 0) < 0) { virReportSystemError(errno, - _("Unable to write to: %s"), nr_path); + _("Unable to write to: %1$s"), nr_path); return -1; } @@ -946,14 +946,14 @@ virNumaSetPagePoolSize(int node, if (virStrToLong_ull(nr_buf, &end, 10, &nr_count) < 0 || *end != '\n') { virReportError(VIR_ERR_OPERATION_FAILED, - _("invalid number '%s' in '%s'"), + _("invalid number '%1$s' in '%2$s'"), nr_buf, nr_path); return -1; } if (nr_count != page_count) { virReportError(VIR_ERR_OPERATION_FAILED, - _("Unable to allocate %llu pages. Allocated only %llu"), + _("Unable to allocate %1$llu pages. Allocated only %2$llu"), page_count, nr_count); return -1; } @@ -1014,7 +1014,7 @@ virNumaNodesetIsAvailable(virBitmap *nodeset) continue; virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("NUMA node %zd is unavailable"), bit); + _("NUMA node %1$zd is unavailable"), bit); return false; } return true; diff --git a/src/util/virnvme.c b/src/util/virnvme.c index d0f0c04aba..f7f8dc5ea9 100644 --- a/src/util/virnvme.c +++ b/src/util/virnvme.c @@ -185,7 +185,7 @@ virNVMeDeviceListAdd(virNVMeDeviceList *list, if ((tmp = virNVMeDeviceListLookup(list, dev))) { g_autofree char *addrStr = virPCIDeviceAddressAsString(&tmp->address); virReportError(VIR_ERR_INTERNAL_ERROR, - _("NVMe device %s namespace %u is already on the list"), + _("NVMe device %1$s namespace %2$u is already on the list"), NULLSTR(addrStr), tmp->namespace); return -1; } @@ -209,7 +209,7 @@ virNVMeDeviceListDel(virNVMeDeviceList *list, if ((idx = virNVMeDeviceListLookupIndex(list, dev)) < 0) { g_autofree char *addrStr = virPCIDeviceAddressAsString(&dev->address); virReportError(VIR_ERR_INTERNAL_ERROR, - _("NVMe device %s namespace %u not found"), + _("NVMe device %1$s namespace %2$u not found"), NULLSTR(addrStr), dev->namespace); return -1; } @@ -420,7 +420,7 @@ virNVMeDeviceListCreateReAttachList(virNVMeDeviceList *activeList, /* Shouldn't happen (TM) */ g_autofree char *addrStr = virPCIDeviceAddressAsString(&d->address); virReportError(VIR_ERR_INTERNAL_ERROR, - _("NVMe device %s namespace %u not found"), + _("NVMe device %1$s namespace %2$u not found"), NULLSTR(addrStr), d->namespace); return NULL; } else if (nused > 1) { diff --git a/src/util/virobject.c b/src/util/virobject.c index b74d74a545..92af4f9fd6 100644 --- a/src/util/virobject.c +++ b/src/util/virobject.c @@ -181,7 +181,7 @@ virClassNew(virClass *parent, } else if (objectSize <= parentSize || parentSize != (parent ? parent->objectSize : 0)) { virReportInvalidArg(objectSize, - _("object size %zu of %s is not larger than parent class %zu"), + _("object size %1$zu of %2$s is not larger than parent class %3$zu"), objectSize, name, parent->objectSize); return NULL; } @@ -266,7 +266,7 @@ virObjectLockableNew(virClass *klass) if (!virClassIsDerivedFrom(klass, virClassForObjectLockable())) { virReportInvalidArg(klass, - _("Class %s must derive from virObjectLockable"), + _("Class %1$s must derive from virObjectLockable"), virClassName(klass)); return NULL; } @@ -292,7 +292,7 @@ virObjectRWLockableNew(virClass *klass) if (!virClassIsDerivedFrom(klass, virClassForObjectRWLockable())) { virReportInvalidArg(klass, - _("Class %s must derive from virObjectRWLockable"), + _("Class %1$s must derive from virObjectRWLockable"), virClassName(klass)); return NULL; } diff --git a/src/util/virpci.c b/src/util/virpci.c index 7800966963..9e564e4a4f 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -252,13 +252,13 @@ virPCIDeviceGetDriverPathAndName(virPCIDevice *dev, char **path, char **name) if (virFileIsLink(drvlink) != 1) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Invalid device %s driver file %s is not a symlink"), + _("Invalid device %1$s driver file %2$s is not a symlink"), dev->name, drvlink); goto cleanup; } if (virFileResolveLink(drvlink, path) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to resolve device %s driver symlink %s"), + _("Unable to resolve device %1$s driver symlink %2$s"), dev->name, drvlink); goto cleanup; } @@ -287,7 +287,7 @@ virPCIDeviceConfigOpenInternal(virPCIDevice *dev, bool readonly, bool fatal) if (fd < 0) { if (fatal) { virReportSystemError(errno, - _("Failed to open config space file '%s'"), + _("Failed to open config space file '%1$s'"), dev->path); } else { VIR_WARN("Failed to open config space file '%s': %s", @@ -408,7 +408,7 @@ virPCIDeviceReadClass(virPCIDevice *dev, uint16_t *device_class) id_str[8] = '\0'; if (virStrToLong_ui(id_str, NULL, 16, &value) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unusual value in %s/devices/%s/class: %s"), + _("Unusual value in %1$s/devices/%2$s/class: %3$s"), PCI_SYSFS, dev->name, id_str); return -1; } @@ -836,7 +836,7 @@ virPCIDeviceTrySecondaryBusReset(virPCIDevice *dev, */ if ((conflict = virPCIDeviceBusContainsActiveDevices(dev, inactiveDevs))) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Active %s devices on bus with %s, not doing bus reset"), + _("Active %1$s devices on bus with %2$s, not doing bus reset"), conflict->name, dev->name); return -1; } @@ -846,7 +846,7 @@ virPCIDeviceTrySecondaryBusReset(virPCIDevice *dev, return -1; if (!parent) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to find parent device for %s"), + _("Failed to find parent device for %1$s"), dev->name); return -1; } @@ -861,7 +861,7 @@ virPCIDeviceTrySecondaryBusReset(virPCIDevice *dev, */ if (virPCIDeviceRead(dev, cfgfd, 0, config_space, PCI_CONF_LEN) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to read PCI config space for %s"), + _("Failed to read PCI config space for %1$s"), dev->name); goto out; } @@ -882,7 +882,7 @@ virPCIDeviceTrySecondaryBusReset(virPCIDevice *dev, if (virPCIDeviceWrite(dev, cfgfd, 0, config_space, PCI_CONF_LEN) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to restore PCI config space for %s"), + _("Failed to restore PCI config space for %1$s"), dev->name); goto out; } @@ -909,7 +909,7 @@ virPCIDeviceTryPowerManagementReset(virPCIDevice *dev, int cfgfd) /* Save and restore the device's config space. */ if (virPCIDeviceRead(dev, cfgfd, 0, &config_space[0], PCI_CONF_LEN) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to read PCI config space for %s"), + _("Failed to read PCI config space for %1$s"), dev->name); return -1; } @@ -931,7 +931,7 @@ virPCIDeviceTryPowerManagementReset(virPCIDevice *dev, int cfgfd) if (virPCIDeviceWrite(dev, cfgfd, 0, &config_space[0], PCI_CONF_LEN) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to restore PCI config space for %s"), + _("Failed to restore PCI config space for %1$s"), dev->name); return -1; } @@ -1015,15 +1015,14 @@ virPCIDeviceReset(virPCIDevice *dev, if (hdrType != VIR_PCI_HEADER_ENDPOINT) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Invalid attempt to reset PCI device %s. " - "Only PCI endpoint devices can be reset"), + _("Invalid attempt to reset PCI device %1$s. Only PCI endpoint devices can be reset"), dev->name); return -1; } if (activeDevs && virPCIDeviceListFind(activeDevs, &dev->address)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Not resetting active device %s"), dev->name); + _("Not resetting active device %1$s"), dev->name); return -1; } @@ -1071,7 +1070,7 @@ virPCIDeviceReset(virPCIDevice *dev, if (ret < 0) { virErrorPtr err = virGetLastError(); virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to reset PCI device %s: %s"), + _("Unable to reset PCI device %1$s: %2$s"), dev->name, err ? err->message : _("no FLR, PM reset or bus reset available")); @@ -1119,12 +1118,11 @@ virPCIProbeStubDriver(virPCIStubDriver driver) */ if (virKModIsProhibited(drvname)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to load PCI stub module %s: " - "administratively prohibited"), + _("Failed to load PCI stub module %1$s: administratively prohibited"), drvname); } else { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to load PCI stub module %s"), + _("Failed to load PCI stub module %1$s"), drvname); } @@ -1150,7 +1148,7 @@ virPCIDeviceUnbind(virPCIDevice *dev) if (virFileExists(path)) { if (virFileWriteStr(path, dev->name, 0) < 0) { virReportSystemError(errno, - _("Failed to unbind PCI device '%s' from %s"), + _("Failed to unbind PCI device '%1$s' from %2$s"), dev->name, driver); return -1; } @@ -1175,7 +1173,7 @@ int virPCIDeviceRebind(virPCIDevice *dev) if (virFileWriteStr(PCI_SYSFS "drivers_probe", dev->name, 0) < 0) { virReportSystemError(errno, - _("Failed to trigger a probe for PCI device '%s'"), + _("Failed to trigger a probe for PCI device '%1$s'"), dev->name); return -1; } @@ -1205,8 +1203,7 @@ virPCIDeviceBindWithDriverOverride(virPCIDevice *dev, if (virFileWriteStr(path, driverName, 0) < 0) { virReportSystemError(errno, - _("Failed to add driver '%s' to driver_override " - " interface of PCI device '%s'"), + _("Failed to add driver '%1$s' to driver_override interface of PCI device '%2$s'"), driverName, dev->name); return -1; } @@ -1238,12 +1235,12 @@ virPCIDeviceBindToStub(virPCIDevice *dev) /* Check the device is configured to use one of the known stub drivers */ if (dev->stubDriver == VIR_PCI_STUB_DRIVER_NONE) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("No stub driver configured for PCI device %s"), + _("No stub driver configured for PCI device %1$s"), dev->name); return -1; } else if (!(stubDriverName = virPCIStubDriverTypeToString(dev->stubDriver))) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unknown stub driver configured for PCI device %s"), + _("Unknown stub driver configured for PCI device %1$s"), dev->name); return -1; } @@ -1295,7 +1292,7 @@ virPCIDeviceDetach(virPCIDevice *dev, if (activeDevs && virPCIDeviceListFind(activeDevs, &dev->address)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Not detaching active device %s"), dev->name); + _("Not detaching active device %1$s"), dev->name); return -1; } @@ -1325,7 +1322,7 @@ virPCIDeviceReattach(virPCIDevice *dev, { if (activeDevs && virPCIDeviceListFind(activeDevs, &dev->address)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Not reattaching active device %s"), dev->name); + _("Not reattaching active device %1$s"), dev->name); return -1; } @@ -1370,24 +1367,21 @@ virPCIDeviceAddressIsValid(virPCIDeviceAddress *addr, if (addr->bus > 0xFF) { if (report) virReportError(VIR_ERR_XML_ERROR, - _("Invalid PCI address bus='0x%x', " - "must be <= 0xFF"), + _("Invalid PCI address bus='0x%1$x', must be <= 0xFF"), addr->bus); return false; } if (addr->slot > 0x1F) { if (report) virReportError(VIR_ERR_XML_ERROR, - _("Invalid PCI address slot='0x%x', " - "must be <= 0x1F"), + _("Invalid PCI address slot='0x%1$x', must be <= 0x1F"), addr->slot); return false; } if (addr->function > 7) { if (report) virReportError(VIR_ERR_XML_ERROR, - _("Invalid PCI address function=0x%x, " - "must be <= 7"), + _("Invalid PCI address function=0x%1$x, must be <= 7"), addr->function); return false; } @@ -1468,7 +1462,7 @@ virPCIDeviceNew(const virPCIDeviceAddress *address) if (!virFileExists(dev->path)) { virReportSystemError(errno, - _("Device %s not found: could not access %s"), + _("Device %1$s not found: could not access %2$s"), dev->name, dev->path); return NULL; } @@ -1478,7 +1472,7 @@ virPCIDeviceNew(const virPCIDeviceAddress *address) if (!vendor || !product) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to read product/vendor ID for %s"), + _("Failed to read product/vendor ID for %1$s"), dev->name); return NULL; } @@ -1487,7 +1481,7 @@ virPCIDeviceNew(const virPCIDeviceAddress *address) if (g_snprintf(dev->id, sizeof(dev->id), "%s %s", &vendor[2], &product[2]) >= sizeof(dev->id)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("dev->id buffer overflow: %s %s"), + _("dev->id buffer overflow: %1$s %2$s"), &vendor[2], &product[2]); return NULL; } @@ -1678,7 +1672,7 @@ virPCIDeviceListAdd(virPCIDeviceList *list, { if (virPCIDeviceListFind(list, &dev->address)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Device %s is already in use"), dev->name); + _("Device %1$s is already in use"), dev->name); return -1; } VIR_APPEND_ELEMENT(list->devs, list->count, dev); @@ -1868,7 +1862,7 @@ virPCIDeviceAddressIOMMUGroupIterate(virPCIDeviceAddress *orig, if (virPCIDeviceAddressParse(ent->d_name, &newDev) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Found invalid device link '%s' in '%s'"), + _("Found invalid device link '%1$s' in '%2$s'"), ent->d_name, groupPath); return -1; } @@ -1995,7 +1989,7 @@ virPCIDeviceAddressGetIOMMUGroupNum(virPCIDeviceAddress *addr) return -2; if (virFileResolveLink(devPath, &groupPath) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to resolve device %s iommu_group symlink %s"), + _("Unable to resolve device %1$s iommu_group symlink %2$s"), devName, devPath); return -1; } @@ -2003,8 +1997,7 @@ virPCIDeviceAddressGetIOMMUGroupNum(virPCIDeviceAddress *addr) groupNumStr = g_path_get_basename(groupPath); if (virStrToLong_ui(groupNumStr, NULL, 10, &groupNum) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("device %s iommu_group symlink %s has " - "invalid group number %s"), + _("device %1$s iommu_group symlink %2$s has invalid group number %3$s"), devName, groupPath, groupNumStr); return -1; } @@ -2039,13 +2032,13 @@ virPCIDeviceGetIOMMUGroupDev(virPCIDevice *dev) if (virFileIsLink(devPath) != 1) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Invalid device %s iommu_group file %s is not a symlink"), + _("Invalid device %1$s iommu_group file %2$s is not a symlink"), dev->name, devPath); return NULL; } if (virFileResolveLink(devPath, &groupPath) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to resolve device %s iommu_group symlink %s"), + _("Unable to resolve device %1$s iommu_group symlink %2$s"), dev->name, devPath); return NULL; } @@ -2119,7 +2112,7 @@ virPCIDeviceIsBehindSwitchLackingACS(virPCIDevice *dev) return 0; } else { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to find parent device for %s"), + _("Failed to find parent device for %1$s"), dev->name); return -1; } @@ -2172,8 +2165,7 @@ int virPCIDeviceIsAssignable(virPCIDevice *dev, dev->id, dev->name); } else { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Device %s is behind a switch lacking ACS and " - "cannot be assigned"), + _("Device %1$s is behind a switch lacking ACS and cannot be assigned"), dev->name); return 0; } @@ -2192,7 +2184,7 @@ logStrToLong_ui(char const *s, ret = virStrToLong_ui(s, end_ptr, base, result); if (ret != 0) - VIR_ERROR(_("Failed to convert '%s' to unsigned int"), s); + VIR_ERROR(_("Failed to convert '%1$s' to unsigned int"), s); return ret; } @@ -2282,7 +2274,7 @@ virPCIGetDeviceAddressFromSysfsLink(const char *device_link) device_path = virFileCanonicalizePath(device_link); if (device_path == NULL) { virReportSystemError(errno, - _("Failed to resolve device link '%s'"), + _("Failed to resolve device link '%1$s'"), device_link); return NULL; } @@ -2292,7 +2284,7 @@ virPCIGetDeviceAddressFromSysfsLink(const char *device_link) if (virPCIDeviceAddressParse(config_address, bdf) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to parse PCI config address '%s'"), + _("Failed to parse PCI config address '%1$s'"), config_address); return NULL; } @@ -2364,7 +2356,7 @@ virPCIGetVirtualFunctionsFull(const char *sysfs_path, return -1; if (virStrToLong_ull(totalvfs_str, &end, 10, &maxfunctions) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unrecognized value in %s: %s"), + _("Unrecognized value in %1$s: %2$s"), totalvfs_file, totalvfs_str); return -1; } @@ -2383,7 +2375,7 @@ virPCIGetVirtualFunctionsFull(const char *sysfs_path, if (!(fnc.addr = virPCIGetDeviceAddressFromSysfsLink(device_link))) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to get SRIOV function from device link '%s'"), + _("Failed to get SRIOV function from device link '%1$s'"), device_link); return -1; } @@ -2434,8 +2426,8 @@ virPCIGetVirtualFunctionIndex(const char *pf_sysfs_device_link, if (virPCIGetVirtualFunctions(pf_sysfs_device_link, &virt_fns) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Error getting physical function's '%s' " - "virtual_functions"), pf_sysfs_device_link); + _("Error getting physical function's '%1$s' virtual_functions"), + pf_sysfs_device_link); return -1; } @@ -2582,7 +2574,7 @@ virPCIGetNetName(const char *device_link_sysfs_path, } virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not find any network device under PCI device at %s"), + _("Could not find any network device under PCI device at %1$s"), device_link_sysfs_path); return -1; } @@ -2635,7 +2627,7 @@ virPCIGetVirtualFunctionInfo(const char *vf_sysfs_device_path, * PF device is bound to a network driver */ virReportError(VIR_ERR_INTERNAL_ERROR, - _("The PF device for VF %s has no network device name"), + _("The PF device for VF %1$s has no network device name"), vf_sysfs_device_path); return -1; } @@ -2680,18 +2672,18 @@ virPCIDeviceGetVPD(virPCIDevice *dev) vpdPath = virPCIFile(dev->name, "vpd"); if (!virPCIDeviceHasVPD(dev)) { - virReportError(VIR_ERR_INTERNAL_ERROR, _("Device %s does not have a VPD"), + virReportError(VIR_ERR_INTERNAL_ERROR, _("Device %1$s does not have a VPD"), virPCIDeviceGetName(dev)); return NULL; } if ((fd = open(vpdPath, O_RDONLY)) < 0) { - virReportSystemError(-fd, _("Failed to open a VPD file '%s'"), vpdPath); + virReportSystemError(-fd, _("Failed to open a VPD file '%1$s'"), vpdPath); return NULL; } res = virPCIVPDParse(fd); if (VIR_CLOSE(fd) < 0) { - virReportSystemError(errno, _("Unable to close the VPD file, fd: %d"), fd); + virReportSystemError(errno, _("Unable to close the VPD file, fd: %1$d"), fd); return NULL; } @@ -2854,7 +2846,7 @@ virPCIDeviceGetLinkCapSta(virPCIDevice *dev, if (!dev->pcie_cap_pos) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("pci device %s is not a PCI-Express device"), + _("pci device %1$s is not a PCI-Express device"), dev->name); goto cleanup; } @@ -2894,7 +2886,7 @@ int virPCIGetHeaderType(virPCIDevice *dev, int *hdrType) type &= PCI_HEADER_TYPE_MASK; if (type >= VIR_PCI_HEADER_LAST) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unknown PCI header type '%d' for device '%s'"), + _("Unknown PCI header type '%1$d' for device '%2$s'"), type, dev->name); return -1; } diff --git a/src/util/virperf.c b/src/util/virperf.c index 434d1d99c4..03341e73e3 100644 --- a/src/util/virperf.c +++ b/src/util/virperf.c @@ -214,7 +214,7 @@ virPerfEventEnable(virPerf *perf, type == VIR_PERF_EVENT_MBMT || type == VIR_PERF_EVENT_MBML)) { virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, - _("unable to enable host cpu perf event for %s"), + _("unable to enable host cpu perf event for %1$s"), virPerfEventTypeToString(type)); return -1; } @@ -244,14 +244,14 @@ virPerfEventEnable(virPerf *perf, event->fd = syscall(__NR_perf_event_open, &attr, pid, -1, -1, 0); if (event->fd < 0) { virReportSystemError(errno, - _("unable to open host cpu perf event for %s"), + _("unable to open host cpu perf event for %1$s"), virPerfEventTypeToString(type)); goto error; } if (ioctl(event->fd, PERF_EVENT_IOC_ENABLE) < 0) { virReportSystemError(errno, - _("unable to enable host cpu perf event for %s"), + _("unable to enable host cpu perf event for %1$s"), virPerfEventTypeToString(type)); goto error; } @@ -275,7 +275,7 @@ virPerfEventDisable(virPerf *perf, if (ioctl(event->fd, PERF_EVENT_IOC_DISABLE) < 0) { virReportSystemError(errno, - _("unable to disable host cpu perf event for %s"), + _("unable to disable host cpu perf event for %1$s"), virPerfEventTypeToString(type)); return -1; } diff --git a/src/util/virpidfile.c b/src/util/virpidfile.c index 4693aaaf78..f61caca2de 100644 --- a/src/util/virpidfile.c +++ b/src/util/virpidfile.c @@ -378,7 +378,7 @@ int virPidFileAcquirePathFull(const char *path, if ((fd = open(path, O_WRONLY|O_CREAT, 0644)) < 0) { if (!quiet) { virReportSystemError(errno, - _("Failed to open pid file '%s'"), + _("Failed to open pid file '%1$s'"), path); } return -1; @@ -387,7 +387,7 @@ int virPidFileAcquirePathFull(const char *path, if (virSetCloseExec(fd) < 0) { if (!quiet) { virReportSystemError(errno, - _("Failed to set close-on-exec flag '%s'"), + _("Failed to set close-on-exec flag '%1$s'"), path); } VIR_FORCE_CLOSE(fd); @@ -397,7 +397,7 @@ int virPidFileAcquirePathFull(const char *path, if (fstat(fd, &b) < 0) { if (!quiet) { virReportSystemError(errno, - _("Unable to check status of pid file '%s'"), + _("Unable to check status of pid file '%1$s'"), path); } VIR_FORCE_CLOSE(fd); @@ -407,7 +407,7 @@ int virPidFileAcquirePathFull(const char *path, if (virFileLock(fd, false, 0, 1, waitForLock) < 0) { if (!quiet) { virReportSystemError(errno, - _("Failed to acquire pid file '%s'"), + _("Failed to acquire pid file '%1$s'"), path); } VIR_FORCE_CLOSE(fd); @@ -438,7 +438,7 @@ int virPidFileAcquirePathFull(const char *path, if (ftruncate(fd, 0) < 0) { if (!quiet) { virReportSystemError(errno, - _("Failed to truncate pid file '%s'"), + _("Failed to truncate pid file '%1$s'"), path); } VIR_FORCE_CLOSE(fd); @@ -448,7 +448,7 @@ int virPidFileAcquirePathFull(const char *path, if (safewrite(fd, pidstr, strlen(pidstr)) < 0) { if (!quiet) { virReportSystemError(errno, - _("Failed to write to pid file '%s'"), + _("Failed to write to pid file '%1$s'"), path); } VIR_FORCE_CLOSE(fd); @@ -544,7 +544,7 @@ virPidFileConstructPath(bool privileged, if (g_mkdir_with_parents(rundir, 0700) < 0) { virReportSystemError(errno, - _("Cannot create user runtime directory '%s'"), + _("Cannot create user runtime directory '%1$s'"), rundir); return -1; } diff --git a/src/util/virpolkit.c b/src/util/virpolkit.c index 6c83eaf412..0a637db9ba 100644 --- a/src/util/virpolkit.c +++ b/src/util/virpolkit.c @@ -137,7 +137,7 @@ int virPolkitCheckAuth(const char *actionid, _("user cancelled authentication process")); } else if (is_challenge) { virReportError(VIR_ERR_AUTH_UNAVAILABLE, - _("no polkit agent available to authenticate action '%s'"), + _("no polkit agent available to authenticate action '%1$s'"), actionid); } else { virReportError(VIR_ERR_AUTH_FAILED, "%s", diff --git a/src/util/virportallocator.c b/src/util/virportallocator.c index 87835a3ed7..6d6f99778e 100644 --- a/src/util/virportallocator.c +++ b/src/util/virportallocator.c @@ -147,7 +147,7 @@ virPortAllocatorBindToPort(bool *used, addr = (struct sockaddr*)&addr4; addrlen = sizeof(addr4); } else { - virReportError(VIR_ERR_INTERNAL_ERROR, _("Unknown family %d"), family); + virReportError(VIR_ERR_INTERNAL_ERROR, _("Unknown family %1$d"), family); return -1; } @@ -176,7 +176,7 @@ virPortAllocatorBindToPort(bool *used, *used = true; ret = 0; } else { - virReportSystemError(errno, _("Unable to bind to port %d"), port); + virReportSystemError(errno, _("Unable to bind to port %1$d"), port); } goto cleanup; } @@ -224,7 +224,7 @@ virPortAllocatorAcquire(const virPortAllocatorRange *range, /* Add port to bitmap of reserved ports */ if (virBitmapSetBit(pa->bitmap, i) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to reserve port %zu"), i); + _("Failed to reserve port %1$zu"), i); return -1; } *port = i; @@ -234,7 +234,7 @@ virPortAllocatorAcquire(const virPortAllocatorRange *range, } virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to find an unused port in range '%s' (%d-%d)"), + _("Unable to find an unused port in range '%1$s' (%2$d-%3$d)"), range->name, range->start, range->end); return -1; } @@ -272,7 +272,7 @@ virPortAllocatorSetUsed(unsigned short port) if (virBitmapIsBitSet(pa->bitmap, port) || virBitmapSetBit(pa->bitmap, port) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to reserve port %d"), port); + _("Failed to reserve port %1$d"), port); return -1; } } diff --git a/src/util/virprocess.c b/src/util/virprocess.c index 39ca5de811..7f29f8be89 100644 --- a/src/util/virprocess.c +++ b/src/util/virprocess.c @@ -97,13 +97,13 @@ virProcessTranslateStatus(int status) { char *buf; if (WIFEXITED(status)) { - buf = g_strdup_printf(_("exit status %d"), + buf = g_strdup_printf(_("exit status %1$d"), WEXITSTATUS(status)); } else if (WIFSIGNALED(status)) { - buf = g_strdup_printf(_("fatal signal %d"), + buf = g_strdup_printf(_("fatal signal %1$d"), WTERMSIG(status)); } else { - buf = g_strdup_printf(_("invalid value %d"), status); + buf = g_strdup_printf(_("invalid value %1$d"), status); } return buf; } @@ -200,7 +200,7 @@ virProcessWait(pid_t pid, int *exitstatus, bool raw) if (pid <= 0) { if (pid != -1) - virReportSystemError(EINVAL, _("unable to wait for process %lld"), + virReportSystemError(EINVAL, _("unable to wait for process %1$lld"), (long long) pid); return -1; } @@ -210,7 +210,7 @@ virProcessWait(pid_t pid, int *exitstatus, bool raw) errno == EINTR); if (ret == -1) { - virReportSystemError(errno, _("unable to wait for process %lld"), + virReportSystemError(errno, _("unable to wait for process %1$lld"), (long long) pid); return -1; } @@ -231,7 +231,7 @@ virProcessWait(pid_t pid, int *exitstatus, bool raw) error: st = virProcessTranslateStatus(status); virReportError(VIR_ERR_INTERNAL_ERROR, - _("Child process (%lld) unexpected %s"), + _("Child process (%1$lld) unexpected %2$s"), (long long) pid, NULLSTR(st)); return -1; } @@ -241,7 +241,7 @@ virProcessWait(pid_t pid, int *exitstatus, bool raw) char * virProcessTranslateStatus(int status) { - return g_strdup_printf(_("invalid value %d"), status); + return g_strdup_printf(_("invalid value %1$d"), status); } @@ -256,7 +256,7 @@ virProcessAbort(pid_t pid) int virProcessWait(pid_t pid, int *exitstatus G_GNUC_UNUSED, bool raw G_GNUC_UNUSED) { - virReportSystemError(ENOSYS, _("unable to wait for process %lld"), + virReportSystemError(ENOSYS, _("unable to wait for process %1$lld"), (long long) pid); return -1; } @@ -417,7 +417,7 @@ virProcessKillPainfullyDelay(pid_t pid, bool force, unsigned int extradelay, boo if (rc < 0) { if (errno != ESRCH) { virReportSystemError(errno, - _("Failed to terminate process %lld with SIG%s"), + _("Failed to terminate process %1$lld with SIG%2$s"), (long long)pid, signame); return -1; } @@ -428,7 +428,7 @@ virProcessKillPainfullyDelay(pid_t pid, bool force, unsigned int extradelay, boo } virReportSystemError(EBUSY, - _("Failed to terminate process %lld with SIG%s"), + _("Failed to terminate process %1$lld with SIG%2$s"), (long long)pid, signame); return 0; @@ -486,7 +486,7 @@ int virProcessSetAffinity(pid_t pid, virBitmap *map, bool quiet) pid, g_strerror(errno)); } else { virReportSystemError(errno, - _("cannot set CPU affinity on process %d"), pid); + _("cannot set CPU affinity on process %1$d"), pid); return -1; } } @@ -515,7 +515,7 @@ virProcessGetAffinity(pid_t pid) if (sched_getaffinity(pid, masklen, mask) < 0) { virReportSystemError(errno, - _("cannot get CPU affinity of process %d"), pid); + _("cannot get CPU affinity of process %1$d"), pid); goto cleanup; } @@ -554,7 +554,7 @@ int virProcessSetAffinity(pid_t pid, pid, g_strerror(errno)); } else { virReportSystemError(errno, - _("cannot set CPU affinity on process %d"), pid); + _("cannot set CPU affinity on process %1$d"), pid); return -1; } } @@ -573,7 +573,7 @@ virProcessGetAffinity(pid_t pid) if (cpuset_getaffinity(CPU_LEVEL_WHICH, CPU_WHICH_PID, pid, sizeof(mask), &mask) != 0) { virReportSystemError(errno, - _("cannot get CPU affinity of process %d"), pid); + _("cannot get CPU affinity of process %1$d"), pid); return NULL; } @@ -927,8 +927,7 @@ virProcessSetMaxMemLock(pid_t pid, unsigned long long bytes) if (virProcessSetLimit(pid, RLIMIT_MEMLOCK, &rlim) < 0) { virReportSystemError(errno, - _("cannot limit locked memory " - "of process %lld to %llu"), + _("cannot limit locked memory of process %1$lld to %2$llu"), (long long int)pid, bytes); return -1; } @@ -969,8 +968,7 @@ virProcessGetMaxMemLock(pid_t pid, if (virProcessGetLimit(pid, RLIMIT_MEMLOCK, &rlim) < 0) { virReportSystemError(errno, - _("cannot get locked memory limit " - "of process %lld"), + _("cannot get locked memory limit of process %1$lld"), (long long int) pid); return -1; } @@ -1017,8 +1015,7 @@ virProcessSetMaxProcesses(pid_t pid, unsigned int procs) if (virProcessSetLimit(pid, RLIMIT_NPROC, &rlim) < 0) { virReportSystemError(errno, - _("cannot limit number of subprocesses " - "of process %lld to %u"), + _("cannot limit number of subprocesses of process %1$lld to %2$u"), (long long int)pid, procs); return -1; } @@ -1061,8 +1058,7 @@ virProcessSetMaxFiles(pid_t pid, unsigned int files) if (virProcessSetLimit(pid, RLIMIT_NOFILE, &rlim) < 0) { virReportSystemError(errno, - _("cannot limit number of open files " - "of process %lld to %u"), + _("cannot limit number of open files of process %1$lld to %2$u"), (long long int)pid, files); return -1; } @@ -1098,8 +1094,7 @@ virProcessSetMaxCoreSize(pid_t pid, unsigned long long bytes) if (virProcessSetLimit(pid, RLIMIT_CORE, &rlim) < 0) { virReportSystemError(errno, - _("cannot limit core file size " - "of process %lld to %llu"), + _("cannot limit core file size of process %1$lld to %2$llu"), (long long int)pid, bytes); return -1; } @@ -1130,14 +1125,14 @@ int virProcessGetStartTime(pid_t pid, if (!proc_stat || g_strv_length(proc_stat) < 22) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Cannot find start time for pid %d"), (int)pid); + _("Cannot find start time for pid %1$d"), (int)pid); return -1; } starttime_str = proc_stat[VIR_PROCESS_STAT_STARTTIME]; if (virStrToLong_ull(starttime_str, NULL, 10, timestamp) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Cannot parse start time %s for pid %d"), + _("Cannot parse start time %1$s for pid %2$d"), starttime_str, (int)pid); return -1; } @@ -1363,7 +1358,7 @@ virProcessRunInFork(virProcessForkCallback cb, memcpy(bin->bindata, buf, sizeof(*bin)); virReportError(VIR_ERR_INTERNAL_ERROR, - _("child reported (status=%d): %s"), + _("child reported (status=%1$d): %2$s"), status, NULLSTR(bin->data.message)); virRaiseErrorFull(__FILE__, __FUNCTION__, __LINE__, @@ -1378,7 +1373,7 @@ virProcessRunInFork(virProcessForkCallback cb, "%s", bin->data.message); } else { virReportError(VIR_ERR_INTERNAL_ERROR, - _("child didn't write error (status=%d)"), + _("child didn't write error (status=%1$d)"), status); } } @@ -1599,7 +1594,7 @@ virProcessSetScheduler(pid_t pid, if (pol < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Scheduler '%s' is not supported on this platform"), + _("Scheduler '%1$s' is not supported on this platform"), virProcessSchedPolicyTypeToString(policy)); return -1; } @@ -1624,7 +1619,7 @@ virProcessSetScheduler(pid_t pid, if (priority < min || priority > max) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Scheduler priority %d out of range [%d, %d]"), + _("Scheduler priority %1$d out of range [%2$d, %3$d]"), priority, min, max); return -1; } @@ -1634,7 +1629,7 @@ virProcessSetScheduler(pid_t pid, if (sched_setscheduler(pid, pol, &param) < 0) { virReportSystemError(errno, - _("Cannot set scheduler parameters for pid %lld"), + _("Cannot set scheduler parameters for pid %1$lld"), (long long) pid); return -1; } @@ -1827,7 +1822,7 @@ virProcessGetSchedInfo(unsigned long long *cpuWait, line = strchr(line, ':'); if (!line) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Missing separator in sched info '%s'"), + _("Missing separator in sched info '%1$s'"), lines[i]); return -1; } @@ -1837,7 +1832,7 @@ virProcessGetSchedInfo(unsigned long long *cpuWait, if (virStrToDouble(line, NULL, &val) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to parse sched info value '%s'"), + _("Unable to parse sched info value '%1$s'"), line); return -1; } diff --git a/src/util/virrandom.c b/src/util/virrandom.c index e23ddf8e1d..73c5832a05 100644 --- a/src/util/virrandom.c +++ b/src/util/virrandom.c @@ -111,7 +111,7 @@ virRandomBytes(unsigned char *buf, if ((rv = gnutls_rnd(GNUTLS_RND_RANDOM, buf, buflen)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("failed to generate byte stream: %s"), + _("failed to generate byte stream: %1$s"), gnutls_strerror(rv)); return -1; } diff --git a/src/util/virresctrl.c b/src/util/virresctrl.c index c46a78f113..1e98b111f2 100644 --- a/src/util/virresctrl.c +++ b/src/util/virresctrl.c @@ -614,7 +614,7 @@ virResctrlGetCacheInfo(virResctrlInfo *resctrl, if (i_level->types[type]) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Duplicate cache type in resctrl for level %u"), + _("Duplicate cache type in resctrl for level %1$u"), level); return -1; } @@ -894,8 +894,7 @@ virResctrlInfoGetCache(virResctrlInfo *resctrl, } else { if (i_type->size != size) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("level %u cache size %llu does not match " - "expected size %llu"), + _("level %1$u cache size %2$llu does not match expected size %3$llu"), level, i_type->size, size); goto error; } @@ -966,7 +965,7 @@ virResctrlInfoGetMonitorPrefix(virResctrlInfo *resctrl, if (!mon) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Bad prefix name '%s' for resctrl monitor"), + _("Bad prefix name '%1$s' for resctrl monitor"), prefix); return -1; } @@ -1205,8 +1204,7 @@ virResctrlAllocSetCacheSize(virResctrlAlloc *alloc, { if (virResctrlAllocCheckCollision(alloc, level, type, cache)) { virReportError(VIR_ERR_XML_ERROR, - _("Colliding cache allocations for cache " - "level '%u' id '%u', type '%s'"), + _("Colliding cache allocations for cache level '%1$u' id '%2$u', type '%3$s'"), level, cache, virCacheTypeToString(type)); return -1; } @@ -1290,7 +1288,7 @@ virResctrlAllocSetMemoryBandwidth(virResctrlAlloc *alloc, if (mem_bw->bandwidths[id]) { virReportError(VIR_ERR_XML_ERROR, - _("Memory Bandwidth already defined for node %u"), + _("Memory Bandwidth already defined for node %1$u"), id); return -1; } @@ -1346,7 +1344,7 @@ virResctrlSetID(char **resctrlid, if (*resctrlid) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Attempt to overwrite resctrlid='%s' with id='%s'"), + _("Attempt to overwrite resctrlid='%1$s' with id='%2$s'"), *resctrlid, id); return -1; } @@ -1421,19 +1419,19 @@ virResctrlAllocParseProcessMemoryBandwidth(virResctrlInfo *resctrl, if (virStrToLong_uip(mem_bw, NULL, 10, &id) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Invalid node id %u "), id); + _("Invalid node id %1$u "), id); return -1; } if (virStrToLong_uip(tmp, NULL, 10, &bandwidth) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Invalid bandwidth %u"), bandwidth); + _("Invalid bandwidth %1$u"), bandwidth); return -1; } if (bandwidth < resctrl->membw_info->min_bandwidth || id > resctrl->membw_info->max_id) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Missing or inconsistent resctrl info for " - "memory bandwidth node '%u'"), id); + _("Missing or inconsistent resctrl info for memory bandwidth node '%1$u'"), + id); return -1; } if (alloc->mem_bw->nbandwidths <= id) { @@ -1576,7 +1574,7 @@ virResctrlAllocParseProcessCache(virResctrlInfo *resctrl, if (virStrToLong_uip(cache, NULL, 10, &cache_id) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Invalid cache id '%s'"), cache); + _("Invalid cache id '%1$s'"), cache); return -1; } @@ -1589,8 +1587,7 @@ virResctrlAllocParseProcessCache(virResctrlInfo *resctrl, !resctrl->levels[level] || !resctrl->levels[level]->types[type]) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Missing or inconsistent resctrl info for " - "level '%u' type '%s'"), + _("Missing or inconsistent resctrl info for level '%1$u' type '%2$s'"), level, virCacheTypeToString(type)); return -1; } @@ -1632,7 +1629,7 @@ virResctrlAllocParseCacheLine(virResctrlInfo *resctrl, if (virStrToLong_uip(line + 1, &line, 10, &level) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Cannot parse resctrl schema level '%s'"), + _("Cannot parse resctrl schema level '%1$s'"), line + 1); return -1; } @@ -1640,7 +1637,7 @@ virResctrlAllocParseCacheLine(virResctrlInfo *resctrl, type = virResctrlTypeFromString(line); if (type < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Cannot parse resctrl schema level '%s'"), + _("Cannot parse resctrl schema level '%1$s'"), line + 1); return -1; } @@ -1866,7 +1863,7 @@ virResctrlAllocGetUnused(virResctrlInfo *resctrl) if (rv < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not read schemata file for group %s"), + _("Could not read schemata file for group %1$s"), ent->d_name); return NULL; } @@ -1912,7 +1909,7 @@ virResctrlAllocFindUnused(virResctrlAlloc *alloc, if (cache >= f_type->nmasks) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Cache with id %u does not exists for level %d"), + _("Cache with id %1$u does not exists for level %2$d"), cache, level); return -1; } @@ -1920,16 +1917,14 @@ virResctrlAllocFindUnused(virResctrlAlloc *alloc, f_mask = f_type->masks[cache]; if (!f_mask) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Cache level %d id %u does not support tuning for " - "scope type '%s'"), + _("Cache level %1$d id %2$u does not support tuning for scope type '%3$s'"), level, cache, virCacheTypeToString(type)); return -1; } if (*size == i_type->size) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Cache allocation for the whole cache is not " - "possible, specify size smaller than %llu"), + _("Cache allocation for the whole cache is not possible, specify size smaller than %1$llu"), i_type->size); return -1; } @@ -1938,16 +1933,14 @@ virResctrlAllocFindUnused(virResctrlAlloc *alloc, if (*size % i_type->control.granularity) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Cache allocation of size %llu is not " - "divisible by granularity %llu"), + _("Cache allocation of size %1$llu is not divisible by granularity %2$llu"), *size, i_type->control.granularity); return -1; } if (need_bits < i_type->min_cbm_bits) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Cache allocation of size %llu is smaller " - "than the minimum allowed allocation %llu"), + _("Cache allocation of size %1$llu is smaller than the minimum allowed allocation %2$llu"), *size, i_type->control.granularity * i_type->min_cbm_bits); return -1; @@ -1985,9 +1978,7 @@ virResctrlAllocFindUnused(virResctrlAlloc *alloc, if (last_pos < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Not enough room for allocation of " - "%llu bytes for level %u cache %u " - "scope type '%s'"), + _("Not enough room for allocation of %1$llu bytes for level %2$u cache %3$u scope type '%4$s'"), *size, level, cache, virCacheTypeToString(type)); return -1; @@ -2028,25 +2019,21 @@ virResctrlAllocMemoryBandwidth(virResctrlInfo *resctrl, if (*(mem_bw_alloc->bandwidths[i]) % mem_bw_info->bandwidth_granularity) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Memory Bandwidth allocation of size " - "%u is not divisible by granularity %u"), + _("Memory Bandwidth allocation of size %1$u is not divisible by granularity %2$u"), *(mem_bw_alloc->bandwidths[i]), mem_bw_info->bandwidth_granularity); return -1; } if (*(mem_bw_alloc->bandwidths[i]) < mem_bw_info->min_bandwidth) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Memory Bandwidth allocation of size " - "%u is smaller than the minimum " - "allowed allocation %u"), + _("Memory Bandwidth allocation of size %1$u is smaller than the minimum allowed allocation %2$u"), *(mem_bw_alloc->bandwidths[i]), mem_bw_info->min_bandwidth); return -1; } if (i > mem_bw_info->max_id) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("bandwidth controller id %zd does not " - "exist, max controller id %u"), + _("bandwidth controller id %1$zd does not exist, max controller id %2$u"), i, mem_bw_info->max_id); return -1; } @@ -2168,7 +2155,7 @@ virResctrlAllocAssign(virResctrlInfo *resctrl, if (!f_level) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Cache level %d does not support tuning"), + _("Cache level %1$d does not support tuning"), level); return -1; } @@ -2183,8 +2170,7 @@ virResctrlAllocAssign(virResctrlInfo *resctrl, if (!f_type) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Cache level %d does not support tuning for " - "scope type '%s'"), + _("Cache level %1$d does not support tuning for scope type '%2$s'"), level, virCacheTypeToString(type)); return -1; } @@ -2210,8 +2196,8 @@ virResctrlDeterminePath(const char *parentpath, { if (!id) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Resctrl ID must be set before determining resctrl " - "parentpath='%s' prefix='%s'"), parentpath, prefix); + _("Resctrl ID must be set before determining resctrl parentpath='%1$s' prefix='%2$s'"), + parentpath, prefix); return NULL; } @@ -2225,7 +2211,7 @@ virResctrlAllocDeterminePath(virResctrlAlloc *alloc, { if (alloc->path) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Resctrl allocation path is already set to '%s'"), + _("Resctrl allocation path is already set to '%1$s'"), alloc->path); return -1; } @@ -2258,7 +2244,7 @@ virResctrlCreateGroupPath(const char *path) if (g_mkdir_with_parents(path, 0777) < 0) { virReportSystemError(errno, - _("Cannot create resctrl directory '%s'"), + _("Cannot create resctrl directory '%1$s'"), path); return -1; } @@ -2315,7 +2301,7 @@ virResctrlAllocCreate(virResctrlInfo *resctrl, if (virFileWriteStr(schemata_path, alloc_str, 0) < 0) { rmdir(alloc->path); virReportSystemError(errno, - _("Cannot write into schemata file '%s'"), + _("Cannot write into schemata file '%1$s'"), schemata_path); goto cleanup; } @@ -2346,7 +2332,7 @@ virResctrlAddPID(const char *path, if (virFileWriteStr(tasks, pidstr, 0) < 0) { virReportSystemError(errno, - _("Cannot write pid in tasks file '%s'"), + _("Cannot write pid in tasks file '%1$s'"), tasks); return -1; } @@ -2383,7 +2369,7 @@ virResctrlAllocRemove(virResctrlAlloc *alloc) VIR_DEBUG("Removing resctrl allocation %s", alloc->path); if (rmdir(alloc->path) != 0 && errno != ENOENT) { ret = -errno; - VIR_ERROR(_("Unable to remove %s (%d)"), alloc->path, errno); + VIR_ERROR(_("Unable to remove %1$s (%2$d)"), alloc->path, errno); } return ret; @@ -2438,7 +2424,7 @@ virResctrlMonitorDeterminePath(virResctrlMonitor *monitor, if (monitor->path) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Resctrl monitor path is already set to '%s'"), + _("Resctrl monitor path is already set to '%1$s'"), monitor->path); return -1; } @@ -2530,7 +2516,7 @@ virResctrlMonitorRemove(virResctrlMonitor *monitor) VIR_DEBUG("Removing resctrl monitor path=%s", monitor->path); if (rmdir(monitor->path) != 0 && errno != ENOENT) { ret = -errno; - VIR_ERROR(_("Unable to remove %s (%d)"), monitor->path, errno); + VIR_ERROR(_("Unable to remove %1$s (%2$d)"), monitor->path, errno); } return ret; @@ -2627,7 +2613,7 @@ virResctrlMonitorGetStats(virResctrlMonitor *monitor, ent->d_name, resources[i]); if (rv == -2) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("File '%s/%s/%s' does not exist."), + _("File '%1$s/%2$s/%3$s' does not exist."), datapath, ent->d_name, resources[i]); } if (rv < 0) diff --git a/src/util/virrotatingfile.c b/src/util/virrotatingfile.c index d339e58e1c..b02a88c4b0 100644 --- a/src/util/virrotatingfile.c +++ b/src/util/virrotatingfile.c @@ -106,21 +106,21 @@ virRotatingFileWriterEntryNew(const char *path, if ((entry->fd = open(path, O_CREAT|O_APPEND|O_WRONLY|O_CLOEXEC, mode)) < 0) { virReportSystemError(errno, - _("Unable to open file: %s"), path); + _("Unable to open file: %1$s"), path); goto error; } entry->pos = lseek(entry->fd, 0, SEEK_END); if (entry->pos == (off_t)-1) { virReportSystemError(errno, - _("Unable to determine current file offset: %s"), + _("Unable to determine current file offset: %1$s"), path); goto error; } if (fstat(entry->fd, &sb) < 0) { virReportSystemError(errno, - _("Unable to determine current file inode: %s"), + _("Unable to determine current file inode: %1$s"), path); goto error; } @@ -149,7 +149,7 @@ virRotatingFileReaderEntryNew(const char *path) if ((entry->fd = open(path, O_RDONLY|O_CLOEXEC)) < 0) { if (errno != ENOENT) { virReportSystemError(errno, - _("Unable to open file: %s"), path); + _("Unable to open file: %1$s"), path); goto error; } } @@ -157,7 +157,7 @@ virRotatingFileReaderEntryNew(const char *path) if (entry->fd != -1) { if (fstat(entry->fd, &sb) < 0) { virReportSystemError(errno, - _("Unable to determine current file inode: %s"), + _("Unable to determine current file inode: %1$s"), path); goto error; } @@ -183,7 +183,7 @@ virRotatingFileWriterDelete(virRotatingFileWriter *file) if (unlink(file->basepath) < 0 && errno != ENOENT) { virReportSystemError(errno, - _("Unable to delete file %s"), + _("Unable to delete file %1$s"), file->basepath); return -1; } @@ -195,7 +195,7 @@ virRotatingFileWriterDelete(virRotatingFileWriter *file) if (unlink(oldpath) < 0 && errno != ENOENT) { virReportSystemError(errno, - _("Unable to delete file %s"), + _("Unable to delete file %1$s"), oldpath); VIR_FREE(oldpath); return -1; @@ -240,7 +240,7 @@ virRotatingFileWriterNew(const char *path, if (maxbackup > VIR_MAX_MAX_BACKUP) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Max backup %zu must be less than or equal to %d"), + _("Max backup %1$zu must be less than or equal to %2$d"), maxbackup, VIR_MAX_MAX_BACKUP); goto error; } @@ -287,7 +287,7 @@ virRotatingFileReaderNew(const char *path, if (maxbackup > VIR_MAX_MAX_BACKUP) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Max backup %zu must be less than or equal to %d"), + _("Max backup %1$zu must be less than or equal to %2$d"), maxbackup, VIR_MAX_MAX_BACKUP); goto error; } @@ -368,7 +368,7 @@ virRotatingFileWriterRollover(virRotatingFileWriter *file) if (unlink(file->basepath) < 0 && errno != ENOENT) { virReportSystemError(errno, - _("Unable to remove %s"), + _("Unable to remove %1$s"), file->basepath); goto cleanup; } @@ -386,7 +386,7 @@ virRotatingFileWriterRollover(virRotatingFileWriter *file) if (rename(thispath, nextpath) < 0 && errno != ENOENT) { virReportSystemError(errno, - _("Unable to rename %s to %s"), + _("Unable to rename %1$s to %2$s"), thispath, nextpath); goto cleanup; } @@ -456,7 +456,7 @@ virRotatingFileWriterAppend(virRotatingFileWriter *file, if (towrite) { if (safewrite(file->entry->fd, buf, towrite) != towrite) { virReportSystemError(errno, - _("Unable to write to file %s"), + _("Unable to write to file %1$s"), file->basepath); return -1; } @@ -520,7 +520,7 @@ virRotatingFileReaderSeek(virRotatingFileReader *file, ret = lseek(entry->fd, offset, SEEK_SET); if (ret == (off_t)-1) { virReportSystemError(errno, - _("Unable to seek to inode %llu offset %llu"), + _("Unable to seek to inode %1$llu offset %2$llu"), (unsigned long long)inode, (unsigned long long)offset); return -1; } @@ -533,7 +533,7 @@ virRotatingFileReaderSeek(virRotatingFileReader *file, ret = lseek(file->entries[0]->fd, offset, SEEK_SET); if (ret == (off_t)-1) { virReportSystemError(errno, - _("Unable to seek to inode %llu offset %llu"), + _("Unable to seek to inode %1$llu offset %2$llu"), (unsigned long long)inode, (unsigned long long)offset); return -1; } @@ -576,7 +576,7 @@ virRotatingFileReaderConsume(virRotatingFileReader *file, got = saferead(entry->fd, buf + ret, len); if (got < 0) { virReportSystemError(errno, - _("Unable to read from file %s"), + _("Unable to read from file %1$s"), entry->path); return -1; } diff --git a/src/util/virscsi.c b/src/util/virscsi.c index 6a90d9002f..3d2c77e3b8 100644 --- a/src/util/virscsi.c +++ b/src/util/virscsi.c @@ -93,7 +93,7 @@ virSCSIDeviceGetAdapterId(const char *adapter, NULL, 0, adapter_id) == 0) return 0; virReportError(VIR_ERR_INTERNAL_ERROR, - _("Cannot parse adapter '%s'"), adapter); + _("Cannot parse adapter '%1$s'"), adapter); return -1; } @@ -195,7 +195,7 @@ virSCSIDeviceNew(const char *sysfs_prefix, if (!virFileExists(dev->sg_path)) { virReportSystemError(errno, - _("SCSI device '%s': could not access %s"), + _("SCSI device '%1$s': could not access %2$s"), dev->name, dev->sg_path); return NULL; } @@ -353,7 +353,7 @@ virSCSIDeviceListAdd(virSCSIDeviceList *list, { if (virSCSIDeviceListFind(list, dev)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Device %s already exists"), + _("Device %1$s already exists"), dev->name); return -1; } diff --git a/src/util/virscsihost.c b/src/util/virscsihost.c index 32d7f2312f..09023f5c83 100644 --- a/src/util/virscsihost.c +++ b/src/util/virscsihost.c @@ -176,14 +176,14 @@ virSCSIHostGetNumber(const char *adapter_name, adapter_name += strlen("host"); } else { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Invalid adapter name '%s' for SCSI pool"), + _("Invalid adapter name '%1$s' for SCSI pool"), adapter_name); return -1; } if (virStrToLong_ui(adapter_name, NULL, 10, result) == -1) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Invalid adapter name '%s' for SCSI pool"), + _("Invalid adapter name '%1$s' for SCSI pool"), adapter_name); return -1; } @@ -218,8 +218,7 @@ virSCSIHostGetNameByParentaddr(unsigned int domain, function); if (!(name = virSCSIHostFindByPCI(NULL, parentaddr, unique_id))) { virReportError(VIR_ERR_XML_ERROR, - _("Failed to find scsi_host using PCI '%s' " - "and unique_id='%u'"), + _("Failed to find scsi_host using PCI '%1$s' and unique_id='%2$u'"), parentaddr, unique_id); return NULL; } diff --git a/src/util/virscsivhost.c b/src/util/virscsivhost.c index 1ea6a1ee2a..15024d7106 100644 --- a/src/util/virscsivhost.c +++ b/src/util/virscsivhost.c @@ -80,7 +80,7 @@ virSCSIVHostOpenVhostSCSI(int *vhostfd) { if (!virFileExists(VHOST_SCSI_DEVICE)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("vhost-scsi device file '%s' cannot be found"), + _("vhost-scsi device file '%1$s' cannot be found"), VHOST_SCSI_DEVICE); return -1; } @@ -88,7 +88,7 @@ virSCSIVHostOpenVhostSCSI(int *vhostfd) *vhostfd = open(VHOST_SCSI_DEVICE, O_RDWR); if (*vhostfd < 0) { - virReportSystemError(errno, _("Failed to open %s"), VHOST_SCSI_DEVICE); + virReportSystemError(errno, _("Failed to open %1$s"), VHOST_SCSI_DEVICE); return -1; } @@ -174,7 +174,7 @@ virSCSIVHostDeviceListAdd(virSCSIVHostDeviceList *list, { if (virSCSIVHostDeviceListFind(list, dev)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Device %s is already in use"), dev->name); + _("Device %1$s is already in use"), dev->name); return -1; } VIR_APPEND_ELEMENT(list->devs, list->count, dev); diff --git a/src/util/virsecret.c b/src/util/virsecret.c index f2c13e27c9..b558aa1d61 100644 --- a/src/util/virsecret.c +++ b/src/util/virsecret.c @@ -84,7 +84,7 @@ virSecretLookupParseSecret(xmlNodePtr secretnode, if (uuid) { if (virUUIDParse(uuid, def->u.uuid) < 0) { virReportError(VIR_ERR_XML_ERROR, - _("invalid secret uuid '%s'"), uuid); + _("invalid secret uuid '%1$s'"), uuid); return -1; } def->type = VIR_SECRET_LOOKUP_TYPE_UUID; @@ -165,8 +165,7 @@ virSecretGetSecretString(virConnectPtr conn, virUUIDFormat(seclookupdef->u.uuid, uuidstr); virReportError(VIR_ERR_INVALID_ARG, - _("secret with uuid %s is of type '%s' not " - "expected '%s' type"), + _("secret with uuid %1$s is of type '%2$s' not expected '%3$s' type"), uuidstr, virSecretUsageTypeToString(sec->usageType), virSecretUsageTypeToString(secretUsageType)); return -1; diff --git a/src/util/virsocketaddr.c b/src/util/virsocketaddr.c index 0480485ab7..43511bdd69 100644 --- a/src/util/virsocketaddr.c +++ b/src/util/virsocketaddr.c @@ -107,7 +107,7 @@ virSocketAddrParseInternal(struct addrinfo **res, if ((err = getaddrinfo(val, NULL, &hints, res)) != 0) { if (reportError) virReportError(VIR_ERR_SYSTEM_ERROR, - _("Cannot parse socket address '%s': %s"), + _("Cannot parse socket address '%1$s': %2$s"), val, gai_strerror(err)); return -1; @@ -137,7 +137,7 @@ int virSocketAddrParse(virSocketAddr *addr, const char *val, int family) if (res == NULL) { virReportError(VIR_ERR_SYSTEM_ERROR, - _("No socket addresses found for '%s'"), + _("No socket addresses found for '%1$s'"), val); return -1; } @@ -182,7 +182,7 @@ int virSocketAddrParseAny(virSocketAddr *addr, if (res == NULL) { if (reportError) { virReportError(VIR_ERR_SYSTEM_ERROR, - _("No socket addresses found for '%s'"), + _("No socket addresses found for '%1$s'"), val); } return -1; @@ -248,7 +248,7 @@ int virSocketAddrResolveService(const char *service) if ((err = getaddrinfo(NULL, service, &hints, &res)) != 0) { virReportError(VIR_ERR_SYSTEM_ERROR, - _("Cannot parse socket service '%s': %s"), + _("Cannot parse socket service '%1$s': %2$s"), service, gai_strerror(err)); return -1; } @@ -270,7 +270,7 @@ int virSocketAddrResolveService(const char *service) } virReportError(VIR_ERR_SYSTEM_ERROR, - _("No matches for socket service '%s': %s"), + _("No matches for socket service '%1$s': %2$s"), service, gai_strerror(err)); cleanup: @@ -484,7 +484,7 @@ virSocketAddrFormatFull(const virSocketAddr *addr, port, sizeof(port), NI_NUMERICHOST | NI_NUMERICSERV)) != 0) { virReportError(VIR_ERR_SYSTEM_ERROR, - _("Cannot convert socket address to string: %s"), + _("Cannot convert socket address to string: %1$s"), gai_strerror(err)); return NULL; } @@ -871,7 +871,7 @@ virSocketAddrGetRange(virSocketAddr *start, virSocketAddr *end, if (start == NULL || end == NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("NULL argument - %p %p"), start, end); + _("NULL argument - %1$p %2$p"), start, end); return -1; } @@ -882,7 +882,7 @@ virSocketAddrGetRange(virSocketAddr *start, virSocketAddr *end, if (VIR_SOCKET_ADDR_FAMILY(start) != VIR_SOCKET_ADDR_FAMILY(end)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("mismatch of address family in range %s - %s"), + _("mismatch of address family in range %1$s - %2$s"), startStr, endStr); return -1; } @@ -896,8 +896,7 @@ virSocketAddrGetRange(virSocketAddr *start, virSocketAddr *end, if (VIR_SOCKET_ADDR_FAMILY(start) != VIR_SOCKET_ADDR_FAMILY(network)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("mismatch of address family in " - "range %s - %s for network %s"), + _("mismatch of address family in range %1$s - %2$s for network %3$s"), startStr, endStr, netStr); return -1; } @@ -906,8 +905,7 @@ virSocketAddrGetRange(virSocketAddr *start, virSocketAddr *end, virSocketAddrPrefixToNetmask(prefix, &netmask, VIR_SOCKET_ADDR_FAMILY(network)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("bad prefix %d for network %s when " - " checking range %s - %s"), + _("bad prefix %1$d for network %2$s when checking range %3$s - %4$s"), prefix, netStr, startStr, endStr); return -1; } @@ -916,8 +914,7 @@ virSocketAddrGetRange(virSocketAddr *start, virSocketAddr *end, if (virSocketAddrCheckNetmask(start, network, &netmask) <= 0 || virSocketAddrCheckNetmask(end, network, &netmask) <= 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("range %s - %s is not entirely within " - "network %s/%d"), + _("range %1$s - %2$s is not entirely within network %3$s/%4$d"), startStr, endStr, netStr, prefix); return -1; } @@ -928,8 +925,7 @@ virSocketAddrGetRange(virSocketAddr *start, virSocketAddr *end, if (virSocketAddrBroadcast(network, &netmask, &broadcast) < 0 || virSocketAddrMask(network, &netmask, &netaddr) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("failed to construct broadcast or network " - "address for network %s/%d"), + _("failed to construct broadcast or network address for network %1$s/%2$d"), netStr, prefix); return -1; } @@ -943,16 +939,14 @@ virSocketAddrGetRange(virSocketAddr *start, virSocketAddr *end, */ if (virSocketAddrEqual(start, &netaddr)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("start of range %s - %s in network %s/%d " - "is the network address"), + _("start of range %1$s - %2$s in network %3$s/%4$d is the network address"), startStr, endStr, netStr, prefix); return -1; } if (virSocketAddrEqual(end, &broadcast)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("end of range %s - %s in network %s/%d " - "is the broadcast address"), + _("end of range %1$s - %2$s in network %3$s/%4$d is the broadcast address"), startStr, endStr, netStr, prefix); return -1; } @@ -965,8 +959,7 @@ virSocketAddrGetRange(virSocketAddr *start, virSocketAddr *end, if (virSocketAddrGetIPv4Addr(start, &t1) < 0 || virSocketAddrGetIPv4Addr(end, &t2) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("failed to get IPv4 address " - "for start or end of range %s - %s"), + _("failed to get IPv4 address for start or end of range %1$s - %2$s"), startStr, endStr); return -1; } @@ -977,7 +970,7 @@ virSocketAddrGetRange(virSocketAddr *start, virSocketAddr *end, for (i = 0; i < 2; i++) { if (t1[i] != t2[i]) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("range %s - %s is too large (> 65535)"), + _("range %1$s - %2$s is too large (> 65535)"), startStr, endStr); return -1; } @@ -985,7 +978,7 @@ virSocketAddrGetRange(virSocketAddr *start, virSocketAddr *end, ret = (t2[2] - t1[2]) * 256 + (t2[3] - t1[3]); if (ret < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("range %s - %s is reversed "), + _("range %1$s - %2$s is reversed "), startStr, endStr); return -1; } @@ -996,8 +989,7 @@ virSocketAddrGetRange(virSocketAddr *start, virSocketAddr *end, if (virSocketAddrGetIPv6Addr(start, &t1) < 0 || virSocketAddrGetIPv6Addr(end, &t2) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("failed to get IPv6 address " - "for start or end of range %s - %s"), + _("failed to get IPv6 address for start or end of range %1$s - %2$s"), startStr, endStr); return -1; } @@ -1008,7 +1000,7 @@ virSocketAddrGetRange(virSocketAddr *start, virSocketAddr *end, for (i = 0; i < 7; i++) { if (t1[i] != t2[i]) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("range %s - %s is too large (> 65535)"), + _("range %1$s - %2$s is too large (> 65535)"), startStr, endStr); return -1; } @@ -1016,15 +1008,14 @@ virSocketAddrGetRange(virSocketAddr *start, virSocketAddr *end, ret = t2[7] - t1[7]; if (ret < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("range %s - %s start larger than end"), + _("range %1$s - %2$s start larger than end"), startStr, endStr); return -1; } ret++; } else { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unsupported address family " - "for range %s - %s, must be ipv4 or ipv6"), + _("unsupported address family for range %1$s - %2$s, must be ipv4 or ipv6"), startStr, endStr); return -1; } diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index 873da65d42..031baa1407 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -90,7 +90,7 @@ int virStorageFileGetSCSIKey(const char *path, bool ignoreError) { if (!ignoreError) - virReportSystemError(ENOSYS, _("Unable to get SCSI key for %s"), path); + virReportSystemError(ENOSYS, _("Unable to get SCSI key for %1$s"), path); return -1; } #endif diff --git a/src/util/virstring.c b/src/util/virstring.c index 7b7aee6179..b49c0f86b6 100644 --- a/src/util/virstring.c +++ b/src/util/virstring.c @@ -598,13 +598,13 @@ virStringSearch(const char *str, regex = g_regex_new(regexp, 0, 0, &err); if (!regex) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to compile regex %s"), err->message); + _("Failed to compile regex %1$s"), err->message); return -1; } if (g_regex_get_capture_count(regex) != 1) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Regular expression '%s' must have exactly 1 match group, not %d"), + _("Regular expression '%1$s' must have exactly 1 match group, not %2$d"), regexp, g_regex_get_capture_count(regex)); goto cleanup; } @@ -982,13 +982,13 @@ virStringParsePort(const char *str, if (virStrToLong_uip(str, NULL, 10, &p) < 0) { virReportError(VIR_ERR_INVALID_ARG, - _("failed to parse port number '%s'"), str); + _("failed to parse port number '%1$s'"), str); return -1; } if (p > UINT16_MAX) { virReportError(VIR_ERR_INVALID_ARG, - _("port '%s' out of range"), str); + _("port '%1$s' out of range"), str); return -1; } diff --git a/src/util/virsysinfo.c b/src/util/virsysinfo.c index 376d5d4816..36a861c53f 100644 --- a/src/util/virsysinfo.c +++ b/src/util/virsysinfo.c @@ -319,7 +319,7 @@ virSysinfoReadPPC(void) if (virFileReadAll(CPUINFO, CPUINFO_FILE_LEN, &outbuf) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to open %s"), CPUINFO); + _("Failed to open %1$s"), CPUINFO); return NULL; } @@ -445,7 +445,7 @@ virSysinfoReadARM(void) if (virFileReadAll(CPUINFO, CPUINFO_FILE_LEN, &outbuf) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to open %s"), CPUINFO); + _("Failed to open %1$s"), CPUINFO); return NULL; } @@ -600,7 +600,7 @@ virSysinfoReadS390(void) /* Gather info from /proc/cpuinfo */ if (virFileReadAll(CPUINFO, CPUINFO_FILE_LEN, &outbuf) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to open %s"), CPUINFO); + _("Failed to open %1$s"), CPUINFO); return NULL; } @@ -613,7 +613,7 @@ virSysinfoReadS390(void) /* Gather info from /proc/sysinfo */ if (virFileReadAll(SYSINFO, 8192, &outbuf) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to open %s"), SYSINFO); + _("Failed to open %1$s"), SYSINFO); return NULL; } @@ -1537,7 +1537,7 @@ virSysinfoFormat(virBuffer *buf, virSysinfoDef *def) if (!type) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unexpected sysinfo type model %d"), + _("unexpected sysinfo type model %1$d"), def->type); return -1; } @@ -1564,7 +1564,7 @@ virSysinfoFormat(virBuffer *buf, virSysinfoDef *def) do { \ if (STRNEQ_NULLABLE(src->name, dst->name)) { \ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, \ - _("Target sysinfo %s %s does not match source %s"), \ + _("Target sysinfo %1$s %2$s does not match source %3$s"), \ desc, NULLSTR(dst->name), NULLSTR(src->name)); \ return false; \ } \ @@ -1680,7 +1680,7 @@ bool virSysinfoIsEqual(virSysinfoDef *src, if (src->type != dst->type) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target sysinfo %s does not match source %s"), + _("Target sysinfo %1$s does not match source %2$s"), virSysinfoTypeToString(dst->type), virSysinfoTypeToString(src->type)); return false; @@ -1694,7 +1694,7 @@ bool virSysinfoIsEqual(virSysinfoDef *src, if (src->nbaseBoard != dst->nbaseBoard) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target sysinfo base board count '%zu' does not match source '%zu'"), + _("Target sysinfo base board count '%1$zu' does not match source '%2$zu'"), dst->nbaseBoard, src->nbaseBoard); return false; } diff --git a/src/util/virsystemd.c b/src/util/virsystemd.c index 18bf2932a4..3112a1ba80 100644 --- a/src/util/virsystemd.c +++ b/src/util/virsystemd.c @@ -766,7 +766,7 @@ virSystemdActivationInitFromNames(virSystemdActivation *act, if (g_strv_length(fdnamelistptr) != nfds) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Expecting %d FD names but got %u"), + _("Expecting %1$d FD names but got %2$u"), nfds, g_strv_length(fdnamelistptr)); goto error; } diff --git a/src/util/virthreadjob.c b/src/util/virthreadjob.c index 2c6f45fd51..3666cf9fe2 100644 --- a/src/util/virthreadjob.c +++ b/src/util/virthreadjob.c @@ -69,7 +69,7 @@ virThreadJobSetWorker(const char *worker) if (virThreadLocalSet(&virThreadJobWorker, (void *) worker) < 0) virReportSystemError(errno, - _("cannot set worker name to %s"), + _("cannot set worker name to %1$s"), worker); VIR_DEBUG("Thread %llu is running worker %s", virThreadSelfID(), worker); @@ -86,7 +86,7 @@ virThreadJobSet(const char *caller) if (virThreadLocalSet(&virThreadJobName, (void *) caller) < 0) virReportSystemError(errno, - _("cannot set current job to %s"), + _("cannot set current job to %1$s"), caller); if ((worker = virThreadLocalGet(&virThreadJobWorker))) { diff --git a/src/util/virtpm.c b/src/util/virtpm.c index 19850de1c8..81fd6166cf 100644 --- a/src/util/virtpm.c +++ b/src/util/virtpm.c @@ -72,7 +72,7 @@ virTPMCreateCancelPath(const char *devpath) if (!(dev = strrchr(devpath, '/'))) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("TPM device path %s is invalid"), devpath); + _("TPM device path %1$s is invalid"), devpath); return NULL; } @@ -243,7 +243,7 @@ virTPMExecGetCaps(virCommand *cmd, error_bad_json: virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unexpected JSON format: %s"), outbuf); + _("Unexpected JSON format: %1$s"), outbuf); return bitmap; } @@ -296,21 +296,21 @@ virTPMEmulatorInit(bool quiet) if (!path) { if (!quiet) virReportSystemError(ENOENT, - _("Unable to find '%s' binary in $PATH"), + _("Unable to find '%1$s' binary in $PATH"), virTPMBinaryTypeToString(i)); return -1; } if (!virFileIsExecutable(path)) { if (!quiet) virReportError(VIR_ERR_INTERNAL_ERROR, - _("%s is not an executable"), + _("%1$s is not an executable"), path); return -1; } if (stat(path, &swtpmBinaries[i].stat) < 0) { if (!quiet) virReportSystemError(errno, - _("Could not stat %s"), path); + _("Could not stat %1$s"), path); return -1; } swtpmBinaries[i].path = g_steal_pointer(&path); diff --git a/src/util/virtypedparam-public.c b/src/util/virtypedparam-public.c index 5bd207d1e6..3486623a9c 100644 --- a/src/util/virtypedparam-public.c +++ b/src/util/virtypedparam-public.c @@ -35,13 +35,13 @@ virTypedParameterAssignFromStr(virTypedParameterPtr param, const char *val) { if (!val) { - virReportError(VIR_ERR_INVALID_ARG, _("NULL value for field '%s'"), + virReportError(VIR_ERR_INVALID_ARG, _("NULL value for field '%1$s'"), name); return -1; } if (virStrcpyStatic(param->field, name) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, _("Field name '%s' too long"), + virReportError(VIR_ERR_INTERNAL_ERROR, _("Field name '%1$s' too long"), name); return -1; } @@ -51,7 +51,7 @@ virTypedParameterAssignFromStr(virTypedParameterPtr param, case VIR_TYPED_PARAM_INT: if (virStrToLong_i(val, NULL, 10, &param->value.i) < 0) { virReportError(VIR_ERR_INVALID_ARG, - _("Invalid value for field '%s': expected int"), + _("Invalid value for field '%1$s': expected int"), name); return -1; } @@ -59,8 +59,7 @@ virTypedParameterAssignFromStr(virTypedParameterPtr param, case VIR_TYPED_PARAM_UINT: if (virStrToLong_ui(val, NULL, 10, &param->value.ui) < 0) { virReportError(VIR_ERR_INVALID_ARG, - _("Invalid value for field '%s': " - "expected unsigned int"), + _("Invalid value for field '%1$s': expected unsigned int"), name); return -1; } @@ -68,8 +67,7 @@ virTypedParameterAssignFromStr(virTypedParameterPtr param, case VIR_TYPED_PARAM_LLONG: if (virStrToLong_ll(val, NULL, 10, &param->value.l) < 0) { virReportError(VIR_ERR_INVALID_ARG, - _("Invalid value for field '%s': " - "expected long long"), + _("Invalid value for field '%1$s': expected long long"), name); return -1; } @@ -77,8 +75,7 @@ virTypedParameterAssignFromStr(virTypedParameterPtr param, case VIR_TYPED_PARAM_ULLONG: if (virStrToLong_ull(val, NULL, 10, &param->value.ul) < 0) { virReportError(VIR_ERR_INVALID_ARG, - _("Invalid value for field '%s': " - "expected unsigned long long"), + _("Invalid value for field '%1$s': expected unsigned long long"), name); return -1; } @@ -86,8 +83,7 @@ virTypedParameterAssignFromStr(virTypedParameterPtr param, case VIR_TYPED_PARAM_DOUBLE: if (virStrToDouble(val, NULL, &param->value.d) < 0) { virReportError(VIR_ERR_INVALID_ARG, - _("Invalid value for field '%s': " - "expected double"), + _("Invalid value for field '%1$s': expected double"), name); return -1; } @@ -99,7 +95,7 @@ virTypedParameterAssignFromStr(virTypedParameterPtr param, param->value.b = false; } else { virReportError(VIR_ERR_INVALID_ARG, - _("Invalid boolean value for field '%s'"), name); + _("Invalid boolean value for field '%1$s'"), name); return -1; } break; @@ -108,7 +104,7 @@ virTypedParameterAssignFromStr(virTypedParameterPtr param, break; default: virReportError(VIR_ERR_INTERNAL_ERROR, - _("unexpected type %d for field %s"), type, name); + _("unexpected type %1$d for field %2$s"), type, name); return -1; } @@ -154,8 +150,7 @@ virTypedParamsGet(virTypedParameterPtr params, #define VIR_TYPED_PARAM_CHECK_TYPE(check_type) \ do { if (param->type != check_type) { \ virReportError(VIR_ERR_INVALID_ARG, \ - _("Invalid type '%s' requested for parameter '%s', " \ - "actual type is '%s'"), \ + _("Invalid type '%1$s' requested for parameter '%2$s', actual type is '%3$s'"), \ virTypedParameterTypeToString(check_type), \ name, \ virTypedParameterTypeToString(param->type)); \ diff --git a/src/util/virtypedparam.c b/src/util/virtypedparam.c index ae676d02fe..e6ad9ec7a9 100644 --- a/src/util/virtypedparam.c +++ b/src/util/virtypedparam.c @@ -81,7 +81,7 @@ virTypedParamsValidate(virTypedParameterPtr params, int nparams, ...) if (virStrcpyStatic(keys[nkeys].field, name) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Field name '%s' too long"), name); + _("Field name '%1$s' too long"), name); goto cleanup; } @@ -102,7 +102,7 @@ virTypedParamsValidate(virTypedParameterPtr params, int nparams, ...) if (STREQ_NULLABLE(last_name, sorted[i].field) && !(keys[j].value.i & VIR_TYPED_PARAM_MULTIPLE)) { virReportError(VIR_ERR_INVALID_ARG, - _("parameter '%s' occurs multiple times"), + _("parameter '%1$s' occurs multiple times"), sorted[i].field); goto cleanup; } @@ -113,8 +113,7 @@ virTypedParamsValidate(virTypedParameterPtr params, int nparams, ...) if (!badtype) badtype = virTypedParameterTypeToString(0); virReportError(VIR_ERR_INVALID_ARG, - _("invalid type '%s' for parameter '%s', " - "expected '%s'"), + _("invalid type '%1$s' for parameter '%2$s', expected '%3$s'"), badtype, sorted[i].field, virTypedParameterTypeToString(keys[j].type)); goto cleanup; @@ -126,7 +125,7 @@ virTypedParamsValidate(virTypedParameterPtr params, int nparams, ...) if (j == nkeys && i != nparams) { virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, - _("parameter '%s' not supported"), + _("parameter '%1$s' not supported"), sorted[i].field); goto cleanup; } @@ -195,7 +194,7 @@ virTypedParameterToString(virTypedParameterPtr param) break; default: virReportError(VIR_ERR_INTERNAL_ERROR, - _("unexpected type %d for field %s"), + _("unexpected type %1$d for field %2$s"), param->type, param->field); } @@ -241,7 +240,7 @@ virTypedParameterAssignValueVArgs(virTypedParameterPtr param, break; default: virReportError(VIR_ERR_INTERNAL_ERROR, - _("unexpected type %d for field %s"), type, + _("unexpected type %1$d for field %2$s"), type, NULLSTR(param->field)); return -1; } @@ -279,7 +278,7 @@ virTypedParameterAssign(virTypedParameterPtr param, const char *name, int ret = -1; if (virStrcpyStatic(param->field, name) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, _("Field name '%s' too long"), + virReportError(VIR_ERR_INTERNAL_ERROR, _("Field name '%1$s' too long"), name); return -1; } @@ -322,7 +321,7 @@ virTypedParamsReplaceString(virTypedParameterPtr *params, if (param) { if (param->type != VIR_TYPED_PARAM_STRING) { virReportError(VIR_ERR_INVALID_ARG, - _("Parameter '%s' is not a string"), + _("Parameter '%1$s' is not a string"), param->field); return -1; } @@ -529,7 +528,7 @@ virTypedParamsDeserialize(struct _virTypedParameterRemote *remote_params, if (limit && remote_params_len > limit) { virReportError(VIR_ERR_RPC, - _("too many parameters '%u' for limit '%d'"), + _("too many parameters '%1$u' for limit '%2$d'"), remote_params_len, limit); goto cleanup; } @@ -538,7 +537,7 @@ virTypedParamsDeserialize(struct _virTypedParameterRemote *remote_params, /* Check the length of the returned list carefully. */ if (remote_params_len > *nparams) { virReportError(VIR_ERR_RPC, - _("too many parameters '%u' for nparams '%d'"), + _("too many parameters '%1$u' for nparams '%2$d'"), remote_params_len, *nparams); goto cleanup; } @@ -555,7 +554,7 @@ virTypedParamsDeserialize(struct _virTypedParameterRemote *remote_params, if (virStrcpyStatic(param->field, remote_param->field) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("parameter %s too big for destination"), + _("parameter %1$s too big for destination"), remote_param->field); goto cleanup; } @@ -590,7 +589,7 @@ virTypedParamsDeserialize(struct _virTypedParameterRemote *remote_params, param->value.s = g_strdup(remote_param->value.remote_typed_param_value.s); break; default: - virReportError(VIR_ERR_RPC, _("unknown parameter type: %d"), + virReportError(VIR_ERR_RPC, _("unknown parameter type: %1$d"), param->type); goto cleanup; } @@ -648,7 +647,7 @@ virTypedParamsSerialize(virTypedParameterPtr params, if (nparams > limit) { virReportError(VIR_ERR_RPC, - _("too many parameters '%d' for limit '%d'"), + _("too many parameters '%1$d' for limit '%2$d'"), nparams, limit); goto cleanup; } @@ -695,7 +694,7 @@ virTypedParamsSerialize(virTypedParameterPtr params, val->value.remote_typed_param_value.s = g_strdup(param->value.s); break; default: - virReportError(VIR_ERR_RPC, _("unknown parameter type: %d"), + virReportError(VIR_ERR_RPC, _("unknown parameter type: %1$d"), param->type); goto cleanup; } diff --git a/src/util/viruri.c b/src/util/viruri.c index 3af2e54565..a824a983df 100644 --- a/src/util/viruri.c +++ b/src/util/viruri.c @@ -146,7 +146,7 @@ virURIParse(const char *uri) if (!xmluri) { /* libxml2 does not tell us what failed. Grr :-( */ virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to parse URI %s"), uri); + _("Unable to parse URI %1$s"), uri); return NULL; } @@ -302,16 +302,15 @@ virURIFindAliasMatch(char *const*aliases, const char *alias, if (!(offset = strchr(*aliases, '='))) { virReportError(VIR_ERR_CONF_SYNTAX, - _("Malformed 'uri_aliases' config entry '%s', " - "expected 'alias=uri://host/path'"), *aliases); + _("Malformed 'uri_aliases' config entry '%1$s', expected 'alias=uri://host/path'"), + *aliases); return -1; } safe = strspn(*aliases, URI_ALIAS_CHARS); if (safe < (offset - *aliases)) { virReportError(VIR_ERR_CONF_SYNTAX, - _("Malformed 'uri_aliases' config entry '%s', " - "aliases may only contain 'a-Z, 0-9, _, -'"), + _("Malformed 'uri_aliases' config entry '%1$s', aliases may only contain 'a-Z, 0-9, _, -'"), *aliases); return -1; } @@ -387,7 +386,7 @@ virURIGetParam(virURI *uri, const char *name) } virReportError(VIR_ERR_INVALID_ARG, - _("Missing URI parameter '%s'"), name); + _("Missing URI parameter '%1$s'"), name); return NULL; } diff --git a/src/util/virusb.c b/src/util/virusb.c index 9e6ec9c9cf..cf3461f80a 100644 --- a/src/util/virusb.c +++ b/src/util/virusb.c @@ -95,7 +95,7 @@ static int virUSBSysReadFile(const char *f_name, const char *d_name, if (virStrToLong_ui(buf, &ignore, base, value) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not parse usb file %s"), filename); + _("Could not parse usb file %1$s"), filename); return -1; } @@ -145,7 +145,7 @@ virUSBDeviceSearch(unsigned int vendor, if (virStrToLong_ui(tmpstr, &ignore, 10, &found_bus) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to parse dir name '%s'"), + _("Failed to parse dir name '%1$s'"), de->d_name); goto cleanup; } @@ -211,7 +211,7 @@ virUSBDeviceFindByVendor(unsigned int vendor, } virReportError(VIR_ERR_INTERNAL_ERROR, - _("Did not find USB device %04x:%04x"), vendor, product); + _("Did not find USB device %1$04x:%2$04x"), vendor, product); return -1; } @@ -249,7 +249,7 @@ virUSBDeviceFindByBus(unsigned int bus, } virReportError(VIR_ERR_INTERNAL_ERROR, - _("Did not find USB device bus:%u device:%u"), + _("Did not find USB device bus:%1$u device:%2$u"), bus, devno); return -1; } @@ -290,7 +290,7 @@ virUSBDeviceFind(unsigned int vendor, } virReportError(VIR_ERR_INTERNAL_ERROR, - _("Did not find USB device %04x:%04x bus:%u device:%u"), + _("Did not find USB device %1$04x:%2$04x bus:%3$u device:%4$u"), vendor, product, bus, devno); return -1; } @@ -319,7 +319,7 @@ virUSBDeviceNew(unsigned int bus, if (g_snprintf(dev->name, sizeof(dev->name), "%.3d:%.3d", dev->bus, dev->dev) >= sizeof(dev->name)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("dev->name buffer overflow: %.3d:%.3d"), + _("dev->name buffer overflow: %1$.3d:%2$.3d"), dev->bus, dev->dev); virUSBDeviceFree(dev); return NULL; @@ -337,7 +337,7 @@ virUSBDeviceNew(unsigned int bus, if (g_snprintf(dev->id, sizeof(dev->id), "%d %d", dev->bus, dev->dev) >= sizeof(dev->id)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("dev->id buffer overflow: %d %d"), + _("dev->id buffer overflow: %1$d %2$d"), dev->bus, dev->dev); virUSBDeviceFree(dev); return NULL; @@ -443,7 +443,7 @@ virUSBDeviceListAdd(virUSBDeviceList *list, { if (virUSBDeviceListFind(list, *dev)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Device %s is already in use"), + _("Device %1$s is already in use"), (*dev)->name); return -1; } diff --git a/src/util/virutil.c b/src/util/virutil.c index ddc66001cb..40ca205595 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -173,7 +173,7 @@ virScaleInteger(unsigned long long *value, const char *suffix, if (!suffix || !*suffix) { if (!scale) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("invalid scale %llu"), scale); + _("invalid scale %1$llu"), scale); return -1; } suffix = ""; @@ -189,7 +189,7 @@ virScaleInteger(unsigned long long *value, const char *suffix, base = 1000; } else { virReportError(VIR_ERR_INVALID_ARG, - _("unknown suffix '%s'"), suffix); + _("unknown suffix '%1$s'"), suffix); return -1; } scale = 1; @@ -214,13 +214,13 @@ virScaleInteger(unsigned long long *value, const char *suffix, break; default: virReportError(VIR_ERR_INVALID_ARG, - _("unknown suffix '%s'"), suffix); + _("unknown suffix '%1$s'"), suffix); return -1; } } if (*value && *value > (limit / scale)) { - virReportError(VIR_ERR_OVERFLOW, _("value too large: %llu%s"), + virReportError(VIR_ERR_OVERFLOW, _("value too large: %1$llu%2$s"), *value, suffix); return -1; } @@ -575,7 +575,7 @@ virGetUserEnt(uid_t uid, char **name, gid_t *group, char **dir, char **shell, bo goto cleanup; virReportSystemError(rc, - _("Failed to find user record for uid '%u'"), + _("Failed to find user record for uid '%1$u'"), (unsigned int) uid); goto cleanup; } else if (pw == NULL) { @@ -583,7 +583,7 @@ virGetUserEnt(uid_t uid, char **name, gid_t *group, char **dir, char **shell, bo goto cleanup; virReportError(VIR_ERR_SYSTEM_ERROR, - _("Failed to find user record for uid '%u'"), + _("Failed to find user record for uid '%1$u'"), (unsigned int) uid); goto cleanup; } @@ -640,11 +640,11 @@ static char *virGetGroupEnt(gid_t gid) if (rc != 0 || gr == NULL) { if (rc != 0) { virReportSystemError(rc, - _("Failed to find group record for gid '%u'"), + _("Failed to find group record for gid '%1$u'"), (unsigned int) gid); } else { virReportError(VIR_ERR_SYSTEM_ERROR, - _("Failed to find group record for gid '%u'"), + _("Failed to find group record for gid '%1$u'"), (unsigned int) gid); } @@ -757,7 +757,7 @@ virGetUserID(const char *user, uid_t *uid) if (virStrToLong_ui(user, NULL, 10, &uint_uid) < 0 || ((uid_t) uint_uid) != uint_uid) { - virReportError(VIR_ERR_INVALID_ARG, _("Failed to parse user '%s'"), + virReportError(VIR_ERR_INVALID_ARG, _("Failed to parse user '%1$s'"), user); return -1; } @@ -837,7 +837,7 @@ virGetGroupID(const char *group, gid_t *gid) if (virStrToLong_ui(group, NULL, 10, &uint_gid) < 0 || ((gid_t) uint_gid) != uint_gid) { - virReportError(VIR_ERR_INVALID_ARG, _("Failed to parse group '%s'"), + virReportError(VIR_ERR_INVALID_ARG, _("Failed to parse group '%1$s'"), group); return -1; } @@ -950,7 +950,7 @@ virSetUIDGID(uid_t uid, gid_t gid, gid_t *groups G_GNUC_UNUSED, { if (gid != (gid_t)-1 && setregid(gid, gid) < 0) { virReportSystemError(errno, - _("cannot change to '%u' group"), + _("cannot change to '%1$u' group"), (unsigned int) gid); return -1; } @@ -965,7 +965,7 @@ virSetUIDGID(uid_t uid, gid_t gid, gid_t *groups G_GNUC_UNUSED, if (uid != (uid_t)-1 && setreuid(uid, uid) < 0) { virReportSystemError(errno, - _("cannot change to uid to '%u'"), + _("cannot change to uid to '%1$u'"), (unsigned int) uid); return -1; } @@ -1161,7 +1161,7 @@ virSetUIDGIDWithCaps(uid_t uid, gid_t gid, gid_t *groups, int ngroups, capng_clear(CAPNG_SELECT_CAPS); } else { virReportError(VIR_ERR_INTERNAL_ERROR, - _("cannot apply process capabilities %d"), capng_ret); + _("cannot apply process capabilities %1$d"), capng_ret); return -1; } } @@ -1188,8 +1188,7 @@ virSetUIDGIDWithCaps(uid_t uid, gid_t gid, gid_t *groups, int ngroups, if (capBits & (1ULL << i)) { if (prctl(PR_CAP_AMBIENT, PR_CAP_AMBIENT_RAISE, i, 0, 0) < 0) { virReportSystemError(errno, - _("prctl failed to enable '%s' in the " - "AMBIENT set"), + _("prctl failed to enable '%1$s' in the AMBIENT set"), capstr); return -1; } @@ -1215,7 +1214,7 @@ virSetUIDGIDWithCaps(uid_t uid, gid_t gid, gid_t *groups, int ngroups, if ((capng_ret = capng_apply(CAPNG_SELECT_CAPS)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("cannot apply process capabilities %d"), capng_ret); + _("cannot apply process capabilities %1$d"), capng_ret); return -1; } @@ -1273,7 +1272,7 @@ virValidateWWN(const char *wwn) if (i != 16 || p[i]) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Malformed wwn: %s"), wwn); + _("Malformed wwn: %1$s"), wwn); return false; } @@ -1308,7 +1307,7 @@ virParseOwnershipIds(const char *label, uid_t *uidPtr, gid_t *gidPtr) sep = strchr(tmp_label, ':'); if (sep == NULL) { virReportError(VIR_ERR_INVALID_ARG, - _("Failed to parse uid and gid from '%s'"), + _("Failed to parse uid and gid from '%1$s'"), label); goto cleanup; } diff --git a/src/util/virvhba.c b/src/util/virvhba.c index 5ceedc8076..73129ddd1f 100644 --- a/src/util/virvhba.c +++ b/src/util/virvhba.c @@ -237,7 +237,7 @@ virVHBAManageVport(const int parent_host, break; default: virReportError(VIR_ERR_OPERATION_INVALID, - _("Invalid vport operation (%d)"), operation); + _("Invalid vport operation (%1$d)"), operation); return -1; } @@ -251,8 +251,7 @@ virVHBAManageVport(const int parent_host, if (!virFileExists(operation_path)) { virReportError(VIR_ERR_OPERATION_INVALID, - _("vport operation '%s' is not supported " - "for host%d"), + _("vport operation '%1$s' is not supported for host%2$d"), operation_file, parent_host); return -1; } @@ -268,7 +267,7 @@ virVHBAManageVport(const int parent_host, if (virFileWriteStr(operation_path, vport_name, 0) < 0) { virReportSystemError(errno, - _("Write of '%s' to '%s' during vport create/delete failed"), + _("Write of '%1$s' to '%2$s' during vport create/delete failed"), vport_name, operation_path); return -1; } diff --git a/src/util/virxml.c b/src/util/virxml.c index af4be4e443..1eaf81b6cc 100644 --- a/src/util/virxml.c +++ b/src/util/virxml.c @@ -276,7 +276,7 @@ virXMLCheckIllegalChars(const char *nodeName, char *c; if ((c = strpbrk(str, illegal))) { virReportError(VIR_ERR_XML_DETAIL, - _("invalid char in %s: %c"), nodeName, *c); + _("invalid char in %1$s: %2$c"), nodeName, *c); return -1; } return 0; @@ -322,7 +322,7 @@ virXMLPropStringRequired(xmlNodePtr node, if (!ret) virReportError(VIR_ERR_XML_ERROR, - _("Missing required attribute '%s' in element '%s'"), + _("Missing required attribute '%1$s' in element '%2$s'"), name, node->name); return ret; @@ -345,7 +345,7 @@ virXMLNodeContentString(xmlNodePtr node) if (node->type != XML_ELEMENT_NODE) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("node '%s' has unexpected type %d"), + _("node '%1$s' has unexpected type %2$d"), node->name, node->type); return NULL; } @@ -354,7 +354,7 @@ virXMLNodeContentString(xmlNodePtr node) if (!ret) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("node '%s' has unexpected NULL content. This could be caused by malformed input, or a memory allocation failure"), + _("node '%1$s' has unexpected NULL content. This could be caused by malformed input, or a memory allocation failure"), node->name); return NULL; } @@ -382,7 +382,7 @@ virXMLPropEnumInternal(xmlNodePtr node, return 0; virReportError(VIR_ERR_XML_ERROR, - _("Missing required attribute '%s' in element '%s'"), + _("Missing required attribute '%1$s' in element '%2$s'"), name, node->name); return -1; } @@ -391,7 +391,7 @@ virXMLPropEnumInternal(xmlNodePtr node, if (ret < 0 || ((flags & VIR_XML_PROP_NONZERO) && (ret == 0))) { virReportError(VIR_ERR_XML_ERROR, - _("Invalid value for attribute '%s' in element '%s': '%s'."), + _("Invalid value for attribute '%1$s' in element '%2$s': '%3$s'."), name, node->name, NULLSTR(tmp)); return -1; } @@ -508,28 +508,28 @@ virXMLPropInt(xmlNodePtr node, return 0; virReportError(VIR_ERR_XML_ERROR, - _("Missing required attribute '%s' in element '%s'"), + _("Missing required attribute '%1$s' in element '%2$s'"), name, node->name); return -1; } if (virStrToLong_i(tmp, NULL, base, &val) < 0) { virReportError(VIR_ERR_XML_ERROR, - _("Invalid value for attribute '%s' in element '%s': '%s'. Expected integer value"), + _("Invalid value for attribute '%1$s' in element '%2$s': '%3$s'. Expected integer value"), name, node->name, tmp); return -1; } if ((flags & VIR_XML_PROP_NONNEGATIVE) && (val < 0)) { virReportError(VIR_ERR_XML_ERROR, - _("Invalid value for attribute '%s' in element '%s': '%s'. Expected non-negative value"), + _("Invalid value for attribute '%1$s' in element '%2$s': '%3$s'. Expected non-negative value"), name, node->name, tmp); return -1; } if ((flags & VIR_XML_PROP_NONZERO) && (val == 0)) { virReportError(VIR_ERR_XML_ERROR, - _("Invalid value for attribute '%s' in element '%s': Zero is not permitted"), + _("Invalid value for attribute '%1$s' in element '%2$s': Zero is not permitted"), name, node->name); return -1; } @@ -599,7 +599,7 @@ virXMLPropUIntDefault(xmlNodePtr node, return 0; virReportError(VIR_ERR_XML_ERROR, - _("Missing required attribute '%s' in element '%s'"), + _("Missing required attribute '%1$s' in element '%2$s'"), name, node->name); return -1; } @@ -608,14 +608,14 @@ virXMLPropUIntDefault(xmlNodePtr node, if (ret < 0) { virReportError(VIR_ERR_XML_ERROR, - _("Invalid value for attribute '%s' in element '%s': '%s'. Expected non-negative integer value"), + _("Invalid value for attribute '%1$s' in element '%2$s': '%3$s'. Expected non-negative integer value"), name, node->name, tmp); return -1; } if ((flags & VIR_XML_PROP_NONZERO) && (val == 0)) { virReportError(VIR_ERR_XML_ERROR, - _("Invalid value for attribute '%s' in element '%s': Zero is not permitted"), + _("Invalid value for attribute '%1$s' in element '%2$s': Zero is not permitted"), name, node->name); return -1; } @@ -658,28 +658,28 @@ virXMLPropLongLong(xmlNodePtr node, return 0; virReportError(VIR_ERR_XML_ERROR, - _("Missing required attribute '%s' in element '%s'"), + _("Missing required attribute '%1$s' in element '%2$s'"), name, node->name); return -1; } if (virStrToLong_ll(tmp, NULL, base, &val) < 0) { virReportError(VIR_ERR_XML_ERROR, - _("Invalid value for attribute '%s' in element '%s': '%s'. Expected long long integer value"), + _("Invalid value for attribute '%1$s' in element '%2$s': '%3$s'. Expected long long integer value"), name, node->name, tmp); return -1; } if ((flags & VIR_XML_PROP_NONNEGATIVE) && (val < 0)) { virReportError(VIR_ERR_XML_ERROR, - _("Invalid value for attribute '%s' in element '%s': '%s'. Expected non-negative value"), + _("Invalid value for attribute '%1$s' in element '%2$s': '%3$s'. Expected non-negative value"), name, node->name, tmp); return -1; } if ((flags & VIR_XML_PROP_NONZERO) && (val == 0)) { virReportError(VIR_ERR_XML_ERROR, - _("Invalid value for attribute '%s' in element '%s': Zero is not permitted"), + _("Invalid value for attribute '%1$s' in element '%2$s': Zero is not permitted"), name, node->name); return -1; } @@ -722,7 +722,7 @@ virXMLPropULongLong(xmlNodePtr node, return 0; virReportError(VIR_ERR_XML_ERROR, - _("Missing required attribute '%s' in element '%s'"), + _("Missing required attribute '%1$s' in element '%2$s'"), name, node->name); return -1; } @@ -731,14 +731,14 @@ virXMLPropULongLong(xmlNodePtr node, if (ret < 0) { virReportError(VIR_ERR_XML_ERROR, - _("Invalid value for attribute '%s' in element '%s': '%s'. Expected non-negative integer value"), + _("Invalid value for attribute '%1$s' in element '%2$s': '%3$s'. Expected non-negative integer value"), name, node->name, tmp); return -1; } if ((flags & VIR_XML_PROP_NONZERO) && (val == 0)) { virReportError(VIR_ERR_XML_ERROR, - _("Invalid value for attribute '%s' in element '%s': Zero is not permitted"), + _("Invalid value for attribute '%1$s' in element '%2$s': Zero is not permitted"), name, node->name); return -1; } @@ -803,14 +803,14 @@ virXMLPropUUID(xmlNodePtr node, return 0; virReportError(VIR_ERR_XML_ERROR, - _("Missing required attribute '%s' in element '%s'"), + _("Missing required attribute '%1$s' in element '%2$s'"), name, node->name); return -1; } if (virUUIDParse(tmp, val) < 0) { virReportError(VIR_ERR_XML_ERROR, - _("Invalid value for attribute '%s' in element '%s': '%s'. Expected UUID"), + _("Invalid value for attribute '%1$s' in element '%2$s': '%3$s'. Expected UUID"), name, node->name, tmp); return -1; } @@ -965,7 +965,7 @@ virXPathNodeSet(const char *xpath, if (obj->type != XPATH_NODESET) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Incorrect xpath '%s'"), xpath); + _("Incorrect xpath '%1$s'"), xpath); return -1; } @@ -1050,7 +1050,7 @@ catchXMLError(void *ctx, const char *msg G_GNUC_UNUSED, ...) if (ctxt->lastError.file) { virGenericReportError(domcode, VIR_ERR_XML_DETAIL, - _("%s:%d: %s%s\n%s"), + _("%1$s:%2$d: %3$s%4$s\n%5$s"), ctxt->lastError.file, ctxt->lastError.line, ctxt->lastError.message, @@ -1058,7 +1058,7 @@ catchXMLError(void *ctx, const char *msg G_GNUC_UNUSED, ...) pointerstr); } else { virGenericReportError(domcode, VIR_ERR_XML_DETAIL, - _("at line %d: %s%s\n%s"), + _("at line %1$d: %2$s%3$s\n%4$s"), ctxt->lastError.line, ctxt->lastError.message, contextstr, @@ -1131,7 +1131,7 @@ virXMLParseHelper(int domcode, if (!xml) { if (virGetLastErrorCode() == VIR_ERR_OK) { virGenericReportError(domcode, VIR_ERR_XML_ERROR, - _("failed to parse xml document '%s'"), + _("failed to parse xml document '%1$s'"), docname); } @@ -1148,7 +1148,7 @@ virXMLParseHelper(int domcode, if (rootelement && !virXMLNodeNameEqual(rootnode, rootelement)) { virReportError(VIR_ERR_XML_ERROR, - _("expecting root element of '%s', not '%s'"), + _("expecting root element of '%1$s', not '%2$s'"), rootelement, rootnode->name); return NULL; } @@ -1250,14 +1250,14 @@ virXMLRewriteFile(int fd, if (data->warnCommand && virXMLEmitWarning(fd, data->warnName, data->warnCommand) < 0) { virReportSystemError(errno, - _("cannot write data to file '%s'"), + _("cannot write data to file '%1$s'"), path); return -1; } if (safewrite(fd, data->xml, strlen(data->xml)) < 0) { virReportSystemError(errno, - _("cannot write data to file '%s'"), + _("cannot write data to file '%1$s'"), path); return -1; } @@ -1563,7 +1563,7 @@ virXMLValidatorInit(const char *schemafile) if (!(validator->rngParser = xmlRelaxNGNewParserCtxt(validator->schemafile))) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to create RNG parser for %s"), + _("Unable to create RNG parser for %1$s"), validator->schemafile); return NULL; } @@ -1575,7 +1575,7 @@ virXMLValidatorInit(const char *schemafile) if (!(validator->rng = xmlRelaxNGParse(validator->rngParser))) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to parse RNG %s: %s"), + _("Unable to parse RNG %1$s: %2$s"), validator->schemafile, virBufferCurrentContent(&validator->buf)); return NULL; @@ -1583,7 +1583,7 @@ virXMLValidatorInit(const char *schemafile) if (!(validator->rngValid = xmlRelaxNGNewValidCtxt(validator->rng))) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to create RNG validation context %s"), + _("Unable to create RNG validation context %1$s"), validator->schemafile); return NULL; } @@ -1603,7 +1603,7 @@ virXMLValidatorValidate(virXMLValidator *validator, { if (xmlRelaxNGValidateDoc(validator->rngValid, doc) != 0) { virReportError(VIR_ERR_XML_INVALID_SCHEMA, - _("Unable to validate doc against %s\n%s"), + _("Unable to validate doc against %1$s\n%2$s"), validator->schemafile, virBufferCurrentContent(&validator->buf)); return -1; @@ -1823,7 +1823,7 @@ virXMLNamespaceRegister(xmlXPathContextPtr ctxt, BAD_CAST ns->prefix, BAD_CAST ns->uri) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to register xml namespace '%s'"), + _("Failed to register xml namespace '%1$s'"), ns->uri); return -1; } @@ -1876,7 +1876,7 @@ virParseScaledValue(const char *xpath, if (!required) return 0; virReportError(VIR_ERR_XML_ERROR, - _("missing element or attribute '%s'"), + _("missing element or attribute '%1$s'"), xpath); return -1; } @@ -1884,7 +1884,7 @@ virParseScaledValue(const char *xpath, if (virStrToLong_ullp(bytes_str, NULL, 10, &bytes) < 0) { virReportError(VIR_ERR_XML_ERROR, - _("Invalid value '%s' for element or attribute '%s'"), + _("Invalid value '%1$s' for element or attribute '%2$s'"), bytes_str, xpath); return -1; } -- 2.39.2

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com&gt; --- src/vmware/vmware_conf.c | 16 ++++++++-------- src/vmware/vmware_driver.c | 26 ++++++++++++++------------ 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/src/vmware/vmware_conf.c b/src/vmware/vmware_conf.c index 5703ce717e..8303591a9b 100644 --- a/src/vmware/vmware_conf.c +++ b/src/vmware/vmware_conf.c @@ -212,19 +212,19 @@ vmwareParseVersionStr(int type, const char *verbuf, unsigned long *version) break; default: virReportError(VIR_ERR_INTERNAL_ERROR, - _("Invalid driver type: %d"), type); + _("Invalid driver type: %1$d"), type); return -1; } if ((tmp = strstr(verbuf, pattern)) == NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("cannot find version pattern \"%s\""), pattern); + _("cannot find version pattern \"%1$s\""), pattern); return -1; } if ((tmp = STRSKIP(tmp, pattern)) == NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("failed to parse %sversion"), pattern); + _("failed to parse %1$sversion"), pattern); return -1; } @@ -311,7 +311,7 @@ vmwareParsePath(const char *path, char **directory, char **filename) if (*separator == '\0') { virReportError(VIR_ERR_INTERNAL_ERROR, - _("path '%s' doesn't reference a file"), path); + _("path '%1$s' doesn't reference a file"), path); return -1; } @@ -385,8 +385,8 @@ vmwareVmxPath(virDomainDef *vmdef, char **vmxPath) if (!virStringHasCaseSuffix(fileName, ".vmdk")) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Expecting source '%s' of first file-based harddisk " - "to be a VMDK image"), src); + _("Expecting source '%1$s' of first file-based harddisk to be a VMDK image"), + src); return -1; } @@ -401,7 +401,7 @@ vmwareMoveFile(char *srcFile, char *dstFile) g_autoptr(virCommand) cmd = NULL; if (!virFileExists(srcFile)) { - virReportError(VIR_ERR_INTERNAL_ERROR, _("file %s does not exist"), + virReportError(VIR_ERR_INTERNAL_ERROR, _("file %1$s does not exist"), srcFile); return -1; } @@ -413,7 +413,7 @@ vmwareMoveFile(char *srcFile, char *dstFile) if (virCommandRun(cmd, NULL) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("failed to move file to %s "), dstFile); + _("failed to move file to %1$s "), dstFile); return -1; } diff --git a/src/vmware/vmware_driver.c b/src/vmware/vmware_driver.c index 3c578434f3..259d00cacd 100644 --- a/src/vmware/vmware_driver.c +++ b/src/vmware/vmware_driver.c @@ -57,7 +57,7 @@ vmwareDomObjFromDomainLocked(struct vmware_driver *driver, virUUIDFormat(uuid, uuidstr); virReportError(VIR_ERR_NO_DOMAIN, - _("no domain with matching uuid '%s'"), uuidstr); + _("no domain with matching uuid '%1$s'"), uuidstr); return NULL; } @@ -158,7 +158,7 @@ vmwareConnectOpen(virConnectPtr conn, /* If path isn't /session, then they typoed, so tell them correct path */ if (STRNEQ(conn->uri->path, "/session")) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unexpected VMware URI path '%s', try vmwareplayer:///session, vmwarews:///session or vmwarefusion:///session"), + _("unexpected VMware URI path '%1$s', try vmwareplayer:///session, vmwarews:///session or vmwarefusion:///session"), NULLSTR(conn->uri->path)); return VIR_DRV_OPEN_ERROR; } @@ -177,7 +177,7 @@ vmwareConnectOpen(virConnectPtr conn, if (vmrun == NULL) continue; if (virFileResolveLink(vmrun, &driver->vmrun) < 0) { - virReportSystemError(errno, _("unable to resolve symlink '%s'"), vmrun); + virReportSystemError(errno, _("unable to resolve symlink '%1$s'"), vmrun); goto cleanup; } VIR_FREE(vmrun); @@ -196,8 +196,9 @@ vmwareConnectOpen(virConnectPtr conn, goto cleanup; if ((tmp = STRSKIP(conn->uri->scheme, "vmware")) == NULL) { - virReportError(VIR_ERR_INTERNAL_ERROR, _("unable to parse URI " - "scheme '%s'"), conn->uri->scheme); + virReportError(VIR_ERR_INTERNAL_ERROR, + _("unable to parse URI scheme '%1$s'"), + conn->uri->scheme); goto cleanup; } @@ -205,8 +206,9 @@ vmwareConnectOpen(virConnectPtr conn, driver->type = vmwareDriverTypeFromString(tmp); if (driver->type == -1) { - virReportError(VIR_ERR_INTERNAL_ERROR, _("unable to find valid " - "requested VMware backend '%s'"), tmp); + virReportError(VIR_ERR_INTERNAL_ERROR, + _("unable to find valid requested VMware backend '%1$s'"), + tmp); goto cleanup; } @@ -407,7 +409,7 @@ vmwareDomainDefineXMLFlags(virConnectPtr conn, const char *xml, unsigned int fla /* create vmx file */ if (virFileWriteStr(vmxPath, vmx, S_IRUSR|S_IWUSR) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to write vmx file '%s'"), vmxPath); + _("Failed to write vmx file '%1$s'"), vmxPath); goto cleanup; } @@ -652,7 +654,7 @@ vmwareDomainCreateXML(virConnectPtr conn, const char *xml, /* create vmx file */ if (virFileWriteStr(vmxPath, vmx, S_IRUSR|S_IWUSR) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to write vmx file '%s'"), vmxPath); + _("Failed to write vmx file '%1$s'"), vmxPath); goto cleanup; } @@ -775,7 +777,7 @@ vmwareDomainLookupByID(virConnectPtr conn, int id) if (!vm) { virReportError(VIR_ERR_NO_DOMAIN, - _("no domain with matching id '%d'"), id); + _("no domain with matching id '%1$d'"), id); goto cleanup; } @@ -832,7 +834,7 @@ vmwareDomainLookupByName(virConnectPtr conn, const char *name) if (!vm) { virReportError(VIR_ERR_NO_DOMAIN, - _("no domain with matching name '%s'"), name); + _("no domain with matching name '%1$s'"), name); goto cleanup; } @@ -910,7 +912,7 @@ vmwareConnectDomainXMLFromNative(virConnectPtr conn, const char *nativeFormat, if (STRNEQ(nativeFormat, VMX_CONFIG_FORMAT_ARGV)) { virReportError(VIR_ERR_INVALID_ARG, - _("Unsupported config format '%s'"), nativeFormat); + _("Unsupported config format '%1$s'"), nativeFormat); return NULL; } -- 2.39.2

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com&gt; --- src/vz/vz_driver.c | 32 ++++++++++---------- src/vz/vz_sdk.c | 74 ++++++++++++++++++++++------------------------ src/vz/vz_utils.c | 31 +++++++++---------- src/vz/vz_utils.h | 2 +- 4 files changed, 67 insertions(+), 72 deletions(-) diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index 4a7b14997f..56dc236233 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -364,7 +364,7 @@ vzConnectOpen(virConnectPtr conn, /* From this point on, the connection is for us. */ if (STRNEQ(conn->uri->path, "/system")) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unexpected Virtuozzo URI path '%s', try vz:///system"), + _("Unexpected Virtuozzo URI path '%1$s', try vz:///system"), conn->uri->path); return VIR_DRV_OPEN_ERROR; } @@ -575,7 +575,7 @@ vzDomainLookupByUUID(virConnectPtr conn, const unsigned char *uuid) char uuidstr[VIR_UUID_STRING_BUFLEN]; virUUIDFormat(uuid, uuidstr); virReportError(VIR_ERR_NO_DOMAIN, - _("no domain with matching uuid '%s'"), uuidstr); + _("no domain with matching uuid '%1$s'"), uuidstr); return NULL; } @@ -600,7 +600,7 @@ vzDomainLookupByName(virConnectPtr conn, const char *name) if (dom == NULL) { virReportError(VIR_ERR_NO_DOMAIN, - _("no domain with matching name '%s'"), name); + _("no domain with matching name '%1$s'"), name); return NULL; } @@ -773,7 +773,7 @@ vzEnsureDomainExists(virDomainObj *dom) virUUIDFormat(dom->def->uuid, uuidstr); virReportError(VIR_ERR_NO_DOMAIN, - _("no domain with matching uuid '%s' (%s)"), + _("no domain with matching uuid '%1$s' (%2$s)"), uuidstr, dom->def->name); return -1; @@ -816,7 +816,7 @@ vzDomainDefineXMLFlags(virConnectPtr conn, const char *xml, unsigned int flags) goto cleanup; } else { virReportError(VIR_ERR_INVALID_ARG, - _("Unsupported OS type: %s"), + _("Unsupported OS type: %1$s"), virDomainOSTypeToString(def->os.type)); goto cleanup; } @@ -1705,7 +1705,7 @@ vzDomainBlockStatsImpl(virDomainObj *dom, if (*path) { if ((idx = virDomainDiskIndexByName(dom->def, path, false)) < 0) { - virReportError(VIR_ERR_INVALID_ARG, _("invalid path: %s"), path); + virReportError(VIR_ERR_INVALID_ARG, _("invalid path: %1$s"), path); return -1; } if (prlsdkGetBlockStats(privdom->stats, @@ -1956,7 +1956,7 @@ static int vzConnectGetMaxVcpus(virConnectPtr conn, return 1028; virReportError(VIR_ERR_INVALID_ARG, - _("unknown type '%s'"), type); + _("unknown type '%1$s'"), type); return -1; } @@ -2129,7 +2129,7 @@ vzSnapObjFromName(virDomainSnapshotObjList *snapshots, const char *name) snap = virDomainSnapshotFindByName(snapshots, name); if (!snap) virReportError(VIR_ERR_NO_DOMAIN_SNAPSHOT, - _("no domain snapshot with matching name '%s'"), name); + _("no domain snapshot with matching name '%1$s'"), name); return snap; } @@ -2452,7 +2452,7 @@ vzDomainSnapshotGetParent(virDomainSnapshotPtr snapshot, unsigned int flags) if (!snap->def->parent_name) { virReportError(VIR_ERR_NO_DOMAIN_SNAPSHOT, - _("snapshot '%s' does not have a parent"), + _("snapshot '%1$s' does not have a parent"), snap->def->name); goto cleanup; } @@ -3037,21 +3037,21 @@ vzParseVzURI(const char *uri_str) if (!uri->scheme || !uri->server) { virReportError(VIR_ERR_INVALID_ARG, - _("scheme and host are mandatory vz migration URI: %s"), + _("scheme and host are mandatory vz migration URI: %1$s"), uri_str); goto error; } if (uri->user || uri->path || uri->query || uri->fragment) { virReportError(VIR_ERR_INVALID_ARG, - _("only scheme, host and port are supported in " - "vz migration URI: %s"), uri_str); + _("only scheme, host and port are supported in vz migration URI: %1$s"), + uri_str); goto error; } if (STRNEQ(uri->scheme, "vzmigr")) { virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, - _("unsupported scheme %s in migration URI %s"), + _("unsupported scheme %1$s in migration URI %2$s"), uri->scheme, uri_str); goto error; } @@ -3760,7 +3760,7 @@ vzConnectGetAllDomainStats(virConnectPtr conn, } else if ((flags & VIR_CONNECT_GET_ALL_DOMAINS_STATS_ENFORCE_STATS) && (stats & ~supported)) { virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, - _("Stats types bits 0x%x are not supported by this daemon"), + _("Stats types bits 0x%1$x are not supported by this daemon"), stats & ~supported); return -1; } @@ -3937,7 +3937,7 @@ vzDomainBlockResize(virDomainPtr domain, if (!(disk = virDomainDiskByName(dom->def, path, false))) { virReportError(VIR_ERR_INVALID_ARG, - _("invalid path: %s"), path); + _("invalid path: %1$s"), path); goto cleanup; } @@ -4091,7 +4091,7 @@ vzStateInitialize(bool privileged, vz_driver_privileged = privileged; if (g_mkdir_with_parents(VZ_STATEDIR, S_IRWXU) < 0) { - virReportSystemError(errno, _("cannot create state directory '%s'"), + virReportSystemError(errno, _("cannot create state directory '%1$s'"), VZ_STATEDIR); return VIR_DRV_STATE_INIT_ERROR; } diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c index 269dc3bb9e..286b52a29e 100644 --- a/src/vz/vz_sdk.c +++ b/src/vz/vz_sdk.c @@ -84,7 +84,7 @@ logPrlErrorHelper(PRL_RESULT err, const char *filename, virReportErrorHelper(VIR_FROM_THIS, VIR_ERR_INTERNAL_ERROR, filename, funcname, linenr, - _("%s %s"), msg1, msg2); + _("%1$s %2$s"), msg1, msg2); VIR_FREE(msg1); VIR_FREE(msg2); @@ -131,7 +131,7 @@ logPrlEventErrorHelper(PRL_HANDLE event, const char *filename, virReportErrorHelper(VIR_FROM_THIS, VIR_ERR_INTERNAL_ERROR, filename, funcname, linenr, - _("%s %s"), msg1, msg2); + _("%1$s %2$s"), msg1, msg2); VIR_FREE(msg1); VIR_FREE(msg2); } @@ -463,7 +463,7 @@ prlsdkSdkDomainLookupByUUID(struct _vzDriver *driver, const unsigned char *uuid) PGVC_SEARCH_BY_UUID, &sdkdom) < 0) { virUUIDFormat(uuid, uuidstr); virReportError(VIR_ERR_NO_DOMAIN, - _("no domain with matching uuid '%s'"), uuidstr); + _("no domain with matching uuid '%1$s'"), uuidstr); return PRL_INVALID_HANDLE; } @@ -478,7 +478,7 @@ prlsdkSdkDomainLookupByName(struct _vzDriver *driver, const char *name) if (prlsdkSdkDomainLookup(driver, name, PGVC_SEARCH_BY_NAME, &sdkdom) < 0) { virReportError(VIR_ERR_NO_DOMAIN, - _("no domain with matching name '%s'"), name); + _("no domain with matching name '%1$s'"), name); return PRL_INVALID_HANDLE; } @@ -609,7 +609,7 @@ prlsdkGetDiskId(PRL_HANDLE disk, virDomainDiskBus *bus, char **dst) break; default: virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unknown disk bus: %X"), ifType); + _("Unknown disk bus: %1$X"), ifType); return -1; } @@ -724,7 +724,7 @@ prlsdkGetFSInfo(PRL_HANDLE prldisk, goto cleanup; if (STRNEQ("libvirt", uri->scheme)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unknown uri scheme: '%s'"), + _("Unknown uri scheme: '%1$s'"), uri->scheme); goto cleanup; } @@ -732,17 +732,17 @@ prlsdkGetFSInfo(PRL_HANDLE prldisk, if (!(matches = g_strsplit(uri->path, "/", 0)) || !matches[0]) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("splitting StorageUrl failed %s"), uri->path); + _("splitting StorageUrl failed %1$s"), uri->path); goto cleanup; } if (!matches[1]) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("can't identify pool in uri %s "), uri->path); + _("can't identify pool in uri %1$s "), uri->path); goto cleanup; } if (!matches[2]) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("can't identify volume in uri %s"), uri->path); + _("can't identify volume in uri %1$s"), uri->path); goto cleanup; } fs->type = VIR_DOMAIN_FS_TYPE_VOLUME; @@ -1068,7 +1068,7 @@ prlsdkGetNetInfo(PRL_HANDLE netAdapter, virDomainNetDef *net, bool isCt) break; default: virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unknown adapter type: %X"), type); + _("Unknown adapter type: %1$X"), type); return -1; } } @@ -1185,7 +1185,7 @@ prlsdkGetSerialInfo(PRL_HANDLE serialPort, virDomainChrDef *chr) break; default: virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unknown serial type: %X"), emulatedType); + _("Unknown serial type: %1$X"), emulatedType); return -1; } @@ -1450,7 +1450,7 @@ prlsdkConvertDomainType(PRL_HANDLE sdkdom, virDomainDef *def) break; default: virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unknown domain type: %X"), domainType); + _("Unknown domain type: %1$X"), domainType); return -1; } @@ -1475,7 +1475,7 @@ prlsdkConvertCpuMode(PRL_HANDLE sdkdom, virDomainDef *def) break; default: virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unknown CPU mode: %X"), cpuMode); + _("Unknown CPU mode: %1$X"), cpuMode); return -1; } @@ -1600,7 +1600,7 @@ prlsdkBootOrderCheck(PRL_HANDLE sdkdom, PRL_DEVICE_TYPE sdkType, int sdkIndex, dev = prlsdkGetDevByDevIndex(sdkdom, sdkType, sdkIndex); if (dev == PRL_INVALID_HANDLE) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Can't find boot device of type: %d, device index: %d"), + _("Can't find boot device of type: %1$d, device index: %2$d"), sdkType, sdkIndex); return -1; } @@ -1617,13 +1617,13 @@ prlsdkBootOrderCheck(PRL_HANDLE sdkdom, PRL_DEVICE_TYPE sdkType, int sdkIndex, break; default: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Unsupported disk type %d"), sdkType); + _("Unsupported disk type %1$d"), sdkType); goto cleanup; } if (!(disk = virFindDiskBootIndex(def, device, bootIndex))) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Can't find boot device of type: %s, index: %d"), + _("Can't find boot device of type: %1$s, index: %2$d"), virDomainDiskDeviceTypeToString(device), bootIndex); goto cleanup; } @@ -1642,7 +1642,7 @@ prlsdkBootOrderCheck(PRL_HANDLE sdkdom, PRL_DEVICE_TYPE sdkType, int sdkIndex, if (bootIndex >= def->nnets) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Can't find network boot device for index: %d"), + _("Can't find network boot device for index: %1$d"), bootIndex); goto cleanup; } @@ -1653,7 +1653,7 @@ prlsdkBootOrderCheck(PRL_HANDLE sdkdom, PRL_DEVICE_TYPE sdkType, int sdkIndex, break; default: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Unexpected device type %d"), sdkType); + _("Unexpected device type %1$d"), sdkType); goto cleanup; } @@ -1732,7 +1732,7 @@ prlsdkConvertBootOrderVm(PRL_HANDLE sdkdom, virDomainDef *def) break; default: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Unexpected boot device type %i"), sdkType); + _("Unexpected boot device type %1$i"), sdkType); goto cleanup; } @@ -1835,7 +1835,7 @@ prlsdkLoadDomain(struct _vzDriver *driver, if (autostart != PAO_VM_START_ON_LOAD && autostart != PAO_VM_START_MANUAL) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unknown autostart mode: %X"), autostart); + _("Unknown autostart mode: %1$X"), autostart); return NULL; } @@ -2801,8 +2801,7 @@ static int prlsdkCheckSerialUnsupportedParams(virDomainChrDef *chr) if (chr->source->type == VIR_DOMAIN_CHR_TYPE_TCP && chr->source->data.tcp.protocol != VIR_DOMAIN_CHR_TCP_PROTOCOL_RAW) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Protocol '%s' is not supported for " - "tcp character device."), + _("Protocol '%1$s' is not supported for tcp character device."), virDomainChrTcpProtocolTypeToString(chr->source->data.tcp.protocol)); return -1; } @@ -3151,8 +3150,7 @@ static int prlsdkConfigureGateways(PRL_HANDLE sdknet, virDomainNetDef *net) break; default: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Unsupported address family %d " - "Only IPv4 or IPv6 default gateway"), + _("Unsupported address family %1$d Only IPv4 or IPv6 default gateway"), VIR_SOCKET_ADDR_FAMILY(gateway)); return -1; @@ -3354,7 +3352,7 @@ prlsdkFindNetByMAC(PRL_HANDLE sdkdom, virMacAddr *mac) } virReportError(VIR_ERR_INTERNAL_ERROR, - _("No net with mac '%s'"), virMacAddrFormat(mac, virMac)); + _("No net with mac '%1$s'"), virMacAddrFormat(mac, virMac)); cleanup: PrlHandle_Free(adapter); @@ -3502,7 +3500,7 @@ prlsdkGetDisk(PRL_HANDLE sdkdom, virDomainDiskDef *disk) } virReportError(VIR_ERR_INTERNAL_ERROR, - _("No disk with bus '%s' and target '%s'"), + _("No disk with bus '%1$s' and target '%2$s'"), virDomainDiskBusTypeToString(disk->bus), disk->dst); return PRL_INVALID_HANDLE; @@ -3581,7 +3579,7 @@ prlsdkAttachDevice(struct _vzDriver *driver, case VIR_DOMAIN_DEVICE_AUDIO: case VIR_DOMAIN_DEVICE_CRYPTO: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("attaching device type '%s' is unsupported"), + _("attaching device type '%1$s' is unsupported"), virDomainDeviceTypeToString(dev->type)); return -1; } @@ -3671,7 +3669,7 @@ prlsdkDetachDevice(struct _vzDriver *driver G_GNUC_UNUSED, case VIR_DOMAIN_DEVICE_AUDIO: case VIR_DOMAIN_DEVICE_CRYPTO: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("detaching device type '%s' is unsupported"), + _("detaching device type '%1$s' is unsupported"), virDomainDeviceTypeToString(dev->type)); goto cleanup; } @@ -3751,7 +3749,7 @@ prlsdkUpdateDevice(struct _vzDriver *driver, case VIR_DOMAIN_DEVICE_AUDIO: case VIR_DOMAIN_DEVICE_CRYPTO: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("updating device type '%s' is unsupported"), + _("updating device type '%1$s' is unsupported"), virDomainDeviceTypeToString(dev->type)); return -1; } @@ -3878,7 +3876,7 @@ prlsdkSetBootOrderVm(PRL_HANDLE sdkdom, virDomainDef *def) case VIR_DOMAIN_BOOT_LAST: default: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Unsupported boot device type: '%s'"), + _("Unsupported boot device type: '%1$s'"), virDomainBootTypeToString(virType)); return -1; } @@ -3965,7 +3963,7 @@ prlsdkDoApplyConfig(struct _vzDriver *driver, break; default: virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unknown CPU mode: %s"), + _("Unknown CPU mode: %1$s"), virArchToString(def->os.arch)); goto error; } @@ -4111,8 +4109,8 @@ virStorageTranslatePoolLocal(virConnectPtr conn, virStorageSource *src) return -1; if (virStoragePoolIsActive(pool) != 1) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("storage pool '%s' containing volume '%s' " - "is not active"), src->srcpool->pool, + _("storage pool '%1$s' containing volume '%2$s' is not active"), + src->srcpool->pool, src->srcpool->volume); goto cleanup; } @@ -4125,7 +4123,7 @@ virStorageTranslatePoolLocal(virConnectPtr conn, virStorageSource *src) if (info.type != VIR_STORAGE_VOL_PLOOP) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Unsupported volume format '%s'"), + _("Unsupported volume format '%1$s'"), virStorageVolTypeToString(info.type)); goto cleanup; } @@ -4398,7 +4396,7 @@ prlsdkGetBlockStats(PRL_HANDLE sdkstats, case VIR_DOMAIN_DISK_BUS_LAST: default: virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unknown disk bus: %X"), disk->bus); + _("Unknown disk bus: %1$X"), disk->bus); goto cleanup; } } @@ -4453,7 +4451,7 @@ prlsdkFindNetByPath(PRL_HANDLE sdkdom, const char *path) if (net == PRL_INVALID_HANDLE) virReportError(VIR_ERR_INVALID_ARG, - _("invalid path, '%s' is not a known interface"), path); + _("invalid path, '%1$s' is not a known interface"), path); return net; error: @@ -4627,7 +4625,7 @@ prlsdkParseDateTime(const char *str) /* second */ virStrToLong_i(tmp+1, &tmp, 10, &sec) < 0 || *tmp != '\0') { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unexpected DateTime format: '%s'"), str); + _("unexpected DateTime format: '%1$s'"), str); return -1; } @@ -4712,7 +4710,7 @@ prlsdkParseSnapshotTree(const char *treexml) def->state = VIR_DOMAIN_SHUTOFF; } else { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unexpected snapshot state: %s"), xmlstr); + _("unexpected snapshot state: %1$s"), xmlstr); } VIR_FREE(xmlstr); diff --git a/src/vz/vz_utils.c b/src/vz/vz_utils.c index 219d13823b..239d0db277 100644 --- a/src/vz/vz_utils.c +++ b/src/vz/vz_utils.c @@ -81,7 +81,7 @@ vzDomObjFromDomain(virDomainPtr domain) if (!vm) { virUUIDFormat(domain->uuid, uuidstr); virReportError(VIR_ERR_NO_DOMAIN, - _("no domain with matching uuid '%s' (%s)"), + _("no domain with matching uuid '%1$s' (%2$s)"), uuidstr, domain->name); return NULL; } @@ -202,15 +202,15 @@ vzCheckDiskAddressDriveUnsupportedParams(virDomainDiskDef *disk) if (drive->controller > 0) { /* We have only one controller of each type */ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Invalid drive address of disk %s, vz driver " - "supports only one controller."), disk->dst); + _("Invalid drive address of disk %1$s, vz driver supports only one controller."), + disk->dst); return -1; } if (drive->target > 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Invalid drive address of disk %s, vz driver " - "supports only target 0."), disk->dst); + _("Invalid drive address of disk %1$s, vz driver supports only target 0."), + disk->dst); return -1; } @@ -218,8 +218,7 @@ vzCheckDiskAddressDriveUnsupportedParams(virDomainDiskDef *disk) case VIR_DOMAIN_DISK_BUS_IDE: if (drive->unit > 1) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Invalid drive address of disk %s, vz driver " - "supports only units 0-1 for IDE bus."), + _("Invalid drive address of disk %1$s, vz driver supports only units 0-1 for IDE bus."), disk->dst); return -1; } @@ -228,8 +227,7 @@ vzCheckDiskAddressDriveUnsupportedParams(virDomainDiskDef *disk) case VIR_DOMAIN_DISK_BUS_SATA: if (drive->bus > 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Invalid drive address of disk %s, vz driver " - "supports only bus 0 for SATA and SCSI bus."), + _("Invalid drive address of disk %1$s, vz driver supports only bus 0 for SATA and SCSI bus."), disk->dst); return -1; } @@ -250,15 +248,14 @@ vzCheckDiskAddressDriveUnsupportedParams(virDomainDiskDef *disk) if (virDiskNameToBusDeviceIndex(disk, &busIdx, &devIdx) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("cannot convert disk '%s' to bus/device index"), + _("cannot convert disk '%1$s' to bus/device index"), disk->dst); return -1; } if (busIdx != drive->bus || devIdx != drive->unit) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Invalid drive address of disk %s, vz driver " - "does not support non default name mappings."), + _("Invalid drive address of disk %1$s, vz driver does not support non default name mappings."), disk->dst); return -1; } @@ -418,7 +415,7 @@ vzCheckUnsupportedDisk(const virDomainDef *def, if (virDomainDiskGetFormat(disk) != VIR_STORAGE_FILE_NONE && virDomainDiskGetFormat(disk) != diskFormat) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Unsupported format of disk %s"), + _("Unsupported format of disk %1$s"), disk->src->path); return -1; } @@ -430,7 +427,7 @@ vzCheckUnsupportedDisk(const virDomainDef *def, if (vzCaps->diskBuses[i] == VIR_DOMAIN_DISK_BUS_LAST) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Unsupported disk bus type %s"), + _("Unsupported disk bus type %1$s"), virDomainDiskBusTypeToString(disk->bus)); return -1; } @@ -454,7 +451,7 @@ vzCheckUnsupportedControllers(const virDomainDef *def, struct _vzCapabilities *v if (vzCaps->controllerTypes[j] == VIR_DOMAIN_CONTROLLER_TYPE_LAST) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Unsupported controller type %s"), + _("Unsupported controller type %1$s"), virDomainControllerTypeToString(controller->type)); return -1; } @@ -465,7 +462,7 @@ vzCheckUnsupportedControllers(const virDomainDef *def, struct _vzCapabilities *v controller->model != vzCaps->scsiControllerModel) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Unsupported SCSI controller model %s"), + _("Unsupported SCSI controller model %1$s"), virDomainControllerModelSCSITypeToString(controller->model)); return -1; } @@ -485,7 +482,7 @@ int vzGetDefaultSCSIModel(struct _vzDriver *driver, break; default: virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unknown SCSI controller model %s"), + _("Unknown SCSI controller model %1$s"), virDomainControllerModelSCSITypeToString( driver->vzCaps.scsiControllerModel)); return -1; diff --git a/src/vz/vz_utils.h b/src/vz/vz_utils.h index 9cb3c806e4..7a797953a5 100644 --- a/src/vz/vz_utils.h +++ b/src/vz/vz_utils.h @@ -44,7 +44,7 @@ char uuidstr[VIR_UUID_STRING_BUFLEN]; \ virUUIDFormat(domain->uuid, uuidstr); \ virReportError(VIR_ERR_NO_DOMAIN, \ - _("no domain with matching uuid '%s'"), uuidstr); \ + _("no domain with matching uuid '%1$s'"), uuidstr); \ } while (0) #define PARALLELS_DOMAIN_ROUTED_NETWORK_NAME "host-routed" -- 2.39.2

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com&gt; --- tools/virsh-checkpoint.c | 28 ++-- tools/virsh-domain-event.c | 65 ++++---- tools/virsh-domain-monitor.c | 24 +-- tools/virsh-domain.c | 312 +++++++++++++++++------------------ tools/virsh-edit.c | 2 +- tools/virsh-host.c | 46 +++--- tools/virsh-interface.c | 84 +++++----- tools/virsh-network.c | 71 ++++---- 8 files changed, 310 insertions(+), 322 deletions(-) diff --git a/tools/virsh-checkpoint.c b/tools/virsh-checkpoint.c index 9605c893af..727de34abb 100644 --- a/tools/virsh-checkpoint.c +++ b/tools/virsh-checkpoint.c @@ -59,10 +59,10 @@ virshCheckpointCreate(vshControl *ctl, } if (from) - vshPrintExtra(ctl, _("Domain checkpoint %s created from '%s'"), + vshPrintExtra(ctl, _("Domain checkpoint %1$s created from '%2$s'"), name, from); else - vshPrintExtra(ctl, _("Domain checkpoint %s created"), name); + vshPrintExtra(ctl, _("Domain checkpoint %1$s created"), name); return true; } @@ -179,7 +179,7 @@ virshParseCheckpointDiskspec(vshControl *ctl, ret = 0; cleanup: if (ret < 0) - vshError(ctl, _("unable to parse diskspec: %s"), str); + vshError(ctl, _("unable to parse diskspec: %1$s"), str); return ret; } @@ -293,7 +293,7 @@ virshLookupCheckpoint(vshControl *ctl, if (chkname) { *chk = virDomainCheckpointLookupByName(dom, chkname, 0); } else { - vshError(ctl, _("--%s is required"), arg); + vshError(ctl, _("--%1$s is required"), arg); return -1; } if (!*chk) { @@ -354,7 +354,7 @@ cmdCheckpointEdit(vshControl *ctl, #define EDIT_NOT_CHANGED \ do { \ vshPrintExtra(ctl, \ - _("Checkpoint %s XML configuration not changed.\n"), \ + _("Checkpoint %1$s XML configuration not changed.\n"), \ name); \ ret = true; \ goto edit_cleanup; \ @@ -365,16 +365,16 @@ cmdCheckpointEdit(vshControl *ctl, edited_name = virDomainCheckpointGetName(edited); if (STREQ(name, edited_name)) { - vshPrintExtra(ctl, _("Checkpoint %s edited.\n"), name); + vshPrintExtra(ctl, _("Checkpoint %1$s edited.\n"), name); } else { unsigned int delete_flags = VIR_DOMAIN_CHECKPOINT_DELETE_METADATA_ONLY; if (virDomainCheckpointDelete(edited, delete_flags) < 0) { vshReportError(ctl); - vshError(ctl, _("Failed to clean up %s"), edited_name); + vshError(ctl, _("Failed to clean up %1$s"), edited_name); goto cleanup; } - vshError(ctl, _("Cannot rename checkpoint %s to %s"), + vshError(ctl, _("Cannot rename checkpoint %1$s to %2$s"), name, edited_name); goto cleanup; } @@ -383,7 +383,7 @@ cmdCheckpointEdit(vshControl *ctl, cleanup: if (!ret && name) - vshError(ctl, _("Failed to update %s"), name); + vshError(ctl, _("Failed to update %1$s"), name); return ret; } @@ -705,7 +705,7 @@ cmdCheckpointList(vshControl *ctl, if (vshCommandOptBool(cmd, option)) { \ if (tree) { \ vshError(ctl, \ - _("--%s and --tree are mutually exclusive"), \ + _("--%1$s and --tree are mutually exclusive"), \ option); \ return false; \ } \ @@ -944,7 +944,7 @@ cmdCheckpointParent(vshControl *ctl, if (virshGetCheckpointParent(ctl, checkpoint, &parent) < 0) return false; if (!parent) { - vshError(ctl, _("checkpoint '%s' has no parent"), name); + vshError(ctl, _("checkpoint '%1$s' has no parent"), name); return false; } @@ -1016,11 +1016,11 @@ cmdCheckpointDelete(vshControl *ctl, if (virDomainCheckpointDelete(checkpoint, flags) == 0) { if (flags & VIR_DOMAIN_CHECKPOINT_DELETE_CHILDREN_ONLY) - vshPrintExtra(ctl, _("Domain checkpoint %s children deleted\n"), name); + vshPrintExtra(ctl, _("Domain checkpoint %1$s children deleted\n"), name); else - vshPrintExtra(ctl, _("Domain checkpoint %s deleted\n"), name); + vshPrintExtra(ctl, _("Domain checkpoint %1$s deleted\n"), name); } else { - vshError(ctl, _("Failed to delete checkpoint %s"), name); + vshError(ctl, _("Failed to delete checkpoint %1$s"), name); return false; } diff --git a/tools/virsh-domain-event.c b/tools/virsh-domain-event.c index 9531a5435c..2ad4573ee9 100644 --- a/tools/virsh-domain-event.c +++ b/tools/virsh-domain-event.c @@ -327,7 +327,7 @@ virshEventGenericPrint(virConnectPtr conn G_GNUC_UNUSED, { g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; - virBufferAsprintf(&buf, _("event '%s' for domain '%s'\n"), + virBufferAsprintf(&buf, _("event '%1$s' for domain '%2$s'\n"), ((virshDomEventData *) opaque)->cb->name, virDomainGetName(dom)); virshEventPrint(opaque, &buf); @@ -342,7 +342,7 @@ virshEventLifecyclePrint(virConnectPtr conn G_GNUC_UNUSED, { g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; - virBufferAsprintf(&buf, _("event 'lifecycle' for domain '%s': %s %s\n"), + virBufferAsprintf(&buf, _("event 'lifecycle' for domain '%1$s': %2$s %3$s\n"), virDomainGetName(dom), virshDomainEventToString(event), virshDomainEventDetailToString(event, detail)); @@ -357,7 +357,7 @@ virshEventRTCChangePrint(virConnectPtr conn G_GNUC_UNUSED, { g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; - virBufferAsprintf(&buf, _("event 'rtc-change' for domain '%s': %lld\n"), + virBufferAsprintf(&buf, _("event 'rtc-change' for domain '%1$s': %2$lld\n"), virDomainGetName(dom), utcoffset); virshEventPrint(opaque, &buf); @@ -371,7 +371,7 @@ virshEventWatchdogPrint(virConnectPtr conn G_GNUC_UNUSED, { g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; - virBufferAsprintf(&buf, _("event 'watchdog' for domain '%s': %s\n"), + virBufferAsprintf(&buf, _("event 'watchdog' for domain '%1$s': %2$s\n"), virDomainGetName(dom), virshDomainEventWatchdogToString(action)); virshEventPrint(opaque, &buf); @@ -387,7 +387,7 @@ virshEventIOErrorPrint(virConnectPtr conn G_GNUC_UNUSED, { g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; - virBufferAsprintf(&buf, _("event 'io-error' for domain '%s': %s (%s) %s\n"), + virBufferAsprintf(&buf, _("event 'io-error' for domain '%1$s': %2$s (%3$s) %4$s\n"), virDomainGetName(dom), srcPath, devAlias, @@ -408,8 +408,8 @@ virshEventGraphicsPrint(virConnectPtr conn G_GNUC_UNUSED, g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; size_t i; - virBufferAsprintf(&buf, _("event 'graphics' for domain '%s': " - "%s local[%s %s %s] remote[%s %s %s] %s\n"), + virBufferAsprintf(&buf, _("event 'graphics' for domain '%1$s': " + "%2$s local[%3$s %4$s %5$s] remote[%6$s %7$s %8$s] %9$s\n"), virDomainGetName(dom), virshGraphicsPhaseToString(phase), virshGraphicsAddressToString(local->family), @@ -438,8 +438,8 @@ virshEventIOErrorReasonPrint(virConnectPtr conn G_GNUC_UNUSED, { g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; - virBufferAsprintf(&buf, _("event 'io-error-reason' for domain '%s': " - "%s (%s) %s due to %s\n"), + virBufferAsprintf(&buf, _("event 'io-error-reason' for domain '%1$s': " + "%2$s (%3$s) %4$s due to %5$s\n"), virDomainGetName(dom), srcPath, devAlias, @@ -458,7 +458,7 @@ virshEventBlockJobPrint(virConnectPtr conn G_GNUC_UNUSED, { g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; - virBufferAsprintf(&buf, _("event '%s' for domain '%s': %s for %s %s\n"), + virBufferAsprintf(&buf, _("event '%1$s' for domain '%2$s': %3$s for %4$s %5$s\n"), ((virshDomEventData *) opaque)->cb->name, virDomainGetName(dom), virshDomainBlockJobToString(type), @@ -478,8 +478,8 @@ virshEventDiskChangePrint(virConnectPtr conn G_GNUC_UNUSED, { g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; - virBufferAsprintf(&buf, _("event 'disk-change' for domain '%s' disk %s: " - "%s -> %s: %s\n"), + virBufferAsprintf(&buf, _("event 'disk-change' for domain '%1$s' disk %2$s: " + "%3$s -> %4$s: %5$s\n"), virDomainGetName(dom), alias, NULLSTR(oldSrc), @@ -497,7 +497,7 @@ virshEventTrayChangePrint(virConnectPtr conn G_GNUC_UNUSED, { g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; - virBufferAsprintf(&buf, _("event 'tray-change' for domain '%s' disk %s: %s\n"), + virBufferAsprintf(&buf, _("event 'tray-change' for domain '%1$s' disk %2$s: %3$s\n"), virDomainGetName(dom), alias, virshDomainEventTrayChangeToString(reason)); @@ -523,7 +523,7 @@ virshEventBalloonChangePrint(virConnectPtr conn G_GNUC_UNUSED, { g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; - virBufferAsprintf(&buf, _("event 'balloon-change' for domain '%s': %lluKiB\n"), + virBufferAsprintf(&buf, _("event 'balloon-change' for domain '%1$s': %2$lluKiB\n"), virDomainGetName(dom), actual); virshEventPrint(opaque, &buf); @@ -537,7 +537,7 @@ virshEventDeviceRemovedPrint(virConnectPtr conn G_GNUC_UNUSED, { g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; - virBufferAsprintf(&buf, _("event 'device-removed' for domain '%s': %s\n"), + virBufferAsprintf(&buf, _("event 'device-removed' for domain '%1$s': %2$s\n"), virDomainGetName(dom), alias); virshEventPrint(opaque, &buf); @@ -551,7 +551,7 @@ virshEventDeviceAddedPrint(virConnectPtr conn G_GNUC_UNUSED, { g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; - virBufferAsprintf(&buf, _("event 'device-added' for domain '%s': %s\n"), + virBufferAsprintf(&buf, _("event 'device-added' for domain '%1$s': %2$s\n"), virDomainGetName(dom), alias); virshEventPrint(opaque, &buf); @@ -568,7 +568,7 @@ virshEventTunablePrint(virConnectPtr conn G_GNUC_UNUSED, size_t i; char *value; - virBufferAsprintf(&buf, _("event 'tunable' for domain '%s':\n"), + virBufferAsprintf(&buf, _("event 'tunable' for domain '%1$s':\n"), virDomainGetName(dom)); for (i = 0; i < nparams; i++) { value = virTypedParameterToString(&params[i]); @@ -604,8 +604,8 @@ virshEventAgentLifecyclePrint(virConnectPtr conn G_GNUC_UNUSED, { g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; - virBufferAsprintf(&buf, _("event 'agent-lifecycle' for domain '%s': state: " - "'%s' reason: '%s'\n"), + virBufferAsprintf(&buf, _("event 'agent-lifecycle' for domain '%1$s': state: " + "'%2$s' reason: '%3$s'\n"), virDomainGetName(dom), UNKNOWNSTR(virshEventAgentLifecycleStateTypeToString(state)), UNKNOWNSTR(virshEventAgentLifecycleReasonTypeToString(reason))); @@ -620,8 +620,8 @@ virshEventMigrationIterationPrint(virConnectPtr conn G_GNUC_UNUSED, { g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; - virBufferAsprintf(&buf, _("event 'migration-iteration' for domain '%s': " - "iteration: '%d'\n"), + virBufferAsprintf(&buf, _("event 'migration-iteration' for domain '%1$s': " + "iteration: '%2$d'\n"), virDomainGetName(dom), iteration); @@ -638,7 +638,7 @@ virshEventJobCompletedPrint(virConnectPtr conn G_GNUC_UNUSED, g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; size_t i; - virBufferAsprintf(&buf, _("event 'job-completed' for domain '%s':\n"), + virBufferAsprintf(&buf, _("event 'job-completed' for domain '%1$s':\n"), virDomainGetName(dom)); for (i = 0; i < nparams; i++) { g_autofree char *value = virTypedParameterToString(&params[i]); @@ -657,7 +657,7 @@ virshEventDeviceRemovalFailedPrint(virConnectPtr conn G_GNUC_UNUSED, { g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; - virBufferAsprintf(&buf, _("event 'device-removal-failed' for domain '%s': %s\n"), + virBufferAsprintf(&buf, _("event 'device-removal-failed' for domain '%1$s': %2$s\n"), virDomainGetName(dom), alias); virshEventPrint(opaque, &buf); @@ -679,7 +679,7 @@ virshEventMetadataChangePrint(virConnectPtr conn G_GNUC_UNUSED, { g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; - virBufferAsprintf(&buf, _("event 'metadata-change' for domain '%s': type %s, uri %s\n"), + virBufferAsprintf(&buf, _("event 'metadata-change' for domain '%1$s': type %2$s, uri %3$s\n"), virDomainGetName(dom), UNKNOWNSTR(virshEventMetadataChangeTypeTypeToString(type)), NULLSTR(nsuri)); @@ -698,8 +698,8 @@ virshEventBlockThresholdPrint(virConnectPtr conn G_GNUC_UNUSED, { g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; - virBufferAsprintf(&buf, _("event 'block-threshold' for domain '%s': " - "dev: %s(%s) %llu %llu\n"), + virBufferAsprintf(&buf, _("event 'block-threshold' for domain '%1$s': " + "dev: %2$s(%3$s) %4$llu %5$llu\n"), virDomainGetName(dom), dev, NULLSTR(path), threshold, excess); virshEventPrint(opaque, &buf); @@ -730,13 +730,11 @@ virshEventMemoryFailurePrint(virConnectPtr conn G_GNUC_UNUSED, { g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; - virBufferAsprintf(&buf, _("event 'memory-failure' for domain '%s':\n" - "recipient: %s\naction: %s\n"), + virBufferAsprintf(&buf, _("event 'memory-failure' for domain '%1$s':\nrecipient: %2$s\naction: %3$s\n"), virDomainGetName(dom), UNKNOWNSTR(virshEventMemoryFailureRecipientTypeTypeToString(recipient)), UNKNOWNSTR(virshEventMemoryFailureActionTypeTypeToString(action))); - virBufferAsprintf(&buf, _("flags:\n" - "\taction required: %d\n\trecursive: %d\n"), + virBufferAsprintf(&buf, _("flags:\n\taction required: %1$d\n\trecursive: %2$d\n"), !!(flags & VIR_DOMAIN_MEMORY_FAILURE_ACTION_REQUIRED), !!(flags & VIR_DOMAIN_MEMORY_FAILURE_RECURSIVE)); @@ -754,8 +752,7 @@ virshEventMemoryDeviceSizeChangePrint(virConnectPtr conn G_GNUC_UNUSED, g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; virBufferAsprintf(&buf, - _("event 'memory-device-size-change' for domain '%s':\n" - "alias: %s\nsize: %llu\n"), + _("event 'memory-device-size-change' for domain '%1$s':\nalias: %2$s\nsize: %3$llu\n"), virDomainGetName(dom), alias, size); virshEventPrint(opaque, &buf); @@ -932,7 +929,7 @@ cmdEvent(vshControl *ctl, const vshCmd *cmd) } if (ndata == 0) { - vshError(ctl, _("unknown event type %s"), eventName); + vshError(ctl, _("unknown event type %1$s"), eventName); return false; } @@ -975,7 +972,7 @@ cmdEvent(vshControl *ctl, const vshCmd *cmd) default: goto cleanup; } - vshPrint(ctl, _("events received: %d\n"), count); + vshPrint(ctl, _("events received: %1$d\n"), count); if (count) ret = true; diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c index c2134faba1..ed426431a1 100644 --- a/tools/virsh-domain-monitor.c +++ b/tools/virsh-domain-monitor.c @@ -327,7 +327,7 @@ cmdDomMemStat(vshControl *ctl, const vshCmd *cmd) return false; if (rv > 0) { if (period < 0) { - vshError(ctl, _("Invalid collection period value '%d'"), period); + vshError(ctl, _("Invalid collection period value '%1$d'"), period); return false; } @@ -341,7 +341,7 @@ cmdDomMemStat(vshControl *ctl, const vshCmd *cmd) nr_stats = virDomainMemoryStats(dom, stats, VIR_DOMAIN_MEMORY_STAT_NR, 0); if (nr_stats == -1) { - vshError(ctl, _("Failed to get memory statistics for domain %s"), name); + vshError(ctl, _("Failed to get memory statistics for domain %1$s"), name); return false; } @@ -811,9 +811,9 @@ cmdDomIfGetLink(vshControl *ctl, const vshCmd *cmd) if (ninterfaces < 1) { if (macstr[0]) - vshError(ctl, _("Interface (mac: %s) not found."), macstr); + vshError(ctl, _("Interface (mac: %1$s) not found."), macstr); else - vshError(ctl, _("Interface (dev: %s) not found."), iface); + vshError(ctl, _("Interface (dev: %1$s) not found."), iface); return false; } else if (ninterfaces > 1) { @@ -986,14 +986,14 @@ cmdDomblkstat(vshControl *ctl, const vshCmd *cmd) if (virDomainBlockStats(dom, device, &stats, sizeof(stats)) == -1) { - vshError(ctl, _("Failed to get block stats %s %s"), + vshError(ctl, _("Failed to get block stats %1$s %2$s"), name, device); return false; } /* human friendly output */ if (human) { - vshPrint(ctl, N_("Device: %s\n"), device); + vshPrint(ctl, N_("Device: %1$s\n"), device); device = ""; } @@ -1005,13 +1005,13 @@ cmdDomblkstat(vshControl *ctl, const vshCmd *cmd) } else { params = g_new0(virTypedParameter, nparams); if (virDomainBlockStatsFlags(dom, device, params, &nparams, 0) < 0) { - vshError(ctl, _("Failed to get block stats for domain '%s' device '%s'"), name, device); + vshError(ctl, _("Failed to get block stats for domain '%1$s' device '%2$s'"), name, device); return false; } /* set for prettier output */ if (human) { - vshPrint(ctl, N_("Device: %s\n"), device); + vshPrint(ctl, N_("Device: %1$s\n"), device); device = ""; } @@ -1097,7 +1097,7 @@ cmdDomIfstat(vshControl *ctl, const vshCmd *cmd) return false; if (virDomainInterfaceStats(dom, device, &stats, sizeof(stats)) == -1) { - vshError(ctl, _("Failed to get interface stats %s %s"), name, device); + vshError(ctl, _("Failed to get interface stats %1$s %2$s"), name, device); return false; } @@ -1462,9 +1462,9 @@ cmdDomTime(vshControl *ctl, const vshCmd *cmd) then = g_date_time_new_from_unix_utc(seconds); thenstr = g_date_time_format(then, "%Y-%m-%d %H:%M:%S"); - vshPrint(ctl, _("Time: %s"), thenstr); + vshPrint(ctl, _("Time: %1$s"), thenstr); } else { - vshPrint(ctl, _("Time: %lld"), seconds); + vshPrint(ctl, _("Time: %1$lld"), seconds); } } @@ -2320,7 +2320,7 @@ cmdDomIfAddr(vshControl *ctl, const vshCmd *cmd) if (sourcestr && (source = virshDomainInterfaceAddressesSourceTypeFromString(sourcestr)) < 0) { - vshError(ctl, _("Unknown data source '%s'"), sourcestr); + vshError(ctl, _("Unknown data source '%1$s'"), sourcestr); return false; } diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index a4abcb1b03..6850843a25 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -248,7 +248,7 @@ virshFetchPassFdsList(vshControl *ctl, return 0; if (!(fdlist = g_strsplit(fdopt, ",", -1))) { - vshError(ctl, _("Unable to split FD list '%s'"), fdopt); + vshError(ctl, _("Unable to split FD list '%1$s'"), fdopt); return -1; } @@ -257,7 +257,7 @@ virshFetchPassFdsList(vshControl *ctl, for (i = 0; i < nfds; i++) { if (virStrToLong_i(fdlist[i], NULL, 10, fds + i) < 0) { - vshError(ctl, _("Unable to parse FD number '%s'"), fdlist[i]); + vshError(ctl, _("Unable to parse FD number '%1$s'"), fdlist[i]); return -1; } } @@ -405,7 +405,7 @@ cmdAttachDevice(vshControl *ctl, const vshCmd *cmd) rv = virDomainAttachDevice(dom, buffer); if (rv < 0) { - vshError(ctl, _("Failed to attach device from %s"), from); + vshError(ctl, _("Failed to attach device from %1$s"), from); return false; } @@ -677,7 +677,7 @@ cmdAttachDisk(vshControl *ctl, const vshCmd *cmd) if (stype && (type = virshAttachDiskSourceTypeFromString(stype)) < 0) { - vshError(ctl, _("Unknown source type: '%s'"), stype); + vshError(ctl, _("Unknown source type: '%1$s'"), stype); return false; } @@ -701,7 +701,7 @@ cmdAttachDisk(vshControl *ctl, const vshCmd *cmd) } if (mode && STRNEQ(mode, "readonly") && STRNEQ(mode, "shareable")) { - vshError(ctl, _("No support for %s in command 'attach-disk'"), mode); + vshError(ctl, _("No support for %1$s in command 'attach-disk'"), mode); return false; } @@ -902,7 +902,7 @@ VIR_ENUM_IMPL(virshDomainInterfaceSourceMode, if (index < ntok && \ *tok[index] != '\0' && \ virStrToLong_ullp(tok[index], NULL, 10, &rate->name) < 0) { \ - vshError(ctl, _("field '%s' is malformed"), #name); \ + vshError(ctl, _("field '%1$s' is malformed"), #name); \ return -1; \ } \ } while (0) @@ -919,7 +919,7 @@ virshParseRateStr(vshControl *ctl, return -1; if ((ntok = g_strv_length(tok)) > 4) { - vshError(ctl, _("Rate string '%s' has too many fields"), rateStr); + vshError(ctl, _("Rate string '%1$s' has too many fields"), rateStr); return -1; } @@ -978,14 +978,14 @@ cmdAttachInterface(vshControl *ctl, const vshCmd *cmd) /* check interface type */ if ((int)(typ = virDomainNetTypeFromString(type)) < 0) { - vshError(ctl, _("No support for %s in command 'attach-interface'"), + vshError(ctl, _("No support for %1$s in command 'attach-interface'"), type); return false; } if (sourceModeStr && (sourceMode = virshDomainInterfaceSourceModeTypeFromString(sourceModeStr)) < 0) { - vshError(ctl, _("Invalid source mode: %s"), sourceModeStr); + vshError(ctl, _("Invalid source mode: %1$s"), sourceModeStr); return false; } @@ -1036,7 +1036,7 @@ cmdAttachInterface(vshControl *ctl, const vshCmd *cmd) struct virshAddress addr = { 0 }; if (virshAddressParse(pciaddrstr, false, &addr) < 0) { - vshError(ctl, _("cannot parse pci address '%s' for network interface"), + vshError(ctl, _("cannot parse pci address '%1$s' for network interface"), source); return false; } @@ -1070,7 +1070,7 @@ cmdAttachInterface(vshControl *ctl, const vshCmd *cmd) case VIR_DOMAIN_NET_TYPE_NULL: case VIR_DOMAIN_NET_TYPE_VDS: case VIR_DOMAIN_NET_TYPE_LAST: - vshError(ctl, _("No support for %s in command 'attach-interface'"), + vshError(ctl, _("No support for %1$s in command 'attach-interface'"), type); return false; break; @@ -1183,16 +1183,16 @@ cmdAutostart(vshControl *ctl, const vshCmd *cmd) if (virDomainSetAutostart(dom, autostart) < 0) { if (autostart) - vshError(ctl, _("Failed to mark domain '%s' as autostarted"), name); + vshError(ctl, _("Failed to mark domain '%1$s' as autostarted"), name); else - vshError(ctl, _("Failed to unmark domain '%s' as autostarted"), name); + vshError(ctl, _("Failed to unmark domain '%1$s' as autostarted"), name); return false; } if (autostart) - vshPrintExtra(ctl, _("Domain '%s' marked as autostarted\n"), name); + vshPrintExtra(ctl, _("Domain '%1$s' marked as autostarted\n"), name); else - vshPrintExtra(ctl, _("Domain '%s' unmarked as autostarted\n"), name); + vshPrintExtra(ctl, _("Domain '%1$s' unmarked as autostarted\n"), name); return true; } @@ -1610,7 +1610,7 @@ cmdBlkiotune(vshControl * ctl, const vshCmd * cmd) goto cleanup; } else if (rv > 0) { if (weight <= 0) { - vshError(ctl, _("Invalid value of %d for I/O weight"), weight); + vshError(ctl, _("Invalid value of %1$d for I/O weight"), weight); goto cleanup; } if (virTypedParamsAddUInt(&params, &nparams, &maxparams, @@ -1936,7 +1936,7 @@ virshBlockJobWait(virshBlockJobWaitData *data) #endif /* !WIN32 */ if (result < 0) { - vshError(data->ctl, _("failed to query job for disk %s"), data->dev); + vshError(data->ctl, _("failed to query job for disk %1$s"), data->dev); goto cleanup; } @@ -1978,7 +1978,7 @@ virshBlockJobWait(virshBlockJobWaitData *data) if (intCaught || (data->timeout && (curr - start > data->timeout))) { if (virDomainBlockJobAbort(data->dom, data->dev, abort_flags) < 0) { - vshError(data->ctl, _("failed to abort job for disk '%s'"), + vshError(data->ctl, _("failed to abort job for disk '%1$s'"), data->dev); goto cleanup; } @@ -2205,14 +2205,14 @@ cmdBlockcommit(vshControl *ctl, const vshCmd *cmd) if (pivot) { abort_flags |= VIR_DOMAIN_BLOCK_JOB_ABORT_PIVOT; if (virDomainBlockJobAbort(dom, path, abort_flags) < 0) { - vshError(ctl, _("failed to pivot job for disk %s"), path); + vshError(ctl, _("failed to pivot job for disk %1$s"), path); goto cleanup; } vshPrintExtra(ctl, "\n%s", _("Successfully pivoted")); } else if (finish) { if (virDomainBlockJobAbort(dom, path, abort_flags) < 0) { - vshError(ctl, _("failed to finish job for disk %s"), path); + vshError(ctl, _("failed to finish job for disk %1$s"), path); goto cleanup; } @@ -2451,7 +2451,7 @@ cmdBlockcopy(vshControl *ctl, const vshCmd *cmd) * ullong bytes/s; make sure we don't overflow */ unsigned long long limit = MIN(ULONG_MAX, ULLONG_MAX >> 20); if (bandwidth > limit) { - vshError(ctl, _("bandwidth must be less than %llu"), limit); + vshError(ctl, _("bandwidth must be less than %1$llu"), limit); goto cleanup; } @@ -2546,14 +2546,14 @@ cmdBlockcopy(vshControl *ctl, const vshCmd *cmd) if (pivot) { abort_flags |= VIR_DOMAIN_BLOCK_JOB_ABORT_PIVOT; if (virDomainBlockJobAbort(dom, path, abort_flags) < 0) { - vshError(ctl, _("failed to pivot job for disk %s"), path); + vshError(ctl, _("failed to pivot job for disk %1$s"), path); goto cleanup; } vshPrintExtra(ctl, "\n%s", _("Successfully pivoted")); } else if (finish) { if (virDomainBlockJobAbort(dom, path, abort_flags) < 0) { - vshError(ctl, _("failed to finish job for disk %s"), path); + vshError(ctl, _("failed to finish job for disk %1$s"), path); goto cleanup; } @@ -2669,7 +2669,7 @@ virshBlockJobInfo(vshControl *ctl, if (!raw) { speed <<= 20; if (speed >> 20 != info.bandwidth) { - vshError(ctl, _("overflow in converting %ld MiB/s to bytes\n"), + vshError(ctl, _("overflow in converting %1$ld MiB/s to bytes\n"), info.bandwidth); return false; } @@ -2678,12 +2678,12 @@ virshBlockJobInfo(vshControl *ctl, if (rc == 0) { if (!raw) - vshPrintExtra(ctl, _("No current block job for %s"), path); + vshPrintExtra(ctl, _("No current block job for %1$s"), path); return true; } if (raw) { - vshPrint(ctl, _(" type=%s\n bandwidth=%lu\n cur=%llu\n end=%llu\n"), + vshPrint(ctl, _(" type=%1$s\n bandwidth=%2$lu\n cur=%3$llu\n end=%4$llu\n"), virshDomainBlockJobTypeToString(info.type), info.bandwidth, info.cur, info.end); } else { @@ -2692,7 +2692,7 @@ virshBlockJobInfo(vshControl *ctl, if (speed) { const char *unit; double val = vshPrettyCapacity(speed, &unit); - vshPrint(ctl, _(" Bandwidth limit: %llu bytes/s (%-.3lf %s/s)"), + vshPrint(ctl, _(" Bandwidth limit: %1$llu bytes/s (%2$-.3lf %3$s/s)"), speed, val, unit); } vshPrint(ctl, "\n"); @@ -2986,11 +2986,11 @@ cmdBlockresize(vshControl *ctl, const vshCmd *cmd) return false; if (virDomainBlockResize(dom, path, size, flags) < 0) { - vshError(ctl, _("Failed to resize block device '%s'"), path); + vshError(ctl, _("Failed to resize block device '%1$s'"), path); return false; } - vshPrintExtra(ctl, _("Block device '%s' is resized"), path); + vshPrintExtra(ctl, _("Block device '%1$s' is resized"), path); return true; } @@ -3049,8 +3049,8 @@ cmdRunConsole(vshControl *ctl, virDomainPtr dom, return false; } - vshPrintExtra(ctl, _("Connected to domain '%s'\n"), virDomainGetName(dom)); - vshPrintExtra(ctl, _("Escape character is %s"), priv->escapeChar); + vshPrintExtra(ctl, _("Connected to domain '%1$s'\n"), virDomainGetName(dom)); + vshPrintExtra(ctl, _("Escape character is %1$s"), priv->escapeChar); if (priv->escapeChar[0] == '^') vshPrintExtra(ctl, " (Ctrl + %c)", priv->escapeChar[1]); vshPrintExtra(ctl, "\n"); @@ -3150,7 +3150,7 @@ cmdDomIfSetLink(vshControl *ctl, const vshCmd *cmd) return false; if (STRNEQ(state, "up") && STRNEQ(state, "down")) { - vshError(ctl, _("invalid link state '%s'"), state); + vshError(ctl, _("invalid link state '%1$s'"), state); return false; } @@ -3192,7 +3192,7 @@ cmdDomIfSetLink(vshControl *ctl, const vshCmd *cmd) } if (!ifaceNode) { - vshError(ctl, _("interface '%s' not found"), iface); + vshError(ctl, _("interface '%1$s' not found"), iface); return false; } @@ -3318,7 +3318,7 @@ cmdDomIftune(vshControl *ctl, const vshCmd *cmd) * only accepts UINT */ if (inbound.average > UINT_MAX || inbound.peak > UINT_MAX || inbound.burst > UINT_MAX) { - vshError(ctl, _("inbound rate larger than maximum %u"), + vshError(ctl, _("inbound rate larger than maximum %1$u"), UINT_MAX); goto cleanup; } @@ -3358,7 +3358,7 @@ cmdDomIftune(vshControl *ctl, const vshCmd *cmd) goto cleanup; if (outbound.average > UINT_MAX || outbound.peak > UINT_MAX || outbound.burst > UINT_MAX) { - vshError(ctl, _("outbound rate larger than maximum %u"), + vshError(ctl, _("outbound rate larger than maximum %1$u"), UINT_MAX); goto cleanup; } @@ -3462,11 +3462,11 @@ cmdSuspend(vshControl *ctl, const vshCmd *cmd) return false; if (virDomainSuspend(dom) != 0) { - vshError(ctl, _("Failed to suspend domain '%s'"), name); + vshError(ctl, _("Failed to suspend domain '%1$s'"), name); return false; } - vshPrintExtra(ctl, _("Domain '%s' suspended\n"), name); + vshPrintExtra(ctl, _("Domain '%1$s' suspended\n"), name); return true; } @@ -3528,12 +3528,12 @@ cmdDomPMSuspend(vshControl *ctl, const vshCmd *cmd) } if (virDomainPMSuspendForDuration(dom, suspendTarget, duration, 0) < 0) { - vshError(ctl, _("Domain '%s' could not be suspended"), + vshError(ctl, _("Domain '%1$s' could not be suspended"), virDomainGetName(dom)); return false; } - vshPrintExtra(ctl, _("Domain '%s' successfully suspended"), + vshPrintExtra(ctl, _("Domain '%1$s' successfully suspended"), virDomainGetName(dom)); return true; @@ -3570,12 +3570,12 @@ cmdDomPMWakeup(vshControl *ctl, const vshCmd *cmd) return false; if (virDomainPMWakeup(dom, flags) < 0) { - vshError(ctl, _("Domain '%s' could not be woken up"), + vshError(ctl, _("Domain '%1$s' could not be woken up"), virDomainGetName(dom)); return false; } - vshPrintExtra(ctl, _("Domain '%s' successfully woken up"), + vshPrintExtra(ctl, _("Domain '%1$s' successfully woken up"), virDomainGetName(dom)); return true; @@ -3858,7 +3858,7 @@ cmdUndefine(vshControl *ctl, const vshCmd *cmd) if (!source) { vshError(ctl, - _("Missing storage volume name for disk '%s'"), + _("Missing storage volume name for disk '%1$s'"), target); continue; } @@ -3866,7 +3866,7 @@ cmdUndefine(vshControl *ctl, const vshCmd *cmd) if (!(storagepool = virStoragePoolLookupByName(priv->conn, pool))) { vshError(ctl, - _("Storage pool '%s' for volume '%s' not found."), + _("Storage pool '%1$s' for volume '%2$s' not found."), pool, target); vshResetLibvirtError(); continue; @@ -3880,8 +3880,8 @@ cmdUndefine(vshControl *ctl, const vshCmd *cmd) if (!vol.vol) { vshError(ctl, - _("Storage volume '%s'(%s) is not managed by libvirt. " - "Remove it manually.\n"), target, source); + _("Storage volume '%1$s'(%2$s) is not managed by libvirt. Remove it manually.\n"), + target, source); vshResetLibvirtError(); continue; } @@ -3897,8 +3897,8 @@ cmdUndefine(vshControl *ctl, const vshCmd *cmd) for (i = 0; i < nvol_list; i++) { if (vol_list[i]) { vshError(ctl, - _("Volume '%s' was not found in domain's " - "definition.\n"), vol_list[i]); + _("Volume '%1$s' was not found in domain's definition.\n"), + vol_list[i]); found = true; } } @@ -3945,10 +3945,10 @@ cmdUndefine(vshControl *ctl, const vshCmd *cmd) * without support for the newer flags. Oh well. */ if (has_snapshots_metadata) { if (snapshots_metadata) - vshError(ctl, _("Unable to remove metadata of %d snapshots"), + vshError(ctl, _("Unable to remove metadata of %1$d snapshots"), has_snapshots_metadata); else - vshError(ctl, _("Refusing to undefine while %d snapshots exist"), + vshError(ctl, _("Refusing to undefine while %1$d snapshots exist"), has_snapshots_metadata); goto cleanup; @@ -3958,10 +3958,10 @@ cmdUndefine(vshControl *ctl, const vshCmd *cmd) out: if (rc == 0) { - vshPrintExtra(ctl, _("Domain '%s' has been undefined\n"), name); + vshPrintExtra(ctl, _("Domain '%1$s' has been undefined\n"), name); ret = true; } else { - vshError(ctl, _("Failed to undefine domain '%s'"), name); + vshError(ctl, _("Failed to undefine domain '%1$s'"), name); goto cleanup; } @@ -3969,7 +3969,7 @@ cmdUndefine(vshControl *ctl, const vshCmd *cmd) if (nvols) { for (i = 0; i < nvols; i++) { if (wipe_storage) { - vshPrintExtra(ctl, _("Wiping volume '%s'(%s) ... "), + vshPrintExtra(ctl, _("Wiping volume '%1$s'(%2$s) ... "), vols[i].target, vols[i].source); fflush(stdout); if (virStorageVolWipe(vols[i].vol, 0) < 0) { @@ -3983,11 +3983,11 @@ cmdUndefine(vshControl *ctl, const vshCmd *cmd) /* delete the volume */ if (virStorageVolDelete(vols[i].vol, vol_flags) < 0) { - vshError(ctl, _("Failed to remove storage volume '%s'(%s)"), + vshError(ctl, _("Failed to remove storage volume '%1$s'(%2$s)"), vols[i].target, vols[i].source); ret = false; } else { - vshPrintExtra(ctl, _("Volume '%s'(%s) removed.\n"), + vshPrintExtra(ctl, _("Volume '%1$s'(%2$s) removed.\n"), vols[i].target, vols[i].source); } } @@ -4140,12 +4140,12 @@ cmdStart(vshControl *ctl, const vshCmd *cmd) } if (rc < 0) { - vshError(ctl, _("Failed to start domain '%s'"), virDomainGetName(dom)); + vshError(ctl, _("Failed to start domain '%1$s'"), virDomainGetName(dom)); return false; } started: - vshPrintExtra(ctl, _("Domain '%s' started\n"), + vshPrintExtra(ctl, _("Domain '%1$s' started\n"), virDomainGetName(dom)); #ifndef WIN32 if (console && !cmdRunConsole(ctl, dom, NULL, 0)) @@ -4250,7 +4250,7 @@ doSave(void *opaque) } if (rc < 0) { - vshError(ctl, _("Failed to save domain '%s' to %s"), name, to); + vshError(ctl, _("Failed to save domain '%1$s' to %2$s"), name, to); goto out; } @@ -4505,7 +4505,7 @@ cmdSave(vshControl *ctl, const vshCmd *cmd) virThreadJoin(&workerThread); if (!data.ret) - vshPrintExtra(ctl, _("\nDomain '%s' saved to %s\n"), name, to); + vshPrintExtra(ctl, _("\nDomain '%1$s' saved to %2$s\n"), name, to); return !data.ret; } @@ -4632,11 +4632,11 @@ cmdSaveImageDefine(vshControl *ctl, const vshCmd *cmd) return false; if (virDomainSaveImageDefineXML(priv->conn, file, xml, flags) < 0) { - vshError(ctl, _("Failed to update %s"), file); + vshError(ctl, _("Failed to update %1$s"), file); return false; } - vshPrintExtra(ctl, _("State file %s updated.\n"), file); + vshPrintExtra(ctl, _("State file %1$s updated.\n"), file); return true; } @@ -4697,8 +4697,8 @@ cmdSaveImageEdit(vshControl *ctl, const vshCmd *cmd) virDomainSaveImageGetXMLDesc(priv->conn, file, getxml_flags) #define EDIT_NOT_CHANGED \ do { \ - vshPrintExtra(ctl, _("Saved image %s XML configuration " \ - "not changed.\n"), file); \ + vshPrintExtra(ctl, _("Saved image %1$s XML configuration not changed.\n"), \ + file); \ ret = true; \ goto edit_cleanup; \ } while (0) @@ -4706,7 +4706,7 @@ cmdSaveImageEdit(vshControl *ctl, const vshCmd *cmd) (virDomainSaveImageDefineXML(priv->conn, file, doc_edited, define_flags) == 0) #include "virsh-edit.c" - vshPrintExtra(ctl, _("State file %s edited.\n"), file); + vshPrintExtra(ctl, _("State file %1$s edited.\n"), file); ret = true; cleanup: @@ -4779,7 +4779,7 @@ doManagedsave(void *opaque) goto out; if (virDomainManagedSave(dom, flags) < 0) { - vshError(ctl, _("Failed to save domain '%s' state"), name); + vshError(ctl, _("Failed to save domain '%1$s' state"), name); goto out; } @@ -4826,7 +4826,7 @@ cmdManagedSave(vshControl *ctl, const vshCmd *cmd) virThreadJoin(&workerThread); if (!data.ret) - vshPrintExtra(ctl, _("\nDomain '%s' state saved by libvirt\n"), name); + vshPrintExtra(ctl, _("\nDomain '%1$s' state saved by libvirt\n"), name); return !data.ret; } @@ -4866,18 +4866,18 @@ cmdManagedSaveRemove(vshControl *ctl, const vshCmd *cmd) } if (hassave == 0) { - vshPrintExtra(ctl, _("Domain '%s' has no manage save image; removal skipped"), + vshPrintExtra(ctl, _("Domain '%1$s' has no manage save image; removal skipped"), name); return true; } if (virDomainManagedSaveRemove(dom, 0) < 0) { - vshError(ctl, _("Failed to remove managed save image for domain '%s'"), + vshError(ctl, _("Failed to remove managed save image for domain '%1$s'"), name); return false; } - vshPrintExtra(ctl, _("Removed managedsave image for domain '%s'"), name); + vshPrintExtra(ctl, _("Removed managedsave image for domain '%1$s'"), name); return true; } @@ -4930,8 +4930,8 @@ cmdManagedSaveEdit(vshControl *ctl, const vshCmd *cmd) #define EDIT_GET_XML virDomainManagedSaveGetXMLDesc(dom, getxml_flags) #define EDIT_NOT_CHANGED \ do { \ - vshPrintExtra(ctl, _("Managed save image of domain '%s' XML configuration " \ - "not changed.\n"), virDomainGetName(dom)); \ + vshPrintExtra(ctl, _("Managed save image of domain '%1$s' XML configuration not changed.\n"), \ + virDomainGetName(dom)); \ ret = true; \ goto edit_cleanup; \ } while (0) @@ -4939,7 +4939,7 @@ cmdManagedSaveEdit(vshControl *ctl, const vshCmd *cmd) (virDomainManagedSaveDefineXML(dom, doc_edited, define_flags) == 0) #include "virsh-edit.c" - vshPrintExtra(ctl, _("Managed save image of Domain '%s' XML configuration edited.\n"), + vshPrintExtra(ctl, _("Managed save image of Domain '%1$s' XML configuration edited.\n"), virDomainGetName(dom)); ret = true; @@ -5060,12 +5060,12 @@ cmdManagedSaveDefine(vshControl *ctl, const vshCmd *cmd) return false; if (virDomainManagedSaveDefineXML(dom, xml, flags) < 0) { - vshError(ctl, _("Failed to update %s XML configuration"), + vshError(ctl, _("Failed to update %1$s XML configuration"), virDomainGetName(dom)); return false; } - vshPrintExtra(ctl, _("Managed save state file of domain '%s' updated.\n"), + vshPrintExtra(ctl, _("Managed save state file of domain '%1$s' updated.\n"), virDomainGetName(dom)); return true; } @@ -5131,7 +5131,7 @@ cmdSchedInfoUpdateOne(vshControl *ctl, return 0; } - vshError(ctl, _("invalid scheduler option: %s"), field); + vshError(ctl, _("invalid scheduler option: %1$s"), field); return -1; } @@ -5370,11 +5370,11 @@ cmdRestore(vshControl *ctl, const vshCmd *cmd) } if (rc < 0) { - vshError(ctl, _("Failed to restore domain from %s"), from); + vshError(ctl, _("Failed to restore domain from %1$s"), from); return false; } - vshPrintExtra(ctl, _("Domain restored from %s\n"), from); + vshPrintExtra(ctl, _("Domain restored from %1$s\n"), from); return true; } @@ -5482,9 +5482,8 @@ doDump(void *opaque) if (vshCommandOptStringQuiet(ctl, cmd, "format", &format) > 0) { if ((dumpformat = virshDomainCoreDumpFormatTypeFromString(format)) < 0) { - vshError(ctl, _("format '%s' is not supported, expecting " - "'kdump-zlib', 'kdump-lzo', 'kdump-snappy', " - "'win-dmp' or 'elf'"), format); + vshError(ctl, _("format '%1$s' is not supported, expecting 'kdump-zlib', 'kdump-lzo', 'kdump-snappy', 'win-dmp' or 'elf'"), + format); goto out; } } @@ -5492,12 +5491,12 @@ doDump(void *opaque) if (dumpformat != VIR_DOMAIN_CORE_DUMP_FORMAT_RAW) { if (virDomainCoreDumpWithFormat(dom, to, dumpformat, flags) < 0) { - vshError(ctl, _("Failed to core dump domain '%s' to %s"), name, to); + vshError(ctl, _("Failed to core dump domain '%1$s' to %2$s"), name, to); goto out; } } else { if (virDomainCoreDump(dom, to, flags) < 0) { - vshError(ctl, _("Failed to core dump domain '%s' to %s"), name, to); + vshError(ctl, _("Failed to core dump domain '%1$s' to %2$s"), name, to); goto out; } } @@ -5551,7 +5550,7 @@ cmdDump(vshControl *ctl, const vshCmd *cmd) if (data.ret) return false; - vshPrintExtra(ctl, _("\nDomain '%s' dumped to %s\n"), name, to); + vshPrintExtra(ctl, _("\nDomain '%1$s' dumped to %2$s\n"), name, to); return true; } @@ -5639,7 +5638,7 @@ cmdScreenshot(vshControl *ctl, const vshCmd *cmd) mime = virDomainScreenshot(dom, st, screen, flags); if (!mime) { - vshError(ctl, _("could not take a screenshot of %s"), name); + vshError(ctl, _("could not take a screenshot of %1$s"), name); goto cleanup; } @@ -5652,7 +5651,7 @@ cmdScreenshot(vshControl *ctl, const vshCmd *cmd) if ((fd = open(file, O_WRONLY|O_CREAT|O_EXCL, 0666)) < 0) { if (errno != EEXIST || (fd = open(file, O_WRONLY|O_TRUNC, 0666)) < 0) { - vshError(ctl, _("cannot create file %s"), file); + vshError(ctl, _("cannot create file %1$s"), file); goto cleanup; } } else { @@ -5663,21 +5662,21 @@ cmdScreenshot(vshControl *ctl, const vshCmd *cmd) cbdata.fd = fd; if (virStreamRecvAll(st, virshStreamSink, &cbdata) < 0) { - vshError(ctl, _("could not receive data from domain '%s'"), name); + vshError(ctl, _("could not receive data from domain '%1$s'"), name); goto cleanup; } if (VIR_CLOSE(fd) < 0) { - vshError(ctl, _("cannot close file %s"), file); + vshError(ctl, _("cannot close file %1$s"), file); goto cleanup; } if (virStreamFinish(st) < 0) { - vshError(ctl, _("cannot close stream on domain '%s'"), name); + vshError(ctl, _("cannot close stream on domain '%1$s'"), name); goto cleanup; } - vshPrintExtra(ctl, _("Screenshot saved to %s, with type of %s"), file, mime); + vshPrintExtra(ctl, _("Screenshot saved to %1$s, with type of %2$s"), file, mime); ret = true; cleanup: @@ -5764,13 +5763,13 @@ cmdSetLifecycleAction(vshControl *ctl, const vshCmd *cmd) } if ((tmpVal = virshDomainLifecycleTypeFromString(typeStr)) < 0) { - vshError(ctl, _("Invalid lifecycle type '%s'."), typeStr); + vshError(ctl, _("Invalid lifecycle type '%1$s'."), typeStr); return false; } type = tmpVal; if ((tmpVal = virshDomainLifecycleActionTypeFromString(actionStr)) < 0) { - vshError(ctl, _("Invalid lifecycle action '%s'."), actionStr); + vshError(ctl, _("Invalid lifecycle action '%1$s'."), actionStr); return false; } action = tmpVal; @@ -5842,7 +5841,7 @@ cmdSetUserPassword(vshControl *ctl, const vshCmd *cmd) if (virDomainSetUserPassword(dom, user, password, flags) < 0) return false; - vshPrintExtra(ctl, _("Password set successfully for %s in %s"), user, name); + vshPrintExtra(ctl, _("Password set successfully for %1$s in %2$s"), user, name); return true; } /* @@ -5873,11 +5872,11 @@ cmdResume(vshControl *ctl, const vshCmd *cmd) return false; if (virDomainResume(dom) != 0) { - vshError(ctl, _("Failed to resume domain '%s'"), name); + vshError(ctl, _("Failed to resume domain '%1$s'"), name); return false; } - vshPrintExtra(ctl, _("Domain '%s' resumed\n"), name); + vshPrintExtra(ctl, _("Domain '%1$s' resumed\n"), name); return true; } @@ -5937,9 +5936,8 @@ cmdShutdown(vshControl *ctl, const vshCmd *cmd) } else if (STREQ(mode, "paravirt")) { flags |= VIR_DOMAIN_SHUTDOWN_PARAVIRT; } else { - vshError(ctl, _("Unknown mode %s value, expecting " - "'acpi', 'agent', 'initctl', 'signal', " - "or 'paravirt'"), mode); + vshError(ctl, _("Unknown mode %1$s value, expecting 'acpi', 'agent', 'initctl', 'signal', or 'paravirt'"), + mode); return false; } tmp++; @@ -5954,11 +5952,11 @@ cmdShutdown(vshControl *ctl, const vshCmd *cmd) rv = virDomainShutdown(dom); if (rv != 0) { - vshError(ctl, _("Failed to shutdown domain '%s'"), name); + vshError(ctl, _("Failed to shutdown domain '%1$s'"), name); return false; } - vshPrintExtra(ctl, _("Domain '%s' is being shutdown\n"), name); + vshPrintExtra(ctl, _("Domain '%1$s' is being shutdown\n"), name); return true; } @@ -6017,9 +6015,8 @@ cmdReboot(vshControl *ctl, const vshCmd *cmd) } else if (STREQ(mode, "paravirt")) { flags |= VIR_DOMAIN_REBOOT_PARAVIRT; } else { - vshError(ctl, _("Unknown mode %s value, expecting " - "'acpi', 'agent', 'initctl', 'signal' " - "or 'paravirt'"), mode); + vshError(ctl, _("Unknown mode %1$s value, expecting 'acpi', 'agent', 'initctl', 'signal' or 'paravirt'"), + mode); return false; } tmp++; @@ -6029,11 +6026,11 @@ cmdReboot(vshControl *ctl, const vshCmd *cmd) return false; if (virDomainReboot(dom, flags) != 0) { - vshError(ctl, _("Failed to reboot domain '%s'"), name); + vshError(ctl, _("Failed to reboot domain '%1$s'"), name); return false; } - vshPrintExtra(ctl, _("Domain '%s' is being rebooted\n"), name); + vshPrintExtra(ctl, _("Domain '%1$s' is being rebooted\n"), name); return true; } @@ -6065,11 +6062,11 @@ cmdReset(vshControl *ctl, const vshCmd *cmd) return false; if (virDomainReset(dom, 0) != 0) { - vshError(ctl, _("Failed to reset domain '%s'"), name); + vshError(ctl, _("Failed to reset domain '%1$s'"), name); return false; } - vshPrintExtra(ctl, _("Domain '%s' was reset\n"), name); + vshPrintExtra(ctl, _("Domain '%1$s' was reset\n"), name); return true; } @@ -6762,7 +6759,7 @@ virshVcpuinfoPrintAffinity(vshControl *ctl, if (pretty) { if (!(str = virBitmapDataFormat(cpumap, VIR_CPU_MAPLEN(maxcpu)))) return -1; - vshPrint(ctl, _("%s (out of %d)"), str, maxcpu); + vshPrint(ctl, _("%1$s (out of %2$d)"), str, maxcpu); } else { for (i = 0; i < maxcpu; i++) { if (VIR_CPU_USED(cpumap, i)) @@ -7026,11 +7023,11 @@ virshVcpuPinQuery(vshControl *ctl, (!(flags & VIR_DOMAIN_AFFECT_CONFIG) && virDomainIsActive(dom) == 1)) vshError(ctl, - _("vcpu %d is out of range of live cpu count %d"), + _("vcpu %1$d is out of range of live cpu count %2$d"), vcpu, ncpus); else vshError(ctl, - _("vcpu %d is out of range of persistent cpu count %d"), + _("vcpu %1$d is out of range of persistent cpu count %2$d"), vcpu, ncpus); return false; } @@ -7081,12 +7078,12 @@ virshParseCPUList(vshControl *ctl, int *cpumaplen, if (virBitmapParse(cpulist, &map, 1024) < 0 || virBitmapIsAllClear(map)) { - vshError(ctl, _("Invalid cpulist '%s'"), cpulist); + vshError(ctl, _("Invalid cpulist '%1$s'"), cpulist); return NULL; } lastcpu = virBitmapLastSetBit(map); if (lastcpu >= maxcpu) { - vshError(ctl, _("CPU %d in cpulist '%s' exceed the maxcpu %d"), + vshError(ctl, _("CPU %1$d in cpulist '%2$s' exceed the maxcpu %3$d"), lastcpu, cpulist, maxcpu); return NULL; } @@ -7786,7 +7783,7 @@ cmdIOThreadAdd(vshControl *ctl, const vshCmd *cmd) if (vshCommandOptInt(ctl, cmd, "id", &iothread_id) < 0) return false; if (iothread_id <= 0) { - vshError(ctl, _("Invalid IOThread id value: '%d'"), iothread_id); + vshError(ctl, _("Invalid IOThread id value: '%1$d'"), iothread_id); return false; } @@ -7876,7 +7873,7 @@ cmdIOThreadSet(vshControl *ctl, const vshCmd *cmd) if (vshCommandOptInt(ctl, cmd, "id", &id) < 0) goto cleanup; if (id <= 0) { - vshError(ctl, _("Invalid IOThread id value: '%d'"), id); + vshError(ctl, _("Invalid IOThread id value: '%1$d'"), id); goto cleanup; } @@ -7986,7 +7983,7 @@ cmdIOThreadDel(vshControl *ctl, const vshCmd *cmd) if (vshCommandOptInt(ctl, cmd, "id", &iothread_id) < 0) return false; if (iothread_id <= 0) { - vshError(ctl, _("Invalid IOThread id value: '%d'"), iothread_id); + vshError(ctl, _("Invalid IOThread id value: '%1$d'"), iothread_id); return false; } @@ -8102,7 +8099,7 @@ cmdCPUStats(vshControl *ctl, const vshCmd *cmd) if (show_count < 0 || show_count > max_id) { if (show_count > max_id) - vshPrint(ctl, _("Only %d CPUs available to show\n"), max_id); + vshPrint(ctl, _("Only %1$d CPUs available to show\n"), max_id); show_count = max_id - cpu; } @@ -8172,7 +8169,7 @@ cmdCPUStats(vshControl *ctl, const vshCmd *cmd) return ret; failed_stats: - vshError(ctl, _("Failed to retrieve CPU statistics for domain '%s'"), + vshError(ctl, _("Failed to retrieve CPU statistics for domain '%1$s'"), virDomainGetName(dom)); goto cleanup; } @@ -8260,11 +8257,11 @@ cmdCreate(vshControl *ctl, const vshCmd *cmd) dom = virDomainCreateXML(priv->conn, buffer, flags); if (!dom) { - vshError(ctl, _("Failed to create domain from %s"), from); + vshError(ctl, _("Failed to create domain from %1$s"), from); return false; } - vshPrintExtra(ctl, _("Domain '%s' created from %s\n"), + vshPrintExtra(ctl, _("Domain '%1$s' created from %2$s\n"), virDomainGetName(dom), from); #ifndef WIN32 if (console) @@ -8319,11 +8316,11 @@ cmdDefine(vshControl *ctl, const vshCmd *cmd) dom = virDomainDefineXML(priv->conn, buffer); if (!dom) { - vshError(ctl, _("Failed to define domain from %s"), from); + vshError(ctl, _("Failed to define domain from %1$s"), from); return false; } - vshPrintExtra(ctl, _("Domain '%s' defined from %s\n"), + vshPrintExtra(ctl, _("Domain '%1$s' defined from %2$s\n"), virDomainGetName(dom), from); return true; } @@ -8376,11 +8373,11 @@ cmdDestroy(vshControl *ctl, const vshCmd *cmd) result = virDomainDestroy(dom); if (result < 0) { - vshError(ctl, _("Failed to destroy domain '%s'"), name); + vshError(ctl, _("Failed to destroy domain '%1$s'"), name); return false; } - vshPrintExtra(ctl, _("Domain '%s' destroyed\n"), name); + vshPrintExtra(ctl, _("Domain '%1$s' destroyed\n"), name); return true; } @@ -8538,9 +8535,9 @@ cmdDesc(vshControl *ctl, const vshCmd *cmd) vshPrint(ctl, "%s", desc); } else { if (title) - vshPrintExtra(ctl, _("No title for domain: %s"), virDomainGetName(dom)); + vshPrintExtra(ctl, _("No title for domain: %1$s"), virDomainGetName(dom)); else - vshPrintExtra(ctl, _("No description for domain: %s"), virDomainGetName(dom)); + vshPrintExtra(ctl, _("No description for domain: %1$s"), virDomainGetName(dom)); } } @@ -8795,7 +8792,7 @@ cmdSendKey(vshControl *ctl, const vshCmd *cmd) codeset = virKeycodeSetTypeFromString(codeset_option); if (codeset < 0) { - vshError(ctl, _("unknown codeset: '%s'"), codeset_option); + vshError(ctl, _("unknown codeset: '%1$s'"), codeset_option); return false; } @@ -8807,7 +8804,7 @@ cmdSendKey(vshControl *ctl, const vshCmd *cmd) if ((keycode = virshKeyCodeGetInt(opt->data)) < 0) { if ((keycode = virKeycodeValueFromString(codeset, opt->data)) < 0) { - vshError(ctl, _("invalid keycode: '%s'"), opt->data); + vshError(ctl, _("invalid keycode: '%1$s'"), opt->data); return false; } } @@ -8907,7 +8904,7 @@ cmdSendProcessSignal(vshControl *ctl, const vshCmd *cmd) return false; if ((signum = getSignalNumber(signame)) < 0) { - vshError(ctl, _("malformed signal name: %s"), signame); + vshError(ctl, _("malformed signal name: %1$s"), signame); return false; } @@ -9327,7 +9324,7 @@ cmdMemtune(vshControl *ctl, const vshCmd *cmd) #define PARSE_MEMTUNE_PARAM(NAME, FIELD) \ if ((rc = virshMemtuneGetSize(ctl, cmd, NAME, &tmpVal)) < 0) { \ - vshError(ctl, _("Unable to parse integer parameter %s"), NAME); \ + vshError(ctl, _("Unable to parse integer parameter %1$s"), NAME); \ goto cleanup; \ } \ if (rc == 1) { \ @@ -9603,7 +9600,7 @@ cmdNumatune(vshControl * ctl, const vshCmd * cmd) */ if ((m = virDomainNumatuneMemModeTypeFromString(mode)) < 0 && virStrToLong_i(mode, NULL, 0, &m) < 0) { - vshError(ctl, _("Invalid mode: %s"), mode); + vshError(ctl, _("Invalid mode: %1$s"), mode); goto cleanup; } @@ -9992,7 +9989,7 @@ cmdQemuMonitorCommandQMPWrap(vshControl *ctl, virBufferAddLit(&buf, "}"); if (!(arguments = virJSONValueFromString(virBufferCurrentContent(&buf)))) { - vshError(ctl, _("failed to wrap arguments '%s' into a QMP command wrapper"), + vshError(ctl, _("failed to wrap arguments '%1$s' into a QMP command wrapper"), fullargs); return NULL; } @@ -10232,7 +10229,7 @@ cmdQemuMonitorEvent(vshControl *ctl, const vshCmd *cmd) default: goto cleanup; } - vshPrint(ctl, _("events received: %d\n"), data.count); + vshPrint(ctl, _("events received: %1$d\n"), data.count); if (data.count) ret = true; @@ -10280,11 +10277,11 @@ cmdQemuAttach(vshControl *ctl, const vshCmd *cmd) return false; if (!(dom = virDomainQemuAttach(priv->conn, pid_value, flags))) { - vshError(ctl, _("Failed to attach to pid %u"), pid_value); + vshError(ctl, _("Failed to attach to pid %1$u"), pid_value); return false; } - vshPrintExtra(ctl, _("Domain '%s' attached to pid %u\n"), + vshPrintExtra(ctl, _("Domain '%1$s' attached to pid %2$u\n"), virDomainGetName(dom), pid_value); return true; } @@ -11247,7 +11244,7 @@ doMigrate(void *opaque) g_autofree char *xml = NULL; if (virFileReadAll(opt, VSH_MAX_XML_FILE, &xml) < 0) { - vshError(ctl, _("cannot read file '%s'"), opt); + vshError(ctl, _("cannot read file '%1$s'"), opt); goto save_error; } @@ -11263,7 +11260,7 @@ doMigrate(void *opaque) g_autofree char *xml = NULL; if (virFileReadAll(opt, VSH_MAX_XML_FILE, &xml) < 0) { - vshError(ctl, _("cannot read file '%s'"), opt); + vshError(ctl, _("cannot read file '%1$s'"), opt); goto save_error; } @@ -11697,7 +11694,7 @@ cmdMigrateCompCache(vshControl *ctl, const vshCmd *cmd) return false; value = vshPrettyCapacity(size, &unit); - vshPrint(ctl, _("Compression cache: %.3lf %s"), value, unit); + vshPrint(ctl, _("Compression cache: %1$.3lf %2$s"), value, unit); return true; } @@ -11874,7 +11871,7 @@ virshGetDBusDisplay(vshControl *ctl, xmlXPathContext *ctxt) return g_strdup_printf("dbus+unix://%s", addr + 10); } - vshError(ctl, _("'%s' D-Bus address is not handled"), addr); + vshError(ctl, _("'%1$s' D-Bus address is not handled"), addr); return NULL; } @@ -12073,7 +12070,7 @@ cmdDomDisplay(vshControl *ctl, const vshCmd *cmd) if (!ret) { if (type) - vshError(ctl, _("No graphical display with type '%s' found"), type); + vshError(ctl, _("No graphical display with type '%1$s' found"), type); else vshError(ctl, _("No graphical display found")); } @@ -12230,7 +12227,7 @@ cmdDomHostname(vshControl *ctl, const vshCmd *cmd) int source = virshDomainHostnameSourceTypeFromString(sourcestr); if (source < 0) { - vshError(ctl, _("Unknown data source '%s'"), sourcestr); + vshError(ctl, _("Unknown data source '%1$s'"), sourcestr); return false; } @@ -12323,7 +12320,7 @@ cmdDetachDevice(vshControl *ctl, const vshCmd *cmd) ret = virDomainDetachDevice(dom, buffer); if (ret < 0) { - vshError(ctl, _("Failed to detach device from %s"), from); + vshError(ctl, _("Failed to detach device from %1$s"), from); return false; } @@ -12384,7 +12381,7 @@ cmdDetachDeviceAlias(vshControl *ctl, const vshCmd *cmd) return false; if (virDomainDetachDeviceAlias(dom, alias, flags) < 0) { - vshError(ctl, _("Failed to detach device with alias %s"), alias); + vshError(ctl, _("Failed to detach device with alias %1$s"), alias); return false; } @@ -12461,7 +12458,7 @@ cmdUpdateDevice(vshControl *ctl, const vshCmd *cmd) flags |= VIR_DOMAIN_DEVICE_MODIFY_FORCE; if (virDomainUpdateDeviceFlags(dom, buffer, flags) < 0) { - vshError(ctl, _("Failed to update device from %s"), from); + vshError(ctl, _("Failed to update device from %1$s"), from); return false; } @@ -12532,7 +12529,7 @@ virshDomainDetachInterface(char *doc, } if ((nnodes = virXPathNodeSet(xpath, ctxt, &nodes)) <= 0) { - vshError(ctl, _("No interface found whose type is %s"), type); + vshError(ctl, _("No interface found whose type is %1$s"), type); return false; } @@ -12547,9 +12544,8 @@ virshDomainDetachInterface(char *doc, if (virMacAddrCompare(tmp_mac, mac) == 0) { if (matchNode) { /* this is the 2nd match, so it's ambiguous */ - vshError(ctl, _("Domain has multiple interfaces matching " - "MAC address %s. You must use detach-device and " - "specify the device pci address to remove it."), + vshError(ctl, _("Domain has multiple interfaces matching MAC address %1$s. " + "You must use detach-device and specify the device pci address to remove it."), mac); return false; } @@ -12560,7 +12556,7 @@ virshDomainDetachInterface(char *doc, } } else { if (nnodes > 1) { - vshError(ctl, _("Domain has %zd interfaces. Please specify which one to detach using --mac"), + vshError(ctl, _("Domain has %1$zd interfaces. Please specify which one to detach using --mac"), nnodes); return false; } @@ -12569,7 +12565,7 @@ virshDomainDetachInterface(char *doc, } if (!matchNode) { - vshError(ctl, _("No interface with MAC address %s was found"), mac); + vshError(ctl, _("No interface with MAC address %1$s was found"), mac); return false; } @@ -12750,7 +12746,7 @@ virshFindDisk(const char *doc, } } - vshError(NULL, _("No disk found whose source path or target is %s"), path); + vshError(NULL, _("No disk found whose source path or target is %1$s"), path); return NULL; } @@ -12789,7 +12785,7 @@ virshUpdateDiskXML(xmlNodePtr disk_node, if (!(STREQ_NULLABLE(device_type, "cdrom") || STREQ_NULLABLE(device_type, "floppy"))) { - vshError(NULL, _("The disk device '%s' is not removable"), target); + vshError(NULL, _("The disk device '%1$s' is not removable"), target); return NULL; } @@ -12823,7 +12819,7 @@ virshUpdateDiskXML(xmlNodePtr disk_node, if (type == VIRSH_UPDATE_DISK_XML_EJECT) { if (!source) { - vshError(NULL, _("The disk device '%s' doesn't have media"), target); + vshError(NULL, _("The disk device '%1$s' doesn't have media"), target); return NULL; } @@ -12843,7 +12839,7 @@ virshUpdateDiskXML(xmlNodePtr disk_node, source_path = virXMLPropString(source, "name"); if (source_path && type == VIRSH_UPDATE_DISK_XML_INSERT) { - vshError(NULL, _("The disk device '%s' already has media"), target); + vshError(NULL, _("The disk device '%1$s' already has media"), target); return NULL; } @@ -13042,7 +13038,7 @@ cmdEdit(vshControl *ctl, const vshCmd *cmd) #define EDIT_GET_XML virDomainGetXMLDesc(dom, query_flags) #define EDIT_NOT_CHANGED \ do { \ - vshPrintExtra(ctl, _("Domain '%s' XML configuration not changed.\n"), \ + vshPrintExtra(ctl, _("Domain '%1$s' XML configuration not changed.\n"), \ virDomainGetName(dom)); \ ret = true; \ goto edit_cleanup; \ @@ -13057,7 +13053,7 @@ cmdEdit(vshControl *ctl, const vshCmd *cmd) #include "virsh-edit.c" #undef EDIT_RELAX - vshPrintExtra(ctl, _("Domain '%s' XML configuration edited.\n"), + vshPrintExtra(ctl, _("Domain '%1$s' XML configuration edited.\n"), virDomainGetName(dom_edited)); ret = true; @@ -13217,7 +13213,7 @@ cmdChangeMedia(vshControl *ctl, const vshCmd *cmd) } if (virDomainUpdateDeviceFlags(dom, disk_xml, flags) != 0) { - vshError(ctl, _("Failed to complete action %s on media"), action); + vshError(ctl, _("Failed to complete action %1$s on media"), action); return false; } @@ -13315,7 +13311,7 @@ cmdDomFSFreeze(vshControl *ctl, const vshCmd *cmd) return false; } - vshPrintExtra(ctl, _("Froze %d filesystem(s)\n"), count); + vshPrintExtra(ctl, _("Froze %1$d filesystem(s)\n"), count); return true; } @@ -13360,7 +13356,7 @@ cmdDomFSThaw(vshControl *ctl, const vshCmd *cmd) return false; } - vshPrintExtra(ctl, _("Thawed %d filesystem(s)\n"), count); + vshPrintExtra(ctl, _("Thawed %1$d filesystem(s)\n"), count); return true; } @@ -13712,7 +13708,7 @@ cmdSetUserSSHKeys(vshControl *ctl, const vshCmd *cmd) nkeys = g_strv_length(keys); if (nkeys == 0) { - vshError(ctl, _("File %s contains no keys"), from); + vshError(ctl, _("File %1$s contains no keys"), from); return false; } } @@ -13785,7 +13781,7 @@ cmdDomDirtyRateCalc(vshControl *ctl, const vshCmd *cmd) int mode = virshDomainDirtyRateCalcModeTypeFromString(modestr); if (mode < 0) { - vshError(ctl, _("Unknown calculation mode '%s'"), modestr); + vshError(ctl, _("Unknown calculation mode '%1$s'"), modestr); return false; } diff --git a/tools/virsh-edit.c b/tools/virsh-edit.c index 5dc1a1fe5a..990dd97516 100644 --- a/tools/virsh-edit.c +++ b/tools/virsh-edit.c @@ -25,7 +25,7 @@ * EDIT_NOT_CHANGED - this action is taken if the XML wasn't changed. * Note, that you don't want to jump to cleanup but edit_cleanup label * where temporary variables are free()-d and temporary file is deleted: - * #define EDIT_NOT_CHANGED vshPrintExtra (ctl, _("Domain %s XML not changed"), \ + * #define EDIT_NOT_CHANGED vshPrintExtra (ctl, _("Domain %1$s XML not changed"), \ * virDomainGetName(dom)); \ * ret = true; goto edit_cleanup; * Note that this is a statement. diff --git a/tools/virsh-host.c b/tools/virsh-host.c index 21d479fd01..4df599afdf 100644 --- a/tools/virsh-host.c +++ b/tools/virsh-host.c @@ -219,8 +219,8 @@ cmdFreecell(vshControl *ctl, const vshCmd *cmd) nodes_id[i] = id; if (virNodeGetCellsFreeMemory(priv->conn, &(nodes_free[i]), id, 1) != 1) { - vshError(ctl, _("failed to get free memory for NUMA node " - "number: %lu"), id); + vshError(ctl, _("failed to get free memory for NUMA node number: %1$lu"), + id); return false; } } @@ -337,7 +337,7 @@ cmdFreepages(vshControl *ctl, const vshCmd *cmd) g_autofree char *val = virXMLPropString(nodes[i], "size"); if (virStrToLong_uip(val, NULL, 10, &pagesize[i]) < 0) { - vshError(ctl, _("unable to parse page size: %s"), val); + vshError(ctl, _("unable to parse page size: %1$s"), val); goto cleanup; } } @@ -374,7 +374,7 @@ cmdFreepages(vshControl *ctl, const vshCmd *cmd) g_autofree char *val = virXMLPropString(nodes[i], "id"); if (virStrToLong_i(val, NULL, 10, &cell) < 0) { - vshError(ctl, _("unable to parse numa node id: %s"), val); + vshError(ctl, _("unable to parse numa node id: %1$s"), val); goto cleanup; } @@ -382,7 +382,7 @@ cmdFreepages(vshControl *ctl, const vshCmd *cmd) cell, 1, counts, 0) < 0) goto cleanup; - vshPrint(ctl, _("Node %d:\n"), cell); + vshPrint(ctl, _("Node %1$d:\n"), cell); for (j = 0; j < npages; j++) vshPrint(ctl, "%uKiB: %lld\n", pagesize[j], counts[j]); vshPrint(ctl, "%c", '\n'); @@ -1135,9 +1135,8 @@ vshExtractCPUDefXMLs(vshControl *ctl, return NULL; if (n == 0) { - vshError(ctl, _("File '%s' does not contain any <cpu> element or " - "valid domain XML, host capabilities XML, or " - "domain capabilities XML"), xmlFile); + vshError(ctl, _("File '%1$s' does not contain any <cpu> element or valid domain XML, host capabilities XML, or domain capabilities XML"), + xmlFile); return NULL; } @@ -1219,24 +1218,24 @@ cmdCPUCompare(vshControl *ctl, const vshCmd *cmd) switch (result) { case VIR_CPU_COMPARE_INCOMPATIBLE: - vshPrint(ctl, _("CPU described in %s is incompatible with host CPU\n"), + vshPrint(ctl, _("CPU described in %1$s is incompatible with host CPU\n"), from); return false; break; case VIR_CPU_COMPARE_IDENTICAL: - vshPrint(ctl, _("CPU described in %s is identical to host CPU\n"), + vshPrint(ctl, _("CPU described in %1$s is identical to host CPU\n"), from); break; case VIR_CPU_COMPARE_SUPERSET: - vshPrint(ctl, _("Host CPU is a superset of CPU described in %s\n"), + vshPrint(ctl, _("Host CPU is a superset of CPU described in %1$s\n"), from); break; case VIR_CPU_COMPARE_ERROR: default: - vshError(ctl, _("Failed to compare host CPU with %s"), from); + vshError(ctl, _("Failed to compare host CPU with %1$s"), from); return false; } @@ -1397,7 +1396,7 @@ cmdVersion(vshControl *ctl, const vshCmd *cmd G_GNUC_UNUSED) includeVersion %= 1000000; minor = includeVersion / 1000; rel = includeVersion % 1000; - vshPrint(ctl, _("Compiled against library: libvirt %d.%d.%d\n"), + vshPrint(ctl, _("Compiled against library: libvirt %1$d.%2$d.%3$d\n"), major, minor, rel); if (virGetVersion(&libVersion, hvType, &apiVersion) < 0) { @@ -1408,14 +1407,14 @@ cmdVersion(vshControl *ctl, const vshCmd *cmd G_GNUC_UNUSED) libVersion %= 1000000; minor = libVersion / 1000; rel = libVersion % 1000; - vshPrint(ctl, _("Using library: libvirt %d.%d.%d\n"), + vshPrint(ctl, _("Using library: libvirt %1$d.%2$d.%3$d\n"), major, minor, rel); major = apiVersion / 1000000; apiVersion %= 1000000; minor = apiVersion / 1000; rel = apiVersion % 1000; - vshPrint(ctl, _("Using API: %s %d.%d.%d\n"), hvType, + vshPrint(ctl, _("Using API: %1$s %2$d.%3$d.%4$d\n"), hvType, major, minor, rel); if (virConnectGetVersion(priv->conn, &hvVersion) < 0) { @@ -1424,14 +1423,14 @@ cmdVersion(vshControl *ctl, const vshCmd *cmd G_GNUC_UNUSED) } if (hvVersion == 0) { vshPrint(ctl, - _("Cannot extract running %s hypervisor version\n"), hvType); + _("Cannot extract running %1$s hypervisor version\n"), hvType); } else { major = hvVersion / 1000000; hvVersion %= 1000000; minor = hvVersion / 1000; rel = hvVersion % 1000; - vshPrint(ctl, _("Running hypervisor: %s %d.%d.%d\n"), + vshPrint(ctl, _("Running hypervisor: %1$s %2$d.%3$d.%4$d\n"), hvType, major, minor, rel); } @@ -1443,7 +1442,7 @@ cmdVersion(vshControl *ctl, const vshCmd *cmd G_GNUC_UNUSED) daemonVersion %= 1000000; minor = daemonVersion / 1000; rel = daemonVersion % 1000; - vshPrint(ctl, _("Running against daemon: %d.%d.%d\n"), + vshPrint(ctl, _("Running against daemon: %1$d.%2$d.%3$d\n"), major, minor, rel); } } @@ -1644,29 +1643,26 @@ cmdHypervisorCPUCompare(vshControl *ctl, switch (result) { case VIR_CPU_COMPARE_INCOMPATIBLE: vshPrint(ctl, - _("CPU described in %s is incompatible with the CPU provided " - "by hypervisor on the host\n"), + _("CPU described in %1$s is incompatible with the CPU provided by hypervisor on the host\n"), from); return false; break; case VIR_CPU_COMPARE_IDENTICAL: vshPrint(ctl, - _("CPU described in %s is identical to the CPU provided by " - "hypervisor on the host\n"), + _("CPU described in %1$s is identical to the CPU provided by hypervisor on the host\n"), from); break; case VIR_CPU_COMPARE_SUPERSET: vshPrint(ctl, - _("The CPU provided by hypervisor on the host is a superset " - "of CPU described in %s\n"), + _("The CPU provided by hypervisor on the host is a superset of CPU described in %1$s\n"), from); break; case VIR_CPU_COMPARE_ERROR: default: - vshError(ctl, _("Failed to compare hypervisor CPU with %s"), from); + vshError(ctl, _("Failed to compare hypervisor CPU with %1$s"), from); return false; } diff --git a/tools/virsh-interface.c b/tools/virsh-interface.c index 39ea53ec9d..77c0fff847 100644 --- a/tools/virsh-interface.c +++ b/tools/virsh-interface.c @@ -83,7 +83,7 @@ virshCommandOptInterfaceBy(vshControl *ctl, const vshCmd *cmd, } if (!iface) - vshError(ctl, _("failed to get interface '%s'"), n); + vshError(ctl, _("failed to get interface '%1$s'"), n); return iface; } @@ -122,7 +122,7 @@ cmdInterfaceEdit(vshControl *ctl, const vshCmd *cmd) #define EDIT_GET_XML virInterfaceGetXMLDesc(iface, flags) #define EDIT_NOT_CHANGED \ do { \ - vshPrintExtra(ctl, _("Interface %s XML configuration not changed.\n"), \ + vshPrintExtra(ctl, _("Interface %1$s XML configuration not changed.\n"), \ virInterfaceGetName(iface)); \ ret = true; \ goto edit_cleanup; \ @@ -131,7 +131,7 @@ cmdInterfaceEdit(vshControl *ctl, const vshCmd *cmd) (iface_edited = virInterfaceDefineXML(priv->conn, doc_edited, 0)) #include "virsh-edit.c" - vshPrintExtra(ctl, _("Interface %s XML configuration edited.\n"), + vshPrintExtra(ctl, _("Interface %1$s XML configuration edited.\n"), virInterfaceGetName(iface_edited)); ret = true; @@ -550,11 +550,11 @@ cmdInterfaceDefine(vshControl *ctl, const vshCmd *cmd) return false; if (!(iface = virInterfaceDefineXML(priv->conn, buffer, flags))) { - vshError(ctl, _("Failed to define interface from %s"), from); + vshError(ctl, _("Failed to define interface from %1$s"), from); return false; } - vshPrintExtra(ctl, _("Interface %s defined from %s\n"), + vshPrintExtra(ctl, _("Interface %1$s defined from %2$s\n"), virInterfaceGetName(iface), from); return true; } @@ -587,11 +587,11 @@ cmdInterfaceUndefine(vshControl *ctl, const vshCmd *cmd) return false; if (virInterfaceUndefine(iface) < 0) { - vshError(ctl, _("Failed to undefine interface %s"), name); + vshError(ctl, _("Failed to undefine interface %1$s"), name); return false; } - vshPrintExtra(ctl, _("Interface %s undefined\n"), name); + vshPrintExtra(ctl, _("Interface %1$s undefined\n"), name); return true; } @@ -623,11 +623,11 @@ cmdInterfaceStart(vshControl *ctl, const vshCmd *cmd) return false; if (virInterfaceCreate(iface, 0) < 0) { - vshError(ctl, _("Failed to start interface %s"), name); + vshError(ctl, _("Failed to start interface %1$s"), name); return false; } - vshPrintExtra(ctl, _("Interface %s started\n"), name); + vshPrintExtra(ctl, _("Interface %1$s started\n"), name); return true; } @@ -659,11 +659,11 @@ cmdInterfaceDestroy(vshControl *ctl, const vshCmd *cmd) return false; if (virInterfaceDestroy(iface, 0) < 0) { - vshError(ctl, _("Failed to destroy interface %s"), name); + vshError(ctl, _("Failed to destroy interface %1$s"), name); return false; } - vshPrintExtra(ctl, _("Interface %s destroyed\n"), name); + vshPrintExtra(ctl, _("Interface %1$s destroyed\n"), name); return false; } @@ -832,7 +832,7 @@ cmdInterfaceBridge(vshControl *ctl, const vshCmd *cmd) /* make sure "new" device doesn't already exist */ if ((br_handle = virInterfaceLookupByName(priv->conn, br_name))) { - vshError(ctl, _("Network device %s already exists"), br_name); + vshError(ctl, _("Network device %1$s already exists"), br_name); goto cleanup; } @@ -849,26 +849,26 @@ cmdInterfaceBridge(vshControl *ctl, const vshCmd *cmd) goto cleanup; if (!(xml_doc = virXMLParseStringCtxt(if_xml, _("(interface definition)"), &ctxt))) { - vshError(ctl, _("Failed to parse configuration of %s"), if_name); + vshError(ctl, _("Failed to parse configuration of %1$s"), if_name); goto cleanup; } top_node = ctxt->node; /* Verify that the original device isn't already a bridge. */ if (!(if_type = virXMLPropString(top_node, "type"))) { - vshError(ctl, _("Existing device %s has no type"), if_name); + vshError(ctl, _("Existing device %1$s has no type"), if_name); goto cleanup; } if (STREQ(if_type, "bridge")) { - vshError(ctl, _("Existing device %s is already a bridge"), if_name); + vshError(ctl, _("Existing device %1$s is already a bridge"), if_name); goto cleanup; } /* verify the name in the XML matches the device name */ if (!(if2_name = virXMLPropString(top_node, "name")) || STRNEQ(if2_name, if_name)) { - vshError(ctl, _("Interface name from config %s doesn't match given supplied name %s"), + vshError(ctl, _("Interface name from config %1$s doesn't match given supplied name %2$s"), if2_name, if_name); goto cleanup; } @@ -890,7 +890,7 @@ cmdInterfaceBridge(vshControl *ctl, const vshCmd *cmd) if (stp) { delay_str = g_strdup_printf("%d", delay); if (!xmlSetProp(br_node, BAD_CAST "delay", BAD_CAST delay_str)) { - vshError(ctl, _("Failed to set bridge delay %d in xml document"), delay); + vshError(ctl, _("Failed to set bridge delay %1$d in xml document"), delay); goto cleanup; } } @@ -904,7 +904,7 @@ cmdInterfaceBridge(vshControl *ctl, const vshCmd *cmd) } if (!xmlSetProp(top_node, BAD_CAST "name", BAD_CAST br_name)) { - vshError(ctl, _("Failed to set master bridge interface name to '%s' in xml document"), + vshError(ctl, _("Failed to set master bridge interface name to '%1$s' in xml document"), br_name); goto cleanup; } @@ -921,13 +921,13 @@ cmdInterfaceBridge(vshControl *ctl, const vshCmd *cmd) * if_type, and the name to the original if_name. */ if (!xmlSetProp(if_node, BAD_CAST "type", BAD_CAST if_type)) { - vshError(ctl, _("Failed to set new attached interface type to '%s' in xml document"), + vshError(ctl, _("Failed to set new attached interface type to '%1$s' in xml document"), if_type); goto cleanup; } if (!xmlSetProp(if_node, BAD_CAST "name", BAD_CAST if_name)) { - vshError(ctl, _("Failed to set new attached interface name to '%s' in xml document"), + vshError(ctl, _("Failed to set new attached interface name to '%1$s' in xml document"), if_name); goto cleanup; } @@ -947,7 +947,7 @@ cmdInterfaceBridge(vshControl *ctl, const vshCmd *cmd) virXMLNodeNameEqual(old, "vlan"))) { /* vlan stuff to move down */ xmlUnlinkNode(old); if (!xmlAddChild(if_node, old)) { - vshError(ctl, _("Failed to move '%s' element in xml document"), old->name); + vshError(ctl, _("Failed to move '%1$s' element in xml document"), old->name); xmlFreeNode(old); goto cleanup; } @@ -958,7 +958,7 @@ cmdInterfaceBridge(vshControl *ctl, const vshCmd *cmd) xmlDocDumpMemory(xml_doc, &br_xml, &br_xml_size); if (!br_xml || br_xml_size <= 0) { - vshError(ctl, _("Failed to format new xml document for bridge %s"), br_name); + vshError(ctl, _("Failed to format new xml document for bridge %1$s"), br_name); goto cleanup; } @@ -967,21 +967,21 @@ cmdInterfaceBridge(vshControl *ctl, const vshCmd *cmd) * independent original interface. */ if (!(br_handle = virInterfaceDefineXML(priv->conn, (char *) br_xml, 0))) { - vshError(ctl, _("Failed to define new bridge interface %s"), + vshError(ctl, _("Failed to define new bridge interface %1$s"), br_name); goto cleanup; } - vshPrintExtra(ctl, _("Created bridge %s with attached device %s\n"), + vshPrintExtra(ctl, _("Created bridge %1$s with attached device %2$s\n"), br_name, if_name); /* start it up unless requested not to */ if (!nostart) { if (virInterfaceCreate(br_handle, 0) < 0) { - vshError(ctl, _("Failed to start bridge interface %s"), br_name); + vshError(ctl, _("Failed to start bridge interface %1$s"), br_name); goto cleanup; } - vshPrintExtra(ctl, _("Bridge interface %s started\n"), br_name); + vshPrintExtra(ctl, _("Bridge interface %1$s started\n"), br_name); } ret = true; @@ -1051,19 +1051,19 @@ cmdInterfaceUnbridge(vshControl *ctl, const vshCmd *cmd) if (!(xml_doc = virXMLParseStringCtxt(br_xml, _("(bridge interface definition)"), &ctxt))) { - vshError(ctl, _("Failed to parse configuration of %s"), br_name); + vshError(ctl, _("Failed to parse configuration of %1$s"), br_name); goto cleanup; } top_node = ctxt->node; /* Verify that the device really is a bridge. */ if (!(if_type = virXMLPropString(top_node, "type"))) { - vshError(ctl, _("Existing device %s has no type"), br_name); + vshError(ctl, _("Existing device %1$s has no type"), br_name); goto cleanup; } if (STRNEQ(if_type, "bridge")) { - vshError(ctl, _("Device %s is not a bridge"), br_name); + vshError(ctl, _("Device %1$s is not a bridge"), br_name); goto cleanup; } VIR_FREE(if_type); @@ -1071,7 +1071,7 @@ cmdInterfaceUnbridge(vshControl *ctl, const vshCmd *cmd) /* verify the name in the XML matches the device name */ if (!(if_name = virXMLPropString(top_node, "name")) || STRNEQ(if_name, br_name)) { - vshError(ctl, _("Interface name from config %s doesn't match given supplied name %s"), + vshError(ctl, _("Interface name from config %1$s doesn't match given supplied name %2$s"), if_name, br_name); goto cleanup; } @@ -1097,23 +1097,23 @@ cmdInterfaceUnbridge(vshControl *ctl, const vshCmd *cmd) * the type/name of the attached interface. */ if (!(if_name = virXMLPropString(if_node, "name"))) { - vshError(ctl, _("Device attached to bridge %s has no name"), br_name); + vshError(ctl, _("Device attached to bridge %1$s has no name"), br_name); goto cleanup; } if (!(if_type = virXMLPropString(if_node, "type"))) { - vshError(ctl, _("Attached device %s has no type"), if_name); + vshError(ctl, _("Attached device %1$s has no type"), if_name); goto cleanup; } if (!xmlSetProp(top_node, BAD_CAST "type", BAD_CAST if_type)) { - vshError(ctl, _("Failed to set interface type to '%s' in xml document"), + vshError(ctl, _("Failed to set interface type to '%1$s' in xml document"), if_type); goto cleanup; } if (!xmlSetProp(top_node, BAD_CAST "name", BAD_CAST if_name)) { - vshError(ctl, _("Failed to set interface name to '%s' in xml document"), + vshError(ctl, _("Failed to set interface name to '%1$s' in xml document"), if_name); goto cleanup; } @@ -1133,7 +1133,7 @@ cmdInterfaceUnbridge(vshControl *ctl, const vshCmd *cmd) virXMLNodeNameEqual(old, "vlan"))) { /* vlan stuff to move down */ xmlUnlinkNode(old); if (!xmlAddChild(top_node, old)) { - vshError(ctl, _("Failed to move '%s' element in xml document"), old->name); + vshError(ctl, _("Failed to move '%1$s' element in xml document"), old->name); xmlFreeNode(old); goto cleanup; } @@ -1144,7 +1144,7 @@ cmdInterfaceUnbridge(vshControl *ctl, const vshCmd *cmd) xmlDocDumpMemory(xml_doc, &if_xml, &if_xml_size); if (!if_xml || if_xml_size <= 0) { - vshError(ctl, _("Failed to format new xml document for detached interface %s"), + vshError(ctl, _("Failed to format new xml document for detached interface %1$s"), if_name); goto cleanup; } @@ -1153,31 +1153,31 @@ cmdInterfaceUnbridge(vshControl *ctl, const vshCmd *cmd) * can't safely define the unattached device. */ if (virInterfaceDestroy(br_handle, 0) < 0) { - vshError(ctl, _("Failed to destroy bridge interface %s"), br_name); + vshError(ctl, _("Failed to destroy bridge interface %1$s"), br_name); goto cleanup; } if (virInterfaceUndefine(br_handle) < 0) { - vshError(ctl, _("Failed to undefine bridge interface %s"), br_name); + vshError(ctl, _("Failed to undefine bridge interface %1$s"), br_name); goto cleanup; } /* if_xml is the new interface to define. */ if (!(if_handle = virInterfaceDefineXML(priv->conn, (char *) if_xml, 0))) { - vshError(ctl, _("Failed to define new interface %s"), if_name); + vshError(ctl, _("Failed to define new interface %1$s"), if_name); goto cleanup; } - vshPrintExtra(ctl, _("Device %s un-attached from bridge %s\n"), + vshPrintExtra(ctl, _("Device %1$s un-attached from bridge %2$s\n"), if_name, br_name); /* unless requested otherwise, undefine the bridge device */ if (!nostart) { if (virInterfaceCreate(if_handle, 0) < 0) { - vshError(ctl, _("Failed to start interface %s"), if_name); + vshError(ctl, _("Failed to start interface %1$s"), if_name); goto cleanup; } - vshPrintExtra(ctl, _("Interface %s started\n"), if_name); + vshPrintExtra(ctl, _("Interface %1$s started\n"), if_name); } ret = true; diff --git a/tools/virsh-network.c b/tools/virsh-network.c index 13f2e729eb..42b7dba761 100644 --- a/tools/virsh-network.c +++ b/tools/virsh-network.c @@ -97,7 +97,7 @@ virshCommandOptNetworkBy(vshControl *ctl, const vshCmd *cmd, } if (!network) - vshError(ctl, _("failed to get network '%s'"), n); + vshError(ctl, _("failed to get network '%1$s'"), n); return network; } @@ -126,7 +126,7 @@ virshCommandOptNetworkPort(vshControl *ctl, const vshCmd *cmd, port = virNetworkPortLookupByUUIDString(net, n); if (!port) - vshError(ctl, _("failed to get network port '%s'"), n); + vshError(ctl, _("failed to get network port '%1$s'"), n); return port; } @@ -167,16 +167,16 @@ cmdNetworkAutostart(vshControl *ctl, const vshCmd *cmd) if (virNetworkSetAutostart(network, autostart) < 0) { if (autostart) - vshError(ctl, _("failed to mark network %s as autostarted"), name); + vshError(ctl, _("failed to mark network %1$s as autostarted"), name); else - vshError(ctl, _("failed to unmark network %s as autostarted"), name); + vshError(ctl, _("failed to unmark network %1$s as autostarted"), name); return false; } if (autostart) - vshPrintExtra(ctl, _("Network %s marked as autostarted\n"), name); + vshPrintExtra(ctl, _("Network %1$s marked as autostarted\n"), name); else - vshPrintExtra(ctl, _("Network %s unmarked as autostarted\n"), name); + vshPrintExtra(ctl, _("Network %1$s unmarked as autostarted\n"), name); return true; } @@ -227,11 +227,11 @@ cmdNetworkCreate(vshControl *ctl, const vshCmd *cmd) network = virNetworkCreateXML(priv->conn, buffer); if (!network) { - vshError(ctl, _("Failed to create network from %s"), from); + vshError(ctl, _("Failed to create network from %1$s"), from); return false; } - vshPrintExtra(ctl, _("Network %s created from %s\n"), + vshPrintExtra(ctl, _("Network %1$s created from %2$s\n"), virNetworkGetName(network), from); return true; } @@ -283,11 +283,11 @@ cmdNetworkDefine(vshControl *ctl, const vshCmd *cmd) network = virNetworkDefineXML(priv->conn, buffer); if (!network) { - vshError(ctl, _("Failed to define network from %s"), from); + vshError(ctl, _("Failed to define network from %1$s"), from); return false; } - vshPrintExtra(ctl, _("Network %s defined from %s\n"), + vshPrintExtra(ctl, _("Network %1$s defined from %2$s\n"), virNetworkGetName(network), from); return true; } @@ -321,9 +321,9 @@ cmdNetworkDestroy(vshControl *ctl, const vshCmd *cmd) return false; if (virNetworkDestroy(network) == 0) { - vshPrintExtra(ctl, _("Network %s destroyed\n"), name); + vshPrintExtra(ctl, _("Network %1$s destroyed\n"), name); } else { - vshError(ctl, _("Failed to destroy network %s"), name); + vshError(ctl, _("Failed to destroy network %1$s"), name); ret = false; } @@ -866,9 +866,9 @@ cmdNetworkStart(vshControl *ctl, const vshCmd *cmd) return false; if (virNetworkCreate(network) == 0) { - vshPrintExtra(ctl, _("Network %s started\n"), name); + vshPrintExtra(ctl, _("Network %1$s started\n"), name); } else { - vshError(ctl, _("Failed to start network %s"), name); + vshError(ctl, _("Failed to start network %1$s"), name); ret = false; } return ret; @@ -903,9 +903,9 @@ cmdNetworkUndefine(vshControl *ctl, const vshCmd *cmd) return false; if (virNetworkUndefine(network) == 0) { - vshPrintExtra(ctl, _("Network %s has been undefined\n"), name); + vshPrintExtra(ctl, _("Network %1$s has been undefined\n"), name); } else { - vshError(ctl, _("Failed to undefine network %s"), name); + vshError(ctl, _("Failed to undefine network %1$s"), name); ret = false; } @@ -996,7 +996,7 @@ cmdNetworkUpdate(vshControl *ctl, const vshCmd *cmd) } else { command = virshNetworkUpdateCommandTypeFromString(commandStr); if (command <= 0) { - vshError(ctl, _("unrecognized command name '%s'"), commandStr); + vshError(ctl, _("unrecognized command name '%1$s'"), commandStr); goto cleanup; } } @@ -1006,7 +1006,7 @@ cmdNetworkUpdate(vshControl *ctl, const vshCmd *cmd) section = virshNetworkSectionTypeFromString(sectionStr); if (section <= 0) { - vshError(ctl, _("unrecognized section name '%s'"), sectionStr); + vshError(ctl, _("unrecognized section name '%1$s'"), sectionStr); goto cleanup; } @@ -1043,27 +1043,26 @@ cmdNetworkUpdate(vshControl *ctl, const vshCmd *cmd) if (virNetworkUpdate(network, command, section, parentIndex, xml, flags) < 0) { - vshError(ctl, _("Failed to update network %s"), + vshError(ctl, _("Failed to update network %1$s"), virNetworkGetName(network)); goto cleanup; } if (config) { if (live) - vshPrintExtra(ctl, _("Updated network %s persistent config and " - "live state"), + vshPrintExtra(ctl, _("Updated network %1$s persistent config and live state"), virNetworkGetName(network)); else - vshPrintExtra(ctl, _("Updated network %s persistent config"), + vshPrintExtra(ctl, _("Updated network %1$s persistent config"), virNetworkGetName(network)); } else if (live) { - vshPrintExtra(ctl, _("Updated network %s live state"), + vshPrintExtra(ctl, _("Updated network %1$s live state"), virNetworkGetName(network)); } else if (virNetworkIsActive(network)) { - vshPrintExtra(ctl, _("Updated network %s live state"), + vshPrintExtra(ctl, _("Updated network %1$s live state"), virNetworkGetName(network)); } else { - vshPrintExtra(ctl, _("Updated network %s persistent config"), + vshPrintExtra(ctl, _("Updated network %1$s persistent config"), virNetworkGetName(network)); } @@ -1158,7 +1157,7 @@ cmdNetworkEdit(vshControl *ctl, const vshCmd *cmd) #define EDIT_GET_XML virshNetworkGetXMLDesc(network) #define EDIT_NOT_CHANGED \ do { \ - vshPrintExtra(ctl, _("Network %s XML configuration not changed.\n"), \ + vshPrintExtra(ctl, _("Network %1$s XML configuration not changed.\n"), \ virNetworkGetName(network)); \ ret = true; \ goto edit_cleanup; \ @@ -1167,7 +1166,7 @@ cmdNetworkEdit(vshControl *ctl, const vshCmd *cmd) (network_edited = virNetworkDefineXML(priv->conn, doc_edited)) #include "virsh-edit.c" - vshPrintExtra(ctl, _("Network %s XML configuration edited.\n"), + vshPrintExtra(ctl, _("Network %1$s XML configuration edited.\n"), virNetworkGetName(network_edited)); ret = true; @@ -1227,11 +1226,11 @@ vshEventLifecyclePrint(virConnectPtr conn G_GNUC_UNUSED, if (virTimeStringNowRaw(timestamp) < 0) timestamp[0] = '\0'; - vshPrint(data->ctl, _("%s: event 'lifecycle' for network %s: %s\n"), + vshPrint(data->ctl, _("%1$s: event 'lifecycle' for network %2$s: %3$s\n"), timestamp, virNetworkGetName(net), virshNetworkEventToString(event)); } else { - vshPrint(data->ctl, _("event 'lifecycle' for network %s: %s\n"), + vshPrint(data->ctl, _("event 'lifecycle' for network %1$s: %2$s\n"), virNetworkGetName(net), virshNetworkEventToString(event)); } @@ -1312,7 +1311,7 @@ cmdNetworkEvent(vshControl *ctl, const vshCmd *cmd) if (STREQ(eventName, virshNetworkEventCallbacks[event].name)) break; if (event == VIR_NETWORK_EVENT_ID_LAST) { - vshError(ctl, _("unknown event type %s"), eventName); + vshError(ctl, _("unknown event type %1$s"), eventName); return false; } @@ -1345,7 +1344,7 @@ cmdNetworkEvent(vshControl *ctl, const vshCmd *cmd) default: goto cleanup; } - vshPrint(ctl, _("events received: %d\n"), data.count); + vshPrint(ctl, _("events received: %1$d\n"), data.count); if (data.count) ret = true; @@ -1417,7 +1416,7 @@ cmdNetworkDHCPLeases(vshControl *ctl, const vshCmd *cmd) return false; if ((nleases = virNetworkGetDHCPLeases(network, mac, &leases, flags)) < 0) { - vshError(ctl, _("Failed to get leases info for %s"), name); + vshError(ctl, _("Failed to get leases info for %1$s"), name); goto cleanup; } @@ -1523,10 +1522,10 @@ cmdNetworkPortCreate(vshControl *ctl, const vshCmd *cmd) if (port != NULL) { char uuidstr[VIR_UUID_STRING_BUFLEN]; virNetworkPortGetUUIDString(port, uuidstr); - vshPrintExtra(ctl, _("Network port %s created from %s\n"), + vshPrintExtra(ctl, _("Network port %1$s created from %2$s\n"), uuidstr, from); } else { - vshError(ctl, _("Failed to create network from %s"), from); + vshError(ctl, _("Failed to create network from %1$s"), from); goto cleanup; } @@ -1635,10 +1634,10 @@ cmdNetworkPortDelete(vshControl *ctl, const vshCmd *cmd) goto cleanup; if (virNetworkPortDelete(port, 0) < 0) { - vshError(ctl, _("Failed to delete network port %s"), uuidstr); + vshError(ctl, _("Failed to delete network port %1$s"), uuidstr); goto cleanup; } else { - vshPrintExtra(ctl, _("Network port %s deleted\n"), uuidstr); + vshPrintExtra(ctl, _("Network port %1$s deleted\n"), uuidstr); } ret = true; -- 2.39.2

Since all messages marked for translation contain permutable format strings, we can add checks for enforcing them. The syntax check does not catch all cases as it only checks format strings between _(" and the first ". In other words messages where \" appears before the first format string or multi-line messages where the first format strings is not in the first line will not be checked. On the other hand, it's run automatically by "meson test". check-pot.py python script will detect all incorrect format strings, but it's not as easy to use as it requires libvirt.pot to be regenerated and this does not happen during a standard build. The following steps are needed to check messages with check-pot.py: meson compile libvirt-pot-dep meson compile libvirt-pot meson compile libvirt-pot-check Don't forget to revert changes to libvirt.pot if you run these commands locally as we don't want each patch series to update libvirt.pot. Shell scripts (tools/libvirt-guests.sh.in is the only one currently) need to be exempt from this check as shell's printf function does not understand the permutable format strings. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com&gt; --- build-aux/syntax-check.mk | 5 ++++ po/meson.build | 8 ++++++ scripts/check-pot.py | 54 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 67 insertions(+) create mode 100755 scripts/check-pot.py diff --git a/build-aux/syntax-check.mk b/build-aux/syntax-check.mk index 21f6b311ce..5829dc9011 100644 --- a/build-aux/syntax-check.mk +++ b/build-aux/syntax-check.mk @@ -455,6 +455,11 @@ sc_prohibit_diagnostic_without_format: { echo 'found diagnostic without %' 1>&2; \ exit 1; } || : +sc_require_permutable_format_in_translation: + @prohibit='\<N?_ *\("[^"]*%[^%$$ ]*[a-zA-Z][^"]*"' \ + halt='non-permutable format string(s)' \ + $(_sc_search_regexp) + # The strings "" and "%s" should never be marked for translation. # Files under tests/ and examples/ should not be translated. sc_prohibit_useless_translation: diff --git a/po/meson.build b/po/meson.build index fbfdc2d08d..a20877ad34 100644 --- a/po/meson.build +++ b/po/meson.build @@ -25,3 +25,11 @@ potfiles_dep = [ ] alias_target('libvirt-pot-dep', potfiles_dep) + +run_target( + 'libvirt-pot-check', + command: [ + &#39;@0(a)/scripts/check-pot.py&#39;.format(meson.project_source_root()), + &#39;@0(a)/po/libvirt.pot&#39;.format(meson.project_source_root()) + ], +) diff --git a/scripts/check-pot.py b/scripts/check-pot.py new file mode 100755 index 0000000000..eca8382872 --- /dev/null +++ b/scripts/check-pot.py @@ -0,0 +1,54 @@ +#!/usr/bin/env python3 + +import sys +import re + +excluded_files = [ + 'tools/libvirt-guests.sh.in', +] + +if len(sys.argv) != 2: + print(f"usage: {sys.argv[0]} POTFILE", file=sys.stderr) + sys.exit(1) + +potfile = sys.argv[1] + +failed = 0 + + +def print_msg(files, msgs): + if len(msgs) == 0 or len(files) == 0: + return + + print("\n".join(files)) + + for m in msgs: + print(f" {m}") + + global failed + failed += 1 + + +with open(potfile, "r") as pot: + files = [] + msgs = [] + + for line in pot: + if not line or line.startswith("msgstr "): + print_msg(files, msgs) + files = [] + msgs = [] + continue + + if line.startswith("#: "): + files.extend([f for f in line[3:].split() if not f.split(":")[0] in excluded_files]) + continue + + m = re.search(r'(msgid )?"(.*%[^%$ ]*[a-zA-Z].*)"', line) + if m is not None: + msgs.append(m.group(2)) + +if failed: + print(f"Found {failed} messages without permutable format strings!", + file=sys.stderr) + sys.exit(1) -- 2.39.2