[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[libvirt] [PATCH 2/4] vz: return event error code in logPrlEventErrorHelper and use it



If PrlEvent_GetErrCode returns an error code this is what we should
use as an error code for the whole action

Signed-off-by: Maxim Nestratov <mnestratov virtuozzo com>
---
 src/vz/vz_sdk.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c
index e5c56a5..7fc7d97 100644
--- a/src/vz/vz_sdk.c
+++ b/src/vz/vz_sdk.c
@@ -100,14 +100,17 @@ logPrlErrorHelper(PRL_RESULT err, const char *filename,
 
 static PRL_RESULT
 logPrlEventErrorHelper(PRL_HANDLE event, const char *filename,
-                       const char *funcname, size_t linenr)
+                       const char *funcname, size_t linenr, PRL_RESULT* retCode)
 {
-    PRL_RESULT ret, retCode;
+    PRL_RESULT ret;
     char *msg1 = NULL, *msg2 = NULL;
     PRL_UINT32 len = 0;
     int err = -1;
 
-    if ((ret = PrlEvent_GetErrCode(event, &retCode))) {
+    if (!retCode)
+        return -1;
+
+    if ((ret = PrlEvent_GetErrCode(event, retCode))) {
         logPrlError(ret);
         return ret;
     }
@@ -164,7 +167,8 @@ getJobResultHelper(PRL_HANDLE job, unsigned int timeout, PRL_HANDLE *result,
             goto cleanup;
         }
 
-        if (logPrlEventErrorHelper(err_handle, filename, funcname, linenr))
+        ret = logPrlEventErrorHelper(err_handle, filename, funcname, linenr, &retCode);
+        if (ret)
             logPrlErrorHelper(retCode, filename, funcname, linenr);
 
         PrlHandle_Free(err_handle);
-- 
1.8.3.1


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]