[libvirt] [PATCH 1/2] src: Fix a few unmarked_diagnostics issues
These were not caught by our current regular expressions
but will be caught by the improved ones we're about to
introduce, so fix them ahead of time.
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
---
src/libxl/libxl_driver.c | 8 ++++----
src/openvz/openvz_driver.c | 4 ++--
src/qemu/qemu_agent.c | 2 +-
src/qemu/qemu_domain.c | 2 +-
src/vbox/vbox_snapshot_conf.c | 2 +-
5 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c
index 3d03e7320a..e30c9891d2 100644
--- a/src/libxl/libxl_driver.c
+++ b/src/libxl/libxl_driver.c
@@ -3649,8 +3649,8 @@ libxlDomainDetachHostPCIDevice(libxlDriverPrivatePtr driver,
if (libxl_device_pci_remove(cfg->ctx, vm->def->id, &pcidev, 0) < 0)
{
virReportError(VIR_ERR_INTERNAL_ERROR,
- _("libxenlight failed to detach pci device\
- %.4x:%.2x:%.2x.%.1x"),
+ _("libxenlight failed to detach pci device "
+ "%.4x:%.2x:%.2x.%.1x"),
pcisrc->addr.domain, pcisrc->addr.bus,
pcisrc->addr.slot, pcisrc->addr.function);
goto error;
@@ -3773,8 +3773,8 @@ libxlDomainDetachHostUSBDevice(libxlDriverPrivatePtr driver,
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: %3x, Devnum: %3x"),
usbsrc->bus, usbsrc->device);
goto cleanup;
}
diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c
index a570532808..06950ce9ed 100644
--- a/src/openvz/openvz_driver.c
+++ b/src/openvz/openvz_driver.c
@@ -1637,14 +1637,14 @@ openvzDomainGetBarrierLimit(virDomainPtr domain,
virSkipSpaces(&tmp);
if (virStrToLong_ull(tmp, &endp, 10, barrier) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR,
- _("Can't parse limit from "VZLIST" output
'%s'"), output);
+ _("Can't parse limit from vzlist output
'%s'"), output);
goto cleanup;
}
tmp = endp;
virSkipSpaces(&tmp);
if (virStrToLong_ull(tmp, &endp, 10, limit) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR,
- _("Can't parse barrier from "VZLIST" output
'%s'"), output);
+ _("Can't parse barrier from vzlist output
'%s'"), output);
goto cleanup;
}
diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c
index 2ff16182ff..0f4dae37e3 100644
--- a/src/qemu/qemu_agent.c
+++ b/src/qemu/qemu_agent.c
@@ -357,7 +357,7 @@ static int qemuAgentIOProcessData(qemuAgentPtr mon,
#if DEBUG_IO
# if DEBUG_RAW_IO
char *str1 = qemuAgentEscapeNonPrintable(data);
- VIR_ERROR("[%s]", str1);
+ VIR_ERROR(_("[%s]"), str1);
VIR_FREE(str1);
# else
VIR_DEBUG("Data %zu bytes [%s]", len, data);
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 4f729500b7..bc6eaff318 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -2676,7 +2676,7 @@ qemuDomainObjPrivateXMLParseJobNBDSource(xmlNodePtr node,
if (!(format = virXMLPropString(ctxt->node, "format"))) {
virReportError(VIR_ERR_XML_ERROR, "%s",
- ("missing storage source format"));
+ _("missing storage source format"));
goto cleanup;
}
diff --git a/src/vbox/vbox_snapshot_conf.c b/src/vbox/vbox_snapshot_conf.c
index c3b2855a2d..a36da30a4f 100644
--- a/src/vbox/vbox_snapshot_conf.c
+++ b/src/vbox/vbox_snapshot_conf.c
@@ -718,7 +718,7 @@ virVBoxSnapshotConfLoadVboxFile(const char *filePath,
machineDescription->mediaRegistry = virVBoxSnapshotConfRetrieveMediaRegistry(cur,
xPathContext, machineLocation);
if (machineDescription->mediaRegistry == NULL) {
virReportError(VIR_ERR_XML_ERROR, "%s",
- ("Unable to create media registry"));
+ _("Unable to create media registry"));
goto cleanup;
}
--
2.20.1