aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Bolte <matthias.bolte@googlemail.com>2011-04-16 10:30:22 +0200
committerMatthias Bolte <matthias.bolte@googlemail.com>2011-04-17 07:22:23 +0200
commit60d769a13ac0388472e531919f6de4d77c35a5d3 (patch)
tree7d75197ac2350ada6154389be4fb74658f3842ad /src/xenapi
parenttests: Unit tests for internal hash APIs (diff)
downloadlibvirt-60d769a13ac0388472e531919f6de4d77c35a5d3.tar.gz
libvirt-60d769a13ac0388472e531919f6de4d77c35a5d3.tar.bz2
libvirt-60d769a13ac0388472e531919f6de4d77c35a5d3.zip
Remove virConnectPtr from virRaiseErrorFull
And from all related macros and functions.
Diffstat (limited to 'src/xenapi')
-rw-r--r--src/xenapi/xenapi_driver.c2
-rw-r--r--src/xenapi/xenapi_utils.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/xenapi/xenapi_driver.c b/src/xenapi/xenapi_driver.c
index 60b23c718..3fbdcc654 100644
--- a/src/xenapi/xenapi_driver.c
+++ b/src/xenapi/xenapi_driver.c
@@ -44,7 +44,7 @@
#define VIR_FROM_THIS VIR_FROM_XENAPI
#define xenapiError(code, ...) \
- virReportErrorHelper(NULL, VIR_FROM_THIS, code, __FILE__, \
+ virReportErrorHelper(VIR_FROM_THIS, code, __FILE__, \
__FUNCTION__, __LINE__, __VA_ARGS__)
/*
diff --git a/src/xenapi/xenapi_utils.c b/src/xenapi/xenapi_utils.c
index f50610ad0..ae20bf779 100644
--- a/src/xenapi/xenapi_utils.c
+++ b/src/xenapi/xenapi_utils.c
@@ -386,11 +386,11 @@ xenapiSessionErrorHandle(virConnectPtr conn, virErrorNumber errNum,
if (buf == NULL && priv != NULL && priv->session != NULL) {
char *ret = returnErrorFromSession(priv->session);
- virReportErrorHelper(conn, VIR_FROM_XENAPI, errNum, filename, func, lineno, _("%s"), ret);
+ virReportErrorHelper(VIR_FROM_XENAPI, errNum, filename, func, lineno, _("%s"), ret);
xen_session_clear_error(priv->session);
VIR_FREE(ret);
} else {
- virReportErrorHelper(conn, VIR_FROM_XENAPI, errNum, filename, func, lineno, _("%s"), buf);
+ virReportErrorHelper(VIR_FROM_XENAPI, errNum, filename, func, lineno, _("%s"), buf);
}
}