diagnostic fixes on OpenVZ failures

* src/openvz_conf.c src/openvz_conf.h src/openvz_driver.c: applied
patch from Evgeniy Sokolov fixing error diagnostic when exec'ing
OpenVZ commands.
Daniel

diff --git a/ChangeLog b/ChangeLog
index 5be29ada1bf564593ede4770ad90450dd0bb1d67..fb1828d127943cc35a595d70906282b234adcc3b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Jul  9 13:53:25 CEST 2008 Daniel Veillard <veillard@redhat.com>
+
+       * src/openvz_conf.c src/openvz_conf.h src/openvz_driver.c: applied
+         patch from Evgeniy Sokolov fixing error diagnostic when exec'ing
+         OpenVZ commands.
+
 Wed Jul  9 11:25:44 BST 2008 Daniel P. Berrange <berrange@redhat.com>
 
        * tests/testutils.c: Ensure VIR_TEST_DEBUG is used even when

diff --git a/src/openvz_conf.c b/src/openvz_conf.c
index 28c5ef3a219346dda37dfeabb2a217c9ef6d1f9a..32d7258bc7e010dc8e956193e24f15a7db4c57e2 100644 (file)
--- a/src/openvz_conf.c
+++ b/src/openvz_conf.c
@@ -57,21 +57,29 @@
 #include "memory.h"
 
 static char *openvzLocateConfDir(void);
-static void error (virConnectPtr conn, virErrorNumber code, const char *info);
 static struct openvz_vm_def *openvzParseXML(virConnectPtr conn, xmlDocPtr xml);
 static int openvzGetVPSUUID(int vpsid, char *uuidstr);
 static int openvzSetUUID(int vpsid);
 
-/* For errors internal to this library. */
-static void
-error (virConnectPtr conn, virErrorNumber code, const char *info)
+void
+error (virConnectPtr conn, virErrorNumber code, const char *fmt, ...)
 {
+    va_list args;
+    char errorMessage[OPENVZ_MAX_ERROR_LEN];
     const char *errmsg;
 
-    errmsg = __virErrorMsg (code, info);
+    if (fmt) {
+        va_start(args, fmt);
+        vsnprintf(errorMessage, OPENVZ_MAX_ERROR_LEN-1, fmt, args);
+        va_end(args);
+    } else {
+        errorMessage[0] = '\0';
+    }
+
+    errmsg = __virErrorMsg(code, (errorMessage[0] ? errorMessage : NULL));
     __virRaiseError (conn, NULL, NULL, VIR_FROM_OPENVZ,
-                     code, VIR_ERR_ERROR, errmsg, info, NULL, 0, 0,
-                     errmsg, info);
+                     code, VIR_ERR_ERROR, errmsg, errorMessage, NULL, 0, 0,
+                     errmsg, errorMessage);
 }
 
 struct openvz_vm

diff --git a/src/openvz_conf.h b/src/openvz_conf.h
index 84d2b48e67a1e1c6f2b9877451b4e3e417a08e7d..772782fcc27aa31c5b6d2a29dbf498698971abf6 100644 (file)
--- a/src/openvz_conf.h
+++ b/src/openvz_conf.h
@@ -110,6 +110,7 @@ openvzIsActiveVM(struct openvz_vm *vm)
     return vm->vpsid != -1;
 }
 
+void error (virConnectPtr conn, virErrorNumber code, const char *fmt, ...);
 int openvz_readline(int fd, char *ptr, int maxlen);
 struct openvz_vm *openvzFindVMByID(const struct openvz_driver *driver, int id);
 struct openvz_vm *openvzFindVMByUUID(const struct openvz_driver *driver,

diff --git a/src/openvz_driver.c b/src/openvz_driver.c
index 62f202eb2869df747ce6566550f7a0aea270e5f2..52477677a8bd83076b1b9ef71c670e50254bbf47 100644 (file)
--- a/src/openvz_driver.c
+++ b/src/openvz_driver.c
@@ -125,18 +125,6 @@ static void cmdExecFree(char *cmdExec[])
     }
 }
 
-/* For errors internal to this library. */
-static void
-error (virConnectPtr conn, virErrorNumber code, const char *info)
-{
-    const char *errmsg;
-
-    errmsg = __virErrorMsg (code, info);
-    __virRaiseError (conn, NULL, NULL, VIR_FROM_OPENVZ,
-                     code, VIR_ERR_ERROR, errmsg, info, NULL, 0, 0,
-                     errmsg, info);
-}
-
 static virDomainPtr openvzDomainLookupByID(virConnectPtr conn,
                                    int id) {
     struct openvz_driver *driver = (struct openvz_driver *)conn->privateData;
@@ -257,7 +245,8 @@ static int openvzDomainShutdown(virDomainPtr dom) {
 
     ret = virExec(dom->conn, (char **)cmdExec, &pid, -1, &outfd, &errfd);
     if(ret == -1) {
-        error(dom->conn, VIR_ERR_INTERNAL_ERROR, "Could not exec " VZLIST);
+        error(dom->conn, VIR_ERR_INTERNAL_ERROR, 
+              _("Could not exec %s"), VZCTL);
         return -1;
     }
 
@@ -301,7 +290,8 @@ static int openvzDomainReboot(virDomainPtr dom,
     }
     ret = virExec(dom->conn, (char **)cmdExec, &pid, -1, &outfd, &errfd);
     if(ret == -1) {
-        error(dom->conn, VIR_ERR_INTERNAL_ERROR, "Could not exec " VZLIST);
+        error(dom->conn, VIR_ERR_INTERNAL_ERROR, 
+               _("Could not exec %s"), VZCTL);
         return -1;
     }
 
@@ -360,7 +350,8 @@ openvzDomainDefineXML(virConnectPtr conn, const char *xml)
     }
     ret = virExec(conn, (char **)cmdExec, &pid, -1, &outfd, &errfd);
     if(ret == -1) {
-        error(conn, VIR_ERR_INTERNAL_ERROR, "Could not exec " VZLIST);
+        error(conn, VIR_ERR_INTERNAL_ERROR, 
+               _("Could not exec %s"), VZCTL);
         goto bail_out2;
     }
 
@@ -428,7 +419,8 @@ openvzDomainCreateLinux(virConnectPtr conn, const char *xml,
     }
     ret = virExec(conn, (char **)cmdExec, &pid, -1, &outfd, &errfd);
     if(ret == -1) {
-        error(conn, VIR_ERR_INTERNAL_ERROR, "Could not exec " VZLIST);
+        error(conn, VIR_ERR_INTERNAL_ERROR, 
+               _("Could not exec %s"), VZCTL);
         return NULL;
     }
 
@@ -444,7 +436,8 @@ openvzDomainCreateLinux(virConnectPtr conn, const char *xml,
     }
     ret = virExec(conn, (char **)cmdExec, &pid, -1, &outfd, &errfd);
     if(ret == -1) {
-        error(conn, VIR_ERR_INTERNAL_ERROR, "Could not exec " VZLIST);
+        error(conn, VIR_ERR_INTERNAL_ERROR, 
+               _("Could not exec %s"), VZCTL);
         return NULL;
     }
 
@@ -498,7 +491,8 @@ openvzDomainCreate(virDomainPtr dom)
     }
     ret = virExec(dom->conn, (char **)cmdExec, &pid, -1, &outfd, &errfd);
     if(ret == -1) {
-        error(dom->conn, VIR_ERR_INTERNAL_ERROR, "Could not exec " VZLIST);
+        error(dom->conn, VIR_ERR_INTERNAL_ERROR, 
+               _("Could not exec %s"), VZCTL);
         return -1;
     }
 
@@ -541,7 +535,8 @@ openvzDomainUndefine(virDomainPtr dom)
     }
     ret = virExec(conn, (char **)cmdExec, &pid, -1, &outfd, &errfd);
     if(ret == -1) {
-        error(conn, VIR_ERR_INTERNAL_ERROR, "Could not exec " VZLIST);
+        error(conn, VIR_ERR_INTERNAL_ERROR, 
+               _("Could not exec %s"), VZCTL);
         return -1;
     }
 
@@ -633,7 +628,8 @@ static int openvzListDomains(virConnectPtr conn, int *ids, int nids) {
 
     ret = virExec(conn, (char **)cmd, &pid, -1, &outfd, &errfd);
     if(ret == -1) {
-        error(conn, VIR_ERR_INTERNAL_ERROR, "Could not exec " VZLIST);
+        error(conn, VIR_ERR_INTERNAL_ERROR, 
+               _("Could not exec %s"), VZLIST);
         return -1;
     }
 
@@ -664,7 +660,8 @@ static int openvzListDefinedDomains(virConnectPtr conn,
     /* the -S options lists only stopped domains */
     ret = virExec(conn, (char **)cmd, &pid, -1, &outfd, &errfd);
     if(ret == -1) {
-        error(conn, VIR_ERR_INTERNAL_ERROR, "Could not exec " VZLIST);
+        error(conn, VIR_ERR_INTERNAL_ERROR, 
+               _("Could not exec %s"), VZLIST);
         return -1;
     }