Replace use of openvzError with virReportError

Update the OpenVZ driver to use virReportError instead of
the openvzError custom macro
Signed-off-by: NDaniel P. Berrange <berrange@redhat.com>

cfg.mk

@@ -516,7 +516,6 @@ msg_gen_function += XENXS_ERROR
 msg_gen_function += lxcError
 msg_gen_function += libxlError
 msg_gen_function += nodeReportError
-msg_gen_function += openvzError
 msg_gen_function += regerror
 msg_gen_function += remoteError
 msg_gen_function += statsError

src/openvz/openvz_conf.c

@@ -120,8 +120,8 @@ int openvzExtractVersion(struct openvz_driver *driver)
         return 0;
 
     if (openvzExtractVersionInfo(VZCTL, &driver->version) < 0) {
-        openvzError(VIR_ERR_INTERNAL_ERROR, "%s",
-                    _("Could not extract vzctl version"));
+        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                       _("Could not extract vzctl version"));
         return -1;
     }
 
@@ -234,9 +234,9 @@ openvzReadNetworkConf(virDomainDefPtr def,
      */
     ret = openvzReadVPSConfigParam(veid, "IP_ADDRESS", &temp);
     if (ret < 0) {
-        openvzError(VIR_ERR_INTERNAL_ERROR,
-                    _("Could not read 'IP_ADDRESS' from config for container %d"),
-                    veid);
+        virReportError(VIR_ERR_INTERNAL_ERROR,
+                       _("Could not read 'IP_ADDRESS' from config for container %d"),
+                       veid);
         goto error;
     } else if (ret > 0) {
         token = strtok_r(temp, " ", &saveptr);
@@ -266,9 +266,9 @@ openvzReadNetworkConf(virDomainDefPtr def,
      */
     ret = openvzReadVPSConfigParam(veid, "NETIF", &temp);
     if (ret < 0) {
-        openvzError(VIR_ERR_INTERNAL_ERROR,
-                    _("Could not read 'NETIF' from config for container %d"),
-                    veid);
+        virReportError(VIR_ERR_INTERNAL_ERROR,
+                       _("Could not read 'NETIF' from config for container %d"),
+                       veid);
         goto error;
     } else if (ret > 0) {
         token = strtok_r(temp, ";", &saveptr);
@@ -292,8 +292,8 @@ openvzReadNetworkConf(virDomainDefPtr def,
                     p += 12;
                     len = next - p;
                     if (len > 16) {
-                        openvzError(VIR_ERR_INTERNAL_ERROR, "%s",
-                                    _("Too long network device name"));
+                        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                                       _("Too long network device name"));
                         goto error;
                     }
 
@@ -301,16 +301,16 @@ openvzReadNetworkConf(virDomainDefPtr def,
                         goto no_memory;
 
                     if (virStrncpy(net->ifname, p, len, len+1) == NULL) {
-                        openvzError(VIR_ERR_INTERNAL_ERROR,
-                                    _("Network ifname %s too long for destination"), p);
+                        virReportError(VIR_ERR_INTERNAL_ERROR,
+                                       _("Network ifname %s too long for destination"), p);
                         goto error;
                     }
                 } else if (STRPREFIX(p, "bridge=")) {
                     p += 7;
                     len = next - p;
                     if (len > 16) {
-                        openvzError(VIR_ERR_INTERNAL_ERROR, "%s",
-                                    _("Too long bridge device name"));
+                        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                                       _("Too long bridge device name"));
                         goto error;
                     }
 
@@ -318,26 +318,26 @@ openvzReadNetworkConf(virDomainDefPtr def,
                         goto no_memory;
 
                     if (virStrncpy(net->data.bridge.brname, p, len, len+1) == NULL) {
-                        openvzError(VIR_ERR_INTERNAL_ERROR,
-                                    _("Bridge name %s too long for destination"), p);
+                        virReportError(VIR_ERR_INTERNAL_ERROR,
+                                       _("Bridge name %s too long for destination"), p);
                         goto error;
                     }
                 } else if (STRPREFIX(p, "mac=")) {
                     p += 4;
                     len = next - p;
                     if (len != 17) { /* should be 17 */
-                        openvzError(VIR_ERR_INTERNAL_ERROR, "%s",
-                                    _("Wrong length MAC address"));
+                        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                                       _("Wrong length MAC address"));
                         goto error;
                     }
                     if (virStrncpy(cpy_temp, p, len, sizeof(cpy_temp)) == NULL) {
-                        openvzError(VIR_ERR_INTERNAL_ERROR,
-                                    _("MAC address %s too long for destination"), p);
+                        virReportError(VIR_ERR_INTERNAL_ERROR,
+                                       _("MAC address %s too long for destination"), p);
                         goto error;
                     }
                     if (virMacAddrParse(cpy_temp, &net->mac) < 0) {
-                        openvzError(VIR_ERR_INTERNAL_ERROR, "%s",
-                                    _("Wrong MAC address"));
+                        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                                       _("Wrong MAC address"));
                         goto error;
                     }
                 }
@@ -411,9 +411,9 @@ openvzReadFSConf(virDomainDefPtr def,
 
     ret = openvzReadVPSConfigParam(veid, "OSTEMPLATE", &temp);
     if (ret < 0) {
-        openvzError(VIR_ERR_INTERNAL_ERROR,
-                    _("Could not read 'OSTEMPLATE' from config for container %d"),
-                    veid);
+        virReportError(VIR_ERR_INTERNAL_ERROR,
+                       _("Could not read 'OSTEMPLATE' from config for container %d"),
+                       veid);
         goto error;
     } else if (ret > 0) {
         if (VIR_ALLOC(fs) < 0)
@@ -425,9 +425,9 @@ openvzReadFSConf(virDomainDefPtr def,
         /* OSTEMPLATE was not found, VE was booted from a private dir directly */
         ret = openvzReadVPSConfigParam(veid, "VE_PRIVATE", &temp);
         if (ret <= 0) {
-            openvzError(VIR_ERR_INTERNAL_ERROR,
-                        _("Could not read 'VE_PRIVATE' from config for container %d"),
-                        veid);
+            virReportError(VIR_ERR_INTERNAL_ERROR,
+                           _("Could not read 'VE_PRIVATE' from config for container %d"),
+                           veid);
             goto error;
         }
 
@@ -449,9 +449,9 @@ openvzReadFSConf(virDomainDefPtr def,
     ret = openvzReadVPSConfigParam(veid, param, &temp);
     if (ret > 0) {
         if (openvzParseBarrierLimit(temp, &barrier, &limit)) {
-            openvzError(VIR_ERR_INTERNAL_ERROR,
-                        _("Could not read '%s' from config for container %d"),
-                        param, veid);
+            virReportError(VIR_ERR_INTERNAL_ERROR,
+                           _("Could not read '%s' from config for container %d"),
+                           param, veid);
             goto error;
         } else {
             /* Ensure that we can multiply by 1024 without overflowing. */
@@ -503,16 +503,16 @@ openvzReadMemConf(virDomainDefPtr def, int veid)
     param = "VMGUARPAGES";
     ret = openvzReadVPSConfigParam(veid, param, &temp);
     if (ret < 0) {
-        openvzError(VIR_ERR_INTERNAL_ERROR,
-                    _("Could not read '%s' from config for container %d"),
-                    param, veid);
+        virReportError(VIR_ERR_INTERNAL_ERROR,
+                       _("Could not read '%s' from config for container %d"),
+                       param, veid);
         goto error;
     } else if (ret > 0) {
         ret = openvzParseBarrierLimit(temp, &barrier, NULL);
         if (ret < 0) {
-            openvzError(VIR_ERR_INTERNAL_ERROR,
-                        _("Could not parse barrier of '%s' "
-                          "from config for container %d"), param, veid);
+            virReportError(VIR_ERR_INTERNAL_ERROR,
+                           _("Could not parse barrier of '%s' "
+                             "from config for container %d"), param, veid);
             goto error;
         }
         if (barrier == LONG_MAX)
@@ -525,16 +525,16 @@ openvzReadMemConf(virDomainDefPtr def, int veid)
     param = "PRIVVMPAGES";
     ret = openvzReadVPSConfigParam(veid, param, &temp);
     if (ret < 0) {
-        openvzError(VIR_ERR_INTERNAL_ERROR,
-                    _("Could not read '%s' from config for container %d"),
-                    param, veid);
+        virReportError(VIR_ERR_INTERNAL_ERROR,
+                       _("Could not read '%s' from config for container %d"),
+                       param, veid);
         goto error;
     } else if (ret > 0) {
         ret = openvzParseBarrierLimit(temp, &barrier, &limit);
         if (ret < 0) {
-            openvzError(VIR_ERR_INTERNAL_ERROR,
-                        _("Could not parse barrier and limit of '%s' "
-                          "from config for container %d"), param, veid);
+            virReportError(VIR_ERR_INTERNAL_ERROR,
+                           _("Could not parse barrier and limit of '%s' "
+                             "from config for container %d"), param, veid);
             goto error;
         }
         if (barrier == LONG_MAX)
@@ -592,8 +592,8 @@ int openvzLoadDomains(struct openvz_driver *driver) {
         if (virStrToLong_i(line, &status, 10, &veid) < 0 ||
             *status++ != ' ' ||
             (line = strchr(status, '\n')) == NULL) {
-            openvzError(VIR_ERR_INTERNAL_ERROR, "%s",
-                        _("Failed to parse vzlist output"));
+            virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                           _("Failed to parse vzlist output"));
             goto cleanup;
         }
         *line++ = '\0';
@@ -602,8 +602,8 @@ int openvzLoadDomains(struct openvz_driver *driver) {
             goto no_memory;
 
         if (virMutexInit(&dom->lock) < 0) {
-            openvzError(VIR_ERR_INTERNAL_ERROR, "%s",
-                        _("cannot initialize mutex"));
+            virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                           _("cannot initialize mutex"));
             VIR_FREE(dom);
             goto cleanup;
         }
@@ -639,8 +639,8 @@ int openvzLoadDomains(struct openvz_driver *driver) {
         ret = virUUIDParse(uuidstr, dom->def->uuid);
 
         if (ret == -1) {
-            openvzError(VIR_ERR_INTERNAL_ERROR, "%s",
-                        _("UUID in config file malformed"));
+            virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                           _("UUID in config file malformed"));
             goto cleanup;
         }
 
@@ -651,9 +651,9 @@ int openvzLoadDomains(struct openvz_driver *driver) {
 
         ret = openvzReadVPSConfigParam(veid, "CPUS", &temp);
         if (ret < 0) {
-            openvzError(VIR_ERR_INTERNAL_ERROR,
-                        _("Could not read config for container %d"),
-                        veid);
+            virReportError(VIR_ERR_INTERNAL_ERROR,
+                           _("Could not read config for container %d"),
+                           veid);
             goto cleanup;
         } else if (ret > 0) {
             dom->def->maxvcpus = strtoI(temp);
@@ -671,15 +671,15 @@ int openvzLoadDomains(struct openvz_driver *driver) {
 
         virUUIDFormat(dom->def->uuid, uuidstr);
         if (virHashLookup(driver->domains.objs, uuidstr)) {
-            openvzError(VIR_ERR_INTERNAL_ERROR,
-                        _("Duplicate container UUID %s detected for %d"),
-                        uuidstr,
-                        veid);
+            virReportError(VIR_ERR_INTERNAL_ERROR,
+                           _("Duplicate container UUID %s detected for %d"),
+                           uuidstr,
+                           veid);
             goto cleanup;
         }
         if (virHashAddEntry(driver->domains.objs, uuidstr, dom) < 0) {
-            openvzError(VIR_ERR_INTERNAL_ERROR,
-                        _("Could not add UUID for container %d"), veid);
+            virReportError(VIR_ERR_INTERNAL_ERROR,
+                           _("Could not add UUID for container %d"), veid);
             goto cleanup;
         }
 
@@ -1048,8 +1048,8 @@ openvzGetVPSUUID(int vpsid, char *uuidstr, size_t len)
 
         if (iden != NULL && uuidbuf != NULL && STREQ(iden, "#UUID:")) {
             if (virStrcpy(uuidstr, uuidbuf, len) == NULL) {
-                openvzError(VIR_ERR_INTERNAL_ERROR,
-                            _("invalid uuid %s"), uuidbuf);
+                virReportError(VIR_ERR_INTERNAL_ERROR,
+                               _("invalid uuid %s"), uuidbuf);
                 goto cleanup;
             }
             break;
@@ -1110,8 +1110,8 @@ openvzSetUUID(int vpsid){
     unsigned char uuid[VIR_UUID_BUFLEN];
 
     if (virUUIDGenerate(uuid)) {
-        openvzError(VIR_ERR_INTERNAL_ERROR, "%s",
-                    _("Failed to generate UUID"));
+        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                       _("Failed to generate UUID"));
         return -1;
     }
 
@@ -1155,8 +1155,8 @@ static int openvzAssignUUIDs(void)
         errno = 0;
     }
     if (errno) {
-        openvzError(VIR_ERR_INTERNAL_ERROR, "%s",
-                    _("Failed to scan configuration directory"));
+        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                       _("Failed to scan configuration directory"));
         ret = -1;
     }
 
@@ -1193,7 +1193,7 @@ int openvzGetVEID(const char *name) {
     if (ok && veid >= 0)
         return veid;
 
-    openvzError(VIR_ERR_INTERNAL_ERROR, "%s",
-                _("Failed to parse vzlist output"));
+    virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                   _("Failed to parse vzlist output"));
     return -1;
 }

src/openvz/openvz_conf.h

@@ -33,10 +33,6 @@
 # include "domain_conf.h"
 # include "threads.h"
 
-# define openvzError(code, ...)                                            \
-        virReportErrorHelper(VIR_FROM_OPENVZ, code, __FILE__,              \
-                             __FUNCTION__, __LINE__, __VA_ARGS__)
-
 
 /* OpenVZ commands - Replace with wrapper scripts later? */
 # define VZLIST  "/usr/sbin/vzlist"

src/openvz/openvz_util.c

@@ -30,6 +30,7 @@
 #include "openvz_conf.h"
 #include "openvz_util.h"
 
+#define VIR_FROM_THIS VIR_FROM_OPENVZ
 
 long
 openvzKBPerPages(void)
@@ -41,8 +42,8 @@ openvzKBPerPages(void)
         if (kb_per_pages > 0) {
             kb_per_pages /= 1024;
         } else {
-            openvzError(VIR_ERR_INTERNAL_ERROR,
-                        _("Can't determine page size"));
+            virReportError(VIR_ERR_INTERNAL_ERROR,
+                           _("Can't determine page size"));
             kb_per_pages = 0;
             return -1;
         }