[libvirt] [PATCH 1/5] maint: don't mark VIR_WARN or VIR_WARN0 diagnostics for translation
Jim Meyering
jim at meyering.net
Wed May 19 14:47:16 UTC 2010
From: Jim Meyering <meyering at redhat.com>
Approximately 60 messages were marked. Since these diagnostics are
intended solely for developers and maintainers, encouraging translation
is deemed to be counterproductive:
http://thread.gmane.org/gmane.comp.emulators.libvirt/25050/focus=25052
Run this command:
git grep -l VIR_WARN|xargs perl -pi -e \
's/(VIR_WARN0?)\s*\(_\((".*?")\)/$1($2/'
---
daemon/libvirtd.c | 6 +++---
src/lxc/lxc_container.c | 2 +-
src/lxc/lxc_controller.c | 2 +-
src/network/bridge_driver.c | 8 ++++----
src/qemu/qemu_conf.c | 12 ++++++------
src/qemu/qemu_driver.c | 32 ++++++++++++++++----------------
src/qemu/qemu_monitor_text.c | 22 +++++++++++-----------
src/uml/uml_driver.c | 12 ++++++------
src/util/logging.c | 8 ++++----
src/util/pci.c | 8 ++++----
src/xen/proxy_internal.c | 6 +++---
11 files changed, 59 insertions(+), 59 deletions(-)
diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c
index 4533f40..cc05953 100644
--- a/daemon/libvirtd.c
+++ b/daemon/libvirtd.c
@@ -384,14 +384,14 @@ qemudDispatchSignalEvent(int watch ATTRIBUTE_UNUSED,
virHookCall(VIR_HOOK_DRIVER_DAEMON, "-",
VIR_HOOK_DAEMON_OP_RELOAD, SIGHUP, "SIGHUP", NULL);
if (virStateReload() < 0)
- VIR_WARN0(_("Error while reloading drivers"));
+ VIR_WARN0("Error while reloading drivers");
break;
case SIGINT:
case SIGQUIT:
case SIGTERM:
- VIR_WARN(_("Shutting down on signal %d"), siginfo.si_signo);
+ VIR_WARN("Shutting down on signal %d", siginfo.si_signo);
server->quitEventThread = 1;
break;
@@ -2761,7 +2761,7 @@ remoteReadConfigFile (struct qemud_server *server, const char *filename)
GET_CONF_STR (conf, filename, unix_sock_group);
if (unix_sock_group) {
if (!server->privileged) {
- VIR_WARN0(_("Cannot set group when not running as root"));
+ VIR_WARN0("Cannot set group when not running as root");
} else {
int ret;
struct group grpdata, *grp;
diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c
index 706c796..018f4d5 100644
--- a/src/lxc/lxc_container.c
+++ b/src/lxc/lxc_container.c
@@ -716,7 +716,7 @@ static int lxcContainerDropCapabilities(void)
* be unmasked - they can never escape the bounding set. */
#else
- VIR_WARN0(_("libcap-ng support not compiled in, unable to clear capabilities"));
+ VIR_WARN0("libcap-ng support not compiled in, unable to clear capabilities");
#endif
return 0;
}
diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c
index c120b8e..1732780 100644
--- a/src/lxc/lxc_controller.c
+++ b/src/lxc/lxc_controller.c
@@ -259,7 +259,7 @@ static int lxcControllerClearCapabilities(void)
return -1;
}
#else
- VIR_WARN0(_("libcap-ng support not compiled in, unable to clear capabilities"));
+ VIR_WARN0("libcap-ng support not compiled in, unable to clear capabilities");
#endif
return 0;
}
diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
index 8432bbc..3b9b4f4 100644
--- a/src/network/bridge_driver.c
+++ b/src/network/bridge_driver.c
@@ -995,14 +995,14 @@ static int networkStartNetworkDaemon(struct network_driver *driver,
err_delbr1:
if ((err = brSetInterfaceUp(driver->brctl, network->def->bridge, 0))) {
char ebuf[1024];
- VIR_WARN(_("Failed to bring down bridge '%s' : %s"),
+ VIR_WARN("Failed to bring down bridge '%s' : %s",
network->def->bridge, virStrerror(err, ebuf, sizeof ebuf));
}
err_delbr:
if ((err = brDeleteBridge(driver->brctl, network->def->bridge))) {
char ebuf[1024];
- VIR_WARN(_("Failed to delete bridge '%s' : %s"),
+ VIR_WARN("Failed to delete bridge '%s' : %s",
network->def->bridge, virStrerror(err, ebuf, sizeof ebuf));
}
@@ -1035,12 +1035,12 @@ static int networkShutdownNetworkDaemon(struct network_driver *driver,
char ebuf[1024];
if ((err = brSetInterfaceUp(driver->brctl, network->def->bridge, 0))) {
- VIR_WARN(_("Failed to bring down bridge '%s' : %s"),
+ VIR_WARN("Failed to bring down bridge '%s' : %s",
network->def->bridge, virStrerror(err, ebuf, sizeof ebuf));
}
if ((err = brDeleteBridge(driver->brctl, network->def->bridge))) {
- VIR_WARN(_("Failed to delete bridge '%s' : %s"),
+ VIR_WARN("Failed to delete bridge '%s' : %s",
network->def->bridge, virStrerror(err, ebuf, sizeof ebuf));
}
diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
index 5fa8c0a..3e334dc 100644
--- a/src/qemu/qemu_conf.c
+++ b/src/qemu/qemu_conf.c
@@ -523,7 +523,7 @@ rewait:
* as there's really no need to throw an error if we did
* actually read a valid version number above */
if (WEXITSTATUS(status) != 0) {
- VIR_WARN(_("Unexpected exit status '%d', qemu probably failed"),
+ VIR_WARN("Unexpected exit status '%d', qemu probably failed",
WEXITSTATUS(status));
}
@@ -767,7 +767,7 @@ rewait:
* as there's really no need to throw an error if we did
* actually read a valid version number above */
if (WEXITSTATUS(status) != 0) {
- VIR_WARN(_("Unexpected exit status '%d', qemu probably failed"),
+ VIR_WARN("Unexpected exit status '%d', qemu probably failed",
WEXITSTATUS(status));
}
@@ -847,7 +847,7 @@ qemudCapsInitGuest(virCapsPtr caps,
binary_mtime = st.st_mtime;
} else {
char ebuf[1024];
- VIR_WARN(_("Failed to stat %s, most peculiar : %s"),
+ VIR_WARN("Failed to stat %s, most peculiar : %s",
binary, virStrerror(errno, ebuf, sizeof(ebuf)));
binary_mtime = 0;
}
@@ -932,7 +932,7 @@ qemudCapsInitGuest(virCapsPtr caps,
binary_mtime = st.st_mtime;
} else {
char ebuf[1024];
- VIR_WARN(_("Failed to stat %s, most peculiar : %s"),
+ VIR_WARN("Failed to stat %s, most peculiar : %s",
binary, virStrerror(errno, ebuf, sizeof(ebuf)));
binary_mtime = 0;
}
@@ -1403,7 +1403,7 @@ rewait:
* as there's really no need to throw an error if we did
* actually read a valid version number above */
if (WEXITSTATUS(status) != 0) {
- VIR_WARN(_("Unexpected exit status '%d', qemu probably failed"),
+ VIR_WARN("Unexpected exit status '%d', qemu probably failed",
WEXITSTATUS(status));
}
@@ -6147,7 +6147,7 @@ virDomainDefPtr qemuParseCommandLine(virCapsPtr caps,
} else if (STREQ(arg, "-S")) {
/* ignore, always added by libvirt */
} else {
- VIR_WARN(_("unknown QEMU argument '%s' during conversion"), arg);
+ VIR_WARN("unknown QEMU argument '%s' during conversion", arg);
#if 0
qemuReportError(VIR_ERR_INTERNAL_ERROR,
_("unknown argument '%s'"), arg);
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 609fabe..c103592 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -689,12 +689,12 @@ qemudRemoveDomainStatus(struct qemud_driver *driver,
}
if (unlink(file) < 0 && errno != ENOENT && errno != ENOTDIR)
- VIR_WARN(_("Failed to remove domain XML for %s: %s"),
+ VIR_WARN("Failed to remove domain XML for %s: %s",
vm->def->name, virStrerror(errno, ebuf, sizeof(ebuf)));
VIR_FREE(file);
if (virFileDeletePid(driver->stateDir, vm->def->name) != 0)
- VIR_WARN(_("Failed to remove PID file for %s: %s"),
+ VIR_WARN("Failed to remove PID file for %s: %s",
vm->def->name, virStrerror(errno, ebuf, sizeof(ebuf)));
@@ -2108,7 +2108,7 @@ cleanup:
closelog:
if (close(logfd) < 0) {
char ebuf[4096];
- VIR_WARN(_("Unable to close logfile: %s"),
+ VIR_WARN("Unable to close logfile: %s",
virStrerror(errno, ebuf, sizeof ebuf));
}
@@ -3441,29 +3441,29 @@ static int qemudStartVMDaemon(virConnectPtr conn,
tmp = progenv;
while (*tmp) {
if (safewrite(logfile, *tmp, strlen(*tmp)) < 0)
- VIR_WARN(_("Unable to write envv to logfile: %s"),
+ VIR_WARN("Unable to write envv to logfile: %s",
virStrerror(errno, ebuf, sizeof ebuf));
if (safewrite(logfile, " ", 1) < 0)
- VIR_WARN(_("Unable to write envv to logfile: %s"),
+ VIR_WARN("Unable to write envv to logfile: %s",
virStrerror(errno, ebuf, sizeof ebuf));
tmp++;
}
tmp = argv;
while (*tmp) {
if (safewrite(logfile, *tmp, strlen(*tmp)) < 0)
- VIR_WARN(_("Unable to write argv to logfile: %s"),
+ VIR_WARN("Unable to write argv to logfile: %s",
virStrerror(errno, ebuf, sizeof ebuf));
if (safewrite(logfile, " ", 1) < 0)
- VIR_WARN(_("Unable to write argv to logfile: %s"),
+ VIR_WARN("Unable to write argv to logfile: %s",
virStrerror(errno, ebuf, sizeof ebuf));
tmp++;
}
if (safewrite(logfile, "\n", 1) < 0)
- VIR_WARN(_("Unable to write argv to logfile: %s"),
+ VIR_WARN("Unable to write argv to logfile: %s",
virStrerror(errno, ebuf, sizeof ebuf));
if ((pos = lseek(logfile, 0, SEEK_END)) < 0)
- VIR_WARN(_("Unable to seek to end of logfile: %s"),
+ VIR_WARN("Unable to seek to end of logfile: %s",
virStrerror(errno, ebuf, sizeof ebuf));
for (i = 0 ; i < ntapfds ; i++)
@@ -6944,7 +6944,7 @@ static int qemudDomainAttachPciDiskDevice(struct qemud_driver *driver,
if (ret == 0) {
ret = qemuMonitorAddDevice(priv->mon, devstr);
if (ret < 0) {
- VIR_WARN(_("qemuMonitorAddDevice failed on %s (%s)"),
+ VIR_WARN("qemuMonitorAddDevice failed on %s (%s)",
drivestr, devstr);
/* XXX should call 'drive_del' on error but this does not
exist yet */
@@ -7174,7 +7174,7 @@ static int qemudDomainAttachSCSIDisk(struct qemud_driver *driver,
if (ret == 0) {
ret = qemuMonitorAddDevice(priv->mon, devstr);
if (ret < 0) {
- VIR_WARN(_("qemuMonitorAddDevice failed on %s (%s)"),
+ VIR_WARN("qemuMonitorAddDevice failed on %s (%s)",
drivestr, devstr);
/* XXX should call 'drive_del' on error but this does not
exist yet */
@@ -7267,7 +7267,7 @@ static int qemudDomainAttachUsbMassstorageDevice(struct qemud_driver *driver,
if (ret == 0) {
ret = qemuMonitorAddDevice(priv->mon, devstr);
if (ret < 0) {
- VIR_WARN(_("qemuMonitorAddDevice failed on %s (%s)"),
+ VIR_WARN("qemuMonitorAddDevice failed on %s (%s)",
drivestr, devstr);
/* XXX should call 'drive_del' on error but this does not
exist yet */
@@ -7491,12 +7491,12 @@ try_remove:
goto no_memory;
qemuDomainObjEnterMonitorWithDriver(driver, vm);
if (qemuMonitorRemoveNetdev(priv->mon, netdev_name) < 0)
- VIR_WARN(_("Failed to remove network backend for netdev %s"),
+ VIR_WARN("Failed to remove network backend for netdev %s",
netdev_name);
qemuDomainObjExitMonitorWithDriver(driver, vm);
VIR_FREE(netdev_name);
} else {
- VIR_WARN0(_("Unable to remove network backend"));
+ VIR_WARN0("Unable to remove network backend");
}
} else {
char *hostnet_name;
@@ -7504,7 +7504,7 @@ try_remove:
goto no_memory;
qemuDomainObjEnterMonitorWithDriver(driver, vm);
if (qemuMonitorRemoveHostNetwork(priv->mon, vlan, hostnet_name) < 0)
- VIR_WARN(_("Failed to remove network backend for vlan %d, net %s"),
+ VIR_WARN("Failed to remove network backend for vlan %d, net %s",
vlan, hostnet_name);
qemuDomainObjExitMonitorWithDriver(driver, vm);
VIR_FREE(hostnet_name);
@@ -7518,7 +7518,7 @@ try_tapfd_close:
if (tapfd_name) {
qemuDomainObjEnterMonitorWithDriver(driver, vm);
if (qemuMonitorCloseFileHandle(priv->mon, tapfd_name) < 0)
- VIR_WARN(_("Failed to close tapfd with '%s'"), tapfd_name);
+ VIR_WARN("Failed to close tapfd with '%s'", tapfd_name);
qemuDomainObjExitMonitorWithDriver(driver, vm);
}
diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c
index ec3d69d..3df078a 100644
--- a/src/qemu/qemu_monitor_text.c
+++ b/src/qemu/qemu_monitor_text.c
@@ -1445,42 +1445,42 @@ qemuMonitorTextParsePciAddReply(qemuMonitorPtr mon ATTRIBUTE_UNUSED,
s += strlen("domain ");
if (virStrToLong_ui(s, &e, 10, &addr->domain) == -1) {
- VIR_WARN(_("Unable to parse domain number '%s'"), s);
+ VIR_WARN("Unable to parse domain number '%s'", s);
return -1;
}
if (!STRPREFIX(e, ", ")) {
- VIR_WARN(_("Expected ', ' parsing pci_add reply '%s'"), s);
+ VIR_WARN("Expected ', ' parsing pci_add reply '%s'", s);
return -1;
}
s = e + 2;
}
if (!STRPREFIX(s, "bus ")) {
- VIR_WARN(_("Expected 'bus ' parsing pci_add reply '%s'"), s);
+ VIR_WARN("Expected 'bus ' parsing pci_add reply '%s'", s);
return -1;
}
s += strlen("bus ");
if (virStrToLong_ui(s, &e, 10, &addr->bus) == -1) {
- VIR_WARN(_("Unable to parse bus number '%s'"), s);
+ VIR_WARN("Unable to parse bus number '%s'", s);
return -1;
}
if (!STRPREFIX(e, ", ")) {
- VIR_WARN(_("Expected ', ' parsing pci_add reply '%s'"), s);
+ VIR_WARN("Expected ', ' parsing pci_add reply '%s'", s);
return -1;
}
s = e + 2;
if (!STRPREFIX(s, "slot ")) {
- VIR_WARN(_("Expected 'slot ' parsing pci_add reply '%s'"), s);
+ VIR_WARN("Expected 'slot ' parsing pci_add reply '%s'", s);
return -1;
}
s += strlen("slot ");
if (virStrToLong_ui(s, &e, 10, &addr->slot) == -1) {
- VIR_WARN(_("Unable to parse slot number '%s'"), s);
+ VIR_WARN("Unable to parse slot number '%s'", s);
return -1;
}
@@ -2029,25 +2029,25 @@ qemudParseDriveAddReply(const char *reply,
s += strlen("bus ");
if (virStrToLong_ui(s, &e, 10, &addr->bus) == -1) {
- VIR_WARN(_("Unable to parse bus '%s'"), s);
+ VIR_WARN("Unable to parse bus '%s'", s);
return -1;
}
if (!STRPREFIX(e, ", ")) {
- VIR_WARN(_("Expected ', ' parsing drive_add reply '%s'"), s);
+ VIR_WARN("Expected ', ' parsing drive_add reply '%s'", s);
return -1;
}
s = e + 2;
}
if (!STRPREFIX(s, "unit ")) {
- VIR_WARN(_("Expected 'unit ' parsing drive_add reply '%s'"), s);
+ VIR_WARN("Expected 'unit ' parsing drive_add reply '%s'", s);
return -1;
}
s += strlen("bus ");
if (virStrToLong_ui(s, &e, 10, &addr->unit) == -1) {
- VIR_WARN(_("Unable to parse unit number '%s'"), s);
+ VIR_WARN("Unable to parse unit number '%s'", s);
return -1;
}
diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c
index ffb87c8..9a9cdc2 100644
--- a/src/uml/uml_driver.c
+++ b/src/uml/uml_driver.c
@@ -881,25 +881,25 @@ static int umlStartVMDaemon(virConnectPtr conn,
tmp = progenv;
while (*tmp) {
if (safewrite(logfd, *tmp, strlen(*tmp)) < 0)
- VIR_WARN(_("Unable to write envv to logfile: %s"),
+ VIR_WARN("Unable to write envv to logfile: %s",
virStrerror(errno, ebuf, sizeof ebuf));
if (safewrite(logfd, " ", 1) < 0)
- VIR_WARN(_("Unable to write envv to logfile: %s"),
+ VIR_WARN("Unable to write envv to logfile: %s",
virStrerror(errno, ebuf, sizeof ebuf));
tmp++;
}
tmp = argv;
while (*tmp) {
if (safewrite(logfd, *tmp, strlen(*tmp)) < 0)
- VIR_WARN(_("Unable to write argv to logfile: %s"),
+ VIR_WARN("Unable to write argv to logfile: %s",
virStrerror(errno, ebuf, sizeof ebuf));
if (safewrite(logfd, " ", 1) < 0)
- VIR_WARN(_("Unable to write argv to logfile: %s"),
+ VIR_WARN("Unable to write argv to logfile: %s",
virStrerror(errno, ebuf, sizeof ebuf));
tmp++;
}
if (safewrite(logfd, "\n", 1) < 0)
- VIR_WARN(_("Unable to write argv to logfile: %s"),
+ VIR_WARN("Unable to write argv to logfile: %s",
virStrerror(errno, ebuf, sizeof ebuf));
priv->monitor = -1;
@@ -947,7 +947,7 @@ static void umlShutdownVMDaemon(virConnectPtr conn ATTRIBUTE_UNUSED,
priv->monitor = -1;
if ((ret = waitpid(vm->pid, NULL, 0)) != vm->pid) {
- VIR_WARN(_("Got unexpected pid %d != %d"),
+ VIR_WARN("Got unexpected pid %d != %d",
ret, vm->pid);
}
diff --git a/src/util/logging.c b/src/util/logging.c
index 6bc2ccf..248c47e 100644
--- a/src/util/logging.c
+++ b/src/util/logging.c
@@ -330,7 +330,7 @@ error:
*/
int virLogSetDefaultPriority(int priority) {
if ((priority < VIR_LOG_DEBUG) || (priority > VIR_LOG_ERROR)) {
- VIR_WARN0(_("Ignoring invalid log level setting."));
+ VIR_WARN0("Ignoring invalid log level setting.");
return(-1);
}
if (!virLogInitialized)
@@ -781,7 +781,7 @@ int virLogParseOutputs(const char *outputs) {
ret = count;
cleanup:
if (ret == -1)
- VIR_WARN0(_("Ignoring invalid log output setting."));
+ VIR_WARN0("Ignoring invalid log output setting.");
return(ret);
}
@@ -837,7 +837,7 @@ int virLogParseFilters(const char *filters) {
ret = count;
cleanup:
if (ret == -1)
- VIR_WARN0(_("Ignoring invalid log filter setting."));
+ VIR_WARN0("Ignoring invalid log filter setting.");
return(ret);
}
@@ -959,7 +959,7 @@ int virLogParseDefaultPriority(const char *priority) {
else if (STREQ(priority, "4") || STREQ(priority, "error"))
ret = virLogSetDefaultPriority(VIR_LOG_ERROR);
else
- VIR_WARN0(_("Ignoring invalid log level setting"));
+ VIR_WARN0("Ignoring invalid log level setting");
return ret;
}
diff --git a/src/util/pci.c b/src/util/pci.c
index a1bd8e3..b93f28c 100644
--- a/src/util/pci.c
+++ b/src/util/pci.c
@@ -173,7 +173,7 @@ pciOpenConfig(pciDevice *dev)
fd = open(dev->path, O_RDWR);
if (fd < 0) {
char ebuf[1024];
- VIR_WARN(_("Failed to open config space file '%s': %s"),
+ VIR_WARN("Failed to open config space file '%s': %s",
dev->path, virStrerror(errno, ebuf, sizeof(ebuf)));
return -1;
}
@@ -193,7 +193,7 @@ pciRead(pciDevice *dev, unsigned pos, uint8_t *buf, unsigned buflen)
if (lseek(dev->fd, pos, SEEK_SET) != pos ||
saferead(dev->fd, buf, buflen) != buflen) {
char ebuf[1024];
- VIR_WARN(_("Failed to read from '%s' : %s"), dev->path,
+ VIR_WARN("Failed to read from '%s' : %s", dev->path,
virStrerror(errno, ebuf, sizeof(ebuf)));
return -1;
}
@@ -233,7 +233,7 @@ pciWrite(pciDevice *dev, unsigned pos, uint8_t *buf, unsigned buflen)
if (lseek(dev->fd, pos, SEEK_SET) != pos ||
safewrite(dev->fd, buf, buflen) != buflen) {
char ebuf[1024];
- VIR_WARN(_("Failed to write to '%s' : %s"), dev->path,
+ VIR_WARN("Failed to write to '%s' : %s", dev->path,
virStrerror(errno, ebuf, sizeof(ebuf)));
return -1;
}
@@ -730,7 +730,7 @@ recheck:
if (virRun(backprobe, NULL) < 0 &&
virRun(stubprobe, NULL) < 0) {
char ebuf[1024];
- VIR_WARN(_("failed to load pci-stub or pciback drivers: %s"),
+ VIR_WARN("failed to load pci-stub or pciback drivers: %s",
virStrerror(errno, ebuf, sizeof ebuf));
return 0;
}
diff --git a/src/xen/proxy_internal.c b/src/xen/proxy_internal.c
index 1efdb83..db209d1 100644
--- a/src/xen/proxy_internal.c
+++ b/src/xen/proxy_internal.c
@@ -240,7 +240,7 @@ virProxyCloseSocket(xenUnifiedPrivatePtr priv) {
ret = close(priv->proxy);
if (ret != 0)
- VIR_WARN(_("Failed to close socket %d"), priv->proxy);
+ VIR_WARN("Failed to close socket %d", priv->proxy);
else
VIR_DEBUG("Closed socket %d", priv->proxy);
priv->proxy = -1;
@@ -297,7 +297,7 @@ virProxyWriteClientSocket(int fd, const char *data, int len) {
ret = safewrite(fd, data, len);
if (ret < 0) {
- VIR_WARN(_("Failed to write to socket %d"), fd);
+ VIR_WARN("Failed to write to socket %d", fd);
return(-1);
}
VIR_DEBUG("wrote %d bytes to socket %d",
@@ -452,7 +452,7 @@ retry:
goto error;
}
if (res->serial != serial) {
- VIR_WARN(_("got asynchronous packet number %d"), res->serial);
+ VIR_WARN("got asynchronous packet number %d", res->serial);
goto retry;
}
--
1.7.1.259.g3aef8
More information about the libvir-list
mailing list