If error reporting is disabled, RaiseFullError will log the passed message, but it will not wipe out the previous error and won't trigger the error callback. Signed-off-by: Cole Robinson <crobinso(a)redhat.com&gt; --- src/util/virterror.c | 82 ++++++++++++++++++++++++++++++++++------- src/util/virterror_internal.h | 2 + 2 files changed, 70 insertions(+), 14 deletions(-) diff --git a/src/util/virterror.c b/src/util/virterror.c index 7b7543b..58b3086 100644 --- a/src/util/virterror.c +++ b/src/util/virterror.c @@ -26,6 +26,7 @@ virThreadLocal virThreadErrorStateIdx; typedef struct virThreadErrorState { virErrorPtr lastError; + unsigned int enableErrors; } virThreadErrorState; typedef virThreadErrorState *virThreadErrorStatePtr; @@ -274,6 +275,8 @@ virThreadErrorStateObject(void) return NULL; if (VIR_ALLOC(state->lastError) < 0) return NULL; + + state->enableErrors = 1; virThreadLocalSet(&virThreadErrorStateIdx, state); } return state; @@ -289,6 +292,49 @@ virLastErrorObject(void) return state->lastError; } +static unsigned int +virGetEnableErrors(void) +{ + virThreadErrorStatePtr state = virThreadErrorStateObject(); + if (!state) + return 1; + + return state->enableErrors; +} + +static void +virSetEnableErrors(unsigned int val) +{ + virThreadErrorStatePtr state = virThreadErrorStateObject(); + if (!state) + return; + + state->enableErrors = val ? 1 : 0; +} + +/* + * Enable error reporting and error callback launching (on by default) + */ +void +virEnableErrors(void) +{ + virSetEnableErrors(1); +} + +/* + * Disable error reporting and error callback launching. Calls to + * ReportFullError will log the message, but the previous error will remain + * intact. + * + * This is useful when we want to ensure that some clean up path will + * not stomp all over the original error report. + */ +void +virDisableErrors(void) +{ + virSetEnableErrors(0); +} + /** * virGetLastError: * @@ -669,21 +715,10 @@ virRaiseErrorFull(virConnectPtr conn, if (!to) return; /* Hit OOM allocating thread error object, sod all we can do now */ - virResetError(to); - - if (code == VIR_ERR_OK) + /* If code is OK, clear the previous error and return. */ + if (code == VIR_ERR_OK) { + virResetError(to); return; - - /* - * try to find the best place to save and report the error - */ - if (conn != NULL) { - virMutexLock(&conn->lock); - if (conn->handler != NULL) { - handler = conn->handler; - userData = conn->userData; - } - virMutexUnlock(&conn->lock); } /* @@ -702,6 +737,25 @@ virRaiseErrorFull(virConnectPtr conn, virLogMessage(virErrorDomainName(domain), virErrorLevelPriority(level), funcname, linenr, 1, "%s", str); + /* Error reporting has been deliberately disabled, don't wipe out the + * previous error, just log what was passed and return. */ + if (!virGetEnableErrors()) { + VIR_FREE(str); + return; + } + + /* + * try to find the best place to save and report the error + */ + if (conn != NULL) { + virMutexLock(&conn->lock); + if (conn->handler != NULL) { + handler = conn->handler; + userData = conn->userData; + } + virMutexUnlock(&conn->lock); + } + /* * Save the information about the error */ diff --git a/src/util/virterror_internal.h b/src/util/virterror_internal.h index da89de7..2f0e327 100644 --- a/src/util/virterror_internal.h +++ b/src/util/virterror_internal.h @@ -89,6 +89,8 @@ void virReportOOMErrorFull(virConnectPtr conn, virReportOOMErrorFull((conn), VIR_FROM_THIS, \ __FILE__, __FUNCTION__, __LINE__) +void virEnableErrors(void); +void virDisableErrors(void); void virSetGlobalError(void); void virSetConnError(virConnectPtr conn); -- 1.6.5.1

Signed-off-by: Cole Robinson <crobinso(a)redhat.com&gt; --- src/libvirt.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index 2c50790..2bb24e1 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -3032,6 +3032,10 @@ virDomainMigrateVersion2 (virDomainPtr domain, ret = domain->conn->driver->domainMigratePerform (domain, cookie, cookielen, uri, flags, dname, bandwidth); + /* Perform failed. Disable error reporting to 'Finish' doesn't squash */ + if (ret < 0) + virDisableErrors(); + /* In version 2 of the migration protocol, we pass the * status code from the sender to the destination host, * so it can do any cleanup if the migration failed. @@ -3041,6 +3045,7 @@ virDomainMigrateVersion2 (virDomainPtr domain, (dconn, dname, cookie, cookielen, uri, flags, ret); done: + virEnableErrors(); VIR_FREE (uri_out); VIR_FREE (cookie); return ddomain; -- 1.6.5.1

This shouldn't be necessary, as the ideal case is only a single error message is raised before a routine exits, and it will be printed by the default handler. However, libvirt bugs can cause several errors to be raised over one another, and non default error handlers (like virsh's) will hide these. And now with the ability to temporarily disable error raising, we want to be sure that these interim messages are logged in some way. Signed-off-by: Cole Robinson <crobinso(a)redhat.com&gt; --- src/util/logging.c | 3 ++- src/util/virterror.c | 9 ++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/util/logging.c b/src/util/logging.c index 4899de6..d2c355c 100644 --- a/src/util/logging.c +++ b/src/util/logging.c @@ -504,7 +504,8 @@ cleanup: * @priority: the priority level * @funcname: the function emitting the (debug) message * @linenr: line where the message was emitted - * @flags: extra flags, 1 if coming from the error handler + * @flags: extra flags, 1 if the message shouldn't be logged to stderr + * when no logging handlers are set up. * @fmt: the string format * @...: the arguments * diff --git a/src/util/virterror.c b/src/util/virterror.c index 58b3086..f4c8766 100644 --- a/src/util/virterror.c +++ b/src/util/virterror.c @@ -705,6 +705,7 @@ virRaiseErrorFull(virConnectPtr conn, void *userData = virUserData; virErrorFunc handler = virErrorHandler; char *str; + int logging_flags; /* * All errors are recorded in thread local storage @@ -730,12 +731,18 @@ virRaiseErrorFull(virConnectPtr conn, VIR_GET_VAR_STR(fmt, str); } + /* Only print message to stderr if log level == DEBUG */ + if (virLogGetDefaultPriority() == VIR_LOG_DEBUG) + logging_flags = 0; + else + logging_flags = 1; + /* * Hook up the error or warning to the logging facility * XXXX should we include filename as 'category' instead of domain name ? */ virLogMessage(virErrorDomainName(domain), virErrorLevelPriority(level), - funcname, linenr, 1, "%s", str); + funcname, linenr, logging_flags, "%s", str); /* Error reporting has been deliberately disabled, don't wipe out the * previous error, just log what was passed and return. */ -- 1.6.5.1