On Tue, Feb 09, 2010 at 07:20:33PM +0000, Daniel P. Berrange wrote:
The virConnectPtr is no longer required for error reporting since that is recorded in a thread local. Remove the conn & dom parameters from lxcError since they're unused. Remove virConnectPtr from all other internal LXC driver APIs with exception of APIs which need it to resolve a virNetworkPtr into a bridge device name --- src/lxc/lxc_conf.h | 6 +- src/lxc/lxc_container.c | 6 +- src/lxc/lxc_controller.c | 10 ++-- src/lxc/lxc_driver.c | 142 ++++++++++++++++++++++----------------------- 4 files changed, 80 insertions(+), 84 deletions(-)
diff --git a/src/lxc/lxc_conf.h b/src/lxc/lxc_conf.h index 499617f..d0c5bb1 100644 --- a/src/lxc/lxc_conf.h +++ b/src/lxc/lxc_conf.h @@ -63,8 +63,8 @@ struct __lxc_driver { int lxcLoadDriverConfig(lxc_driver_t *driver); virCapsPtr lxcCapsInit(void);
-#define lxcError(conn, dom, code, fmt...) \ - virReportErrorHelper(conn, VIR_FROM_LXC, code, __FILE__, \ - __FUNCTION__, __LINE__, fmt) +#define lxcError(code, fmt...) \ + virReportErrorHelper(NULL, VIR_FROM_LXC, code, __FILE__, \ + __FUNCTION__, __LINE__, fmt)
ACK, Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel@veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/