xen: Replace statsErrorFunc with a macro

Also mark error messages in block_stats.c for translation, add the
new macro to the msg_gen functions in cfg.mk and add block_stats.c
to po/POTFILES.in

diff --git a/cfg.mk b/cfg.mk
index 94db9379a1210ee6d2381e8958d218b7e3c748c5..e54d170bdd833c42f49efd1ee7a09d5bde89993f 100644 (file)
--- a/cfg.mk
+++ b/cfg.mk
@@ -420,6 +420,7 @@ msg_gen_function += xenUnifiedError
 msg_gen_function += xenXMError
 msg_gen_function += VIR_ERROR
 msg_gen_function += VIR_ERROR0
+msg_gen_function += statsError
 
 # Uncomment the following and run "make syntax-check" to see diagnostics
 # that are not yet marked for translation, but that need to be rewritten

diff --git a/po/POTFILES.in b/po/POTFILES.in
index cfa7cf8ed8e6ef124cc3862a0c00923f469330d7..766f8f6a2fa7a25e270fa40e16ad3e3aba898520 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -114,6 +114,7 @@ src/vbox/vbox_tmpl.c
 src/vmware/vmware_conf.c
 src/vmware/vmware_driver.c
 src/vmx/vmx.c
+src/xen/block_stats.c
 src/xen/xen_driver.c
 src/xen/xen_hypervisor.c
 src/xen/xen_inotify.c

diff --git a/src/xen/block_stats.c b/src/xen/block_stats.c
index a28212c5d5d9723cf50b3b38eed941fe1feadb6d..1cb5455b4257260f0a3a6dc03224d60619d72abb 100644 (file)
--- a/src/xen/block_stats.c
+++ b/src/xen/block_stats.c
@@ -31,34 +31,12 @@
 
 # define VIR_FROM_THIS VIR_FROM_STATS_LINUX
 
-/**
- * statsErrorFunc:
- * @conn: the connection
- * @error: the error number
- * @func: the function failing
- * @info: extra information string
- * @value: extra information number
- *
- * Handle a stats error.
- */
-static void
-statsErrorFunc (virErrorNumber error, const char *func, const char *info,
-                int value)
-{
-    char fullinfo[1000];
-    const char *errmsg;
-
-    errmsg = virErrorMsg(error, info);
-    if (func != NULL) {
-        snprintf(fullinfo, sizeof (fullinfo) - 1, "%s: %s", func, info);
-        fullinfo[sizeof (fullinfo) - 1] = 0;
-        info = fullinfo;
-    }
-    virRaiseError(NULL, NULL, VIR_FROM_STATS_LINUX, error,
-                    VIR_ERR_ERROR,
-                    errmsg, info, NULL, value, 0, errmsg, info,
-                    value);
-}
+
+
+# define statsError(code, ...)                                                 \
+    virReportErrorHelper(VIR_FROM_THIS, code, __FILE__, __FUNCTION__,         \
+                         __LINE__, __VA_ARGS__)
+
 
 /*-------------------- Xen: block stats --------------------*/
 
@@ -194,8 +172,9 @@ read_bd_stats(xenUnifiedPrivatePtr priv,
     if (stats->rd_req == -1 && stats->rd_bytes == -1 &&
         stats->wr_req == -1 && stats->wr_bytes == -1 &&
         stats->errs == -1) {
-        statsErrorFunc(VIR_ERR_INTERNAL_ERROR, __FUNCTION__,
-                       "Failed to read any block statistics", domid);
+        statsError(VIR_ERR_INTERNAL_ERROR,
+                   _("Failed to read any block statistics for domain %d"),
+                   domid);
         return -1;
     }
 
@@ -207,8 +186,9 @@ read_bd_stats(xenUnifiedPrivatePtr priv,
         stats->wr_req == 0 && stats->wr_bytes == 0 &&
         stats->errs == 0 &&
         !check_bd_connected (priv, device, domid)) {
-        statsErrorFunc(VIR_ERR_INTERNAL_ERROR, __FUNCTION__,
-                       "Frontend block device not connected", domid);
+        statsError(VIR_ERR_INTERNAL_ERROR,
+                   _("Frontend block device not connected for domain %d"),
+                   domid);
         return -1;
     }
 
@@ -217,18 +197,18 @@ read_bd_stats(xenUnifiedPrivatePtr priv,
      */
     if (stats->rd_bytes > 0) {
         if (stats->rd_bytes >= ((unsigned long long)1)<<(63-9)) {
-            statsErrorFunc(VIR_ERR_INTERNAL_ERROR, __FUNCTION__,
-                           "stats->rd_bytes would overflow 64 bit counter",
-                           domid);
+            statsError(VIR_ERR_INTERNAL_ERROR,
+                       _("stats->rd_bytes would overflow 64 bit counter for domain %d"),
+                       domid);
             return -1;
         }
         stats->rd_bytes *= 512;
     }
     if (stats->wr_bytes > 0) {
         if (stats->wr_bytes >= ((unsigned long long)1)<<(63-9)) {
-            statsErrorFunc(VIR_ERR_INTERNAL_ERROR, __FUNCTION__,
-                           "stats->wr_bytes would overflow 64 bit counter",
-                           domid);
+            statsError(VIR_ERR_INTERNAL_ERROR,
+                       _("stats->wr_bytes would overflow 64 bit counter for domain %d"),
+                       domid);
             return -1;
         }
         stats->wr_bytes *= 512;
@@ -346,20 +326,21 @@ xenLinuxDomainDeviceID(int domid, const char *path)
      * beginning of the strings for better error messages
      */
     else if (strlen(mod_path) >= 7 && STRPREFIX(mod_path, "/dev/sd"))
-        statsErrorFunc(VIR_ERR_INVALID_ARG, __FUNCTION__,
-                       "invalid path, device names must be in the range sda[1-15] - sdiv[1-15]",
-                       domid);
+        statsError(VIR_ERR_INVALID_ARG,
+                   _("invalid path, device names must be in the range "
+                     "sda[1-15] - sdiv[1-15] for domain %d"), domid);
     else if (strlen(mod_path) >= 7 && STRPREFIX(mod_path, "/dev/hd"))
-        statsErrorFunc(VIR_ERR_INVALID_ARG, __FUNCTION__,
-                       "invalid path, device names must be in the range hda[1-63] - hdt[1-63]",
-                       domid);
+        statsError(VIR_ERR_INVALID_ARG,
+                   _("invalid path, device names must be in the range "
+                     "hda[1-63] - hdt[1-63] for domain %d"), domid);
     else if (strlen(mod_path) >= 8 && STRPREFIX(mod_path, "/dev/xvd"))
-        statsErrorFunc(VIR_ERR_INVALID_ARG, __FUNCTION__,
-                       "invalid path, device names must be in the range xvda[1-15] - xvdiz[1-15]",
-                       domid);
+        statsError(VIR_ERR_INVALID_ARG,
+                   _("invalid path, device names must be in the range "
+                     "xvda[1-15] - xvdiz[1-15] for domain %d"), domid);
     else
-        statsErrorFunc(VIR_ERR_INVALID_ARG, __FUNCTION__,
-                       "unsupported path, use xvdN, hdN, or sdN", domid);
+        statsError(VIR_ERR_INVALID_ARG,
+                   _("unsupported path, use xvdN, hdN, or sdN for domain %d"),
+                   domid);
 
     VIR_FREE(mod_path);