virterror: Add virSetError

Can be used to re-set an old error, which may have been squashed by
other functions (like cleanup routines). Will be used in subsequent patches

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 10940ebab3986a87cfb6819c9fd5594f2e6381a9..a8947757b1ea104c35d909beec93c6e5c60b3bcb 100644 (file)
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -593,6 +593,7 @@ virRaiseErrorFull;
 virReportSystemErrorFull;
 virReportOOMErrorFull;
 virStrerror;
+virSetError;
 
 
 # xml.h

diff --git a/src/util/virterror.c b/src/util/virterror.c
index bee1242c4c59bdabad30a5b198c04b77f8793c59..e2128b9437a27b1c51af5dd9c2e83e82475bb056 100644 (file)
--- a/src/util/virterror.c
+++ b/src/util/virterror.c
@@ -289,6 +289,28 @@ virGetLastError(void)
     return err;
 }
 
+/**
+ * virSetError:
+ *
+ * Set the current error from a previously saved error object
+ *
+ * Can be used to re-set an old error, which may have been squashed by
+ * other functions (like cleanup routines).
+ *
+ * Returns 0 on success, 1 on failure
+ */
+int
+virSetError(virErrorPtr newerr)
+{
+    virErrorPtr err;
+    err = virGetLastError();
+    if (!err)
+        return -1;
+
+    virResetError(err);
+    return virCopyError(newerr, err);
+}
+
 /**
  * virCopyLastError:
  * @to: target to receive the copy

diff --git a/src/util/virterror_internal.h b/src/util/virterror_internal.h
index c246140b76d4b65b6e18f18908d7b651be2e2a46..c7134976c1be0d99a462a8392ef3eb38e9e1ff54 100644 (file)
--- a/src/util/virterror_internal.h
+++ b/src/util/virterror_internal.h
@@ -90,6 +90,7 @@ void virReportOOMErrorFull(virConnectPtr conn,
                      __FILE__, __FUNCTION__, __LINE__)
 
 
+int virSetError(virErrorPtr newerr);
 void virDispatchError(virConnectPtr conn);
 const char *virStrerror(int theerrno, char *errBuf, size_t errBufLen);