提交 5c7bfc6b 编写于 作者: A Andrea Bolognani

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: NAndrea Bolognani <abologna@redhat.com>
Reviewed-by: NEric Blake <eblake@redhat.com>
Reviewed-by: NJán Tomko <jtomko@redhat.com>
上级 acf522e8
...@@ -3649,8 +3649,8 @@ libxlDomainDetachHostPCIDevice(libxlDriverPrivatePtr driver, ...@@ -3649,8 +3649,8 @@ libxlDomainDetachHostPCIDevice(libxlDriverPrivatePtr driver,
if (libxl_device_pci_remove(cfg->ctx, vm->def->id, &pcidev, 0) < 0) { if (libxl_device_pci_remove(cfg->ctx, vm->def->id, &pcidev, 0) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("libxenlight failed to detach pci device\ _("libxenlight failed to detach pci device "
%.4x:%.2x:%.2x.%.1x"), "%.4x:%.2x:%.2x.%.1x"),
pcisrc->addr.domain, pcisrc->addr.bus, pcisrc->addr.domain, pcisrc->addr.bus,
pcisrc->addr.slot, pcisrc->addr.function); pcisrc->addr.slot, pcisrc->addr.function);
goto error; goto error;
...@@ -3773,8 +3773,8 @@ libxlDomainDetachHostUSBDevice(libxlDriverPrivatePtr driver, ...@@ -3773,8 +3773,8 @@ libxlDomainDetachHostUSBDevice(libxlDriverPrivatePtr driver,
if (libxl_device_usbdev_remove(cfg->ctx, vm->def->id, &usbdev, 0) < 0) { if (libxl_device_usbdev_remove(cfg->ctx, vm->def->id, &usbdev, 0) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("libxenlight failed to detach USB device\ _("libxenlight failed to detach USB device "
Busnum: %3x, Devnum: %3x"), "Busnum: %3x, Devnum: %3x"),
usbsrc->bus, usbsrc->device); usbsrc->bus, usbsrc->device);
goto cleanup; goto cleanup;
} }
......
...@@ -1637,14 +1637,14 @@ openvzDomainGetBarrierLimit(virDomainPtr domain, ...@@ -1637,14 +1637,14 @@ openvzDomainGetBarrierLimit(virDomainPtr domain,
virSkipSpaces(&tmp); virSkipSpaces(&tmp);
if (virStrToLong_ull(tmp, &endp, 10, barrier) < 0) { if (virStrToLong_ull(tmp, &endp, 10, barrier) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, 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; goto cleanup;
} }
tmp = endp; tmp = endp;
virSkipSpaces(&tmp); virSkipSpaces(&tmp);
if (virStrToLong_ull(tmp, &endp, 10, limit) < 0) { if (virStrToLong_ull(tmp, &endp, 10, limit) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, 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; goto cleanup;
} }
......
...@@ -357,7 +357,7 @@ static int qemuAgentIOProcessData(qemuAgentPtr mon, ...@@ -357,7 +357,7 @@ static int qemuAgentIOProcessData(qemuAgentPtr mon,
#if DEBUG_IO #if DEBUG_IO
# if DEBUG_RAW_IO # if DEBUG_RAW_IO
char *str1 = qemuAgentEscapeNonPrintable(data); char *str1 = qemuAgentEscapeNonPrintable(data);
VIR_ERROR("[%s]", str1); VIR_ERROR(_("[%s]"), str1);
VIR_FREE(str1); VIR_FREE(str1);
# else # else
VIR_DEBUG("Data %zu bytes [%s]", len, data); VIR_DEBUG("Data %zu bytes [%s]", len, data);
......
...@@ -2676,7 +2676,7 @@ qemuDomainObjPrivateXMLParseJobNBDSource(xmlNodePtr node, ...@@ -2676,7 +2676,7 @@ qemuDomainObjPrivateXMLParseJobNBDSource(xmlNodePtr node,
if (!(format = virXMLPropString(ctxt->node, "format"))) { if (!(format = virXMLPropString(ctxt->node, "format"))) {
virReportError(VIR_ERR_XML_ERROR, "%s", virReportError(VIR_ERR_XML_ERROR, "%s",
("missing storage source format")); _("missing storage source format"));
goto cleanup; goto cleanup;
} }
......
...@@ -718,7 +718,7 @@ virVBoxSnapshotConfLoadVboxFile(const char *filePath, ...@@ -718,7 +718,7 @@ virVBoxSnapshotConfLoadVboxFile(const char *filePath,
machineDescription->mediaRegistry = virVBoxSnapshotConfRetrieveMediaRegistry(cur, xPathContext, machineLocation); machineDescription->mediaRegistry = virVBoxSnapshotConfRetrieveMediaRegistry(cur, xPathContext, machineLocation);
if (machineDescription->mediaRegistry == NULL) { if (machineDescription->mediaRegistry == NULL) {
virReportError(VIR_ERR_XML_ERROR, "%s", virReportError(VIR_ERR_XML_ERROR, "%s",
("Unable to create media registry")); _("Unable to create media registry"));
goto cleanup; goto cleanup;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册