[libvirt] [PATCH 15/30] xen: Remove virConnectPtr from xenUnifiedError

--- src/xen/xen_driver.c | 62 +++++++++++++++++++++++++------------------------- 1 files changed, 31 insertions(+), 31 deletions(-) diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c index a5d58d0..fb2f7c7 100644 --- a/src/xen/xen_driver.c +++ b/src/xen/xen_driver.c @@ -72,9 +72,9 @@ static struct xenUnifiedDriver const * const drivers[XEN_UNIFIED_NR_DRIVERS] = { static int inside_daemon; -#define xenUnifiedError(conn, code, ...) \ - virReportErrorHelper(conn, VIR_FROM_XEN, code, __FILE__, \ - __FUNCTION__, __LINE__, __VA_ARGS__) +#define xenUnifiedError(code, ...) \ + virReportErrorHelper(NULL, VIR_FROM_XEN, code, __FILE__, \ + __FUNCTION__, __LINE__, __VA_ARGS__) /** * xenNumaInit: @@ -261,7 +261,7 @@ xenUnifiedOpen (virConnectPtr conn, virConnectAuthPtr auth, int flags) if (conn->uri->path && STRNEQ(conn->uri->path, "") && STRNEQ(conn->uri->path, "/")) { - xenUnifiedError(NULL, VIR_ERR_INTERNAL_ERROR, + xenUnifiedError(VIR_ERR_INTERNAL_ERROR, _("unexpected Xen URI path '%s', try xen:///"), conn->uri->path); return VIR_DRV_OPEN_ERROR; @@ -279,7 +279,7 @@ xenUnifiedOpen (virConnectPtr conn, virConnectAuthPtr auth, int flags) * error unless path is absolute */ if (!conn->uri->path || conn->uri->path[0] != '/') { - xenUnifiedError(NULL, VIR_ERR_INTERNAL_ERROR, + xenUnifiedError(VIR_ERR_INTERNAL_ERROR, _("unexpected Xen URI path '%s', try ///var/lib/xen/xend-socket"), NULLSTR(conn->uri->path)); return VIR_DRV_OPEN_ERROR; @@ -296,8 +296,8 @@ xenUnifiedOpen (virConnectPtr conn, virConnectAuthPtr auth, int flags) return VIR_DRV_OPEN_ERROR; } if (virMutexInit(&priv->lock) < 0) { - xenUnifiedError (NULL, VIR_ERR_INTERNAL_ERROR, - "%s", _("cannot initialise mutex")); + xenUnifiedError(VIR_ERR_INTERNAL_ERROR, + "%s", _("cannot initialise mutex")); VIR_FREE(priv); return VIR_DRV_OPEN_ERROR; } @@ -512,14 +512,14 @@ xenUnifiedGetMaxVcpus (virConnectPtr conn, const char *type) GET_PRIVATE(conn); if (type && STRCASENEQ (type, "Xen")) { - xenUnifiedError (conn, VIR_ERR_INVALID_ARG, __FUNCTION__); + xenUnifiedError(VIR_ERR_INVALID_ARG, __FUNCTION__); return -1; } if (priv->opened[XEN_UNIFIED_HYPERVISOR_OFFSET]) return xenHypervisorGetMaxVcpus (conn, type); else { - xenUnifiedError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + xenUnifiedError(VIR_ERR_NO_SUPPORT, __FUNCTION__); return -1; } } @@ -672,7 +672,7 @@ xenUnifiedDomainLookupByID (virConnectPtr conn, int id) } /* Not found. */ - xenUnifiedError (conn, VIR_ERR_NO_DOMAIN, __FUNCTION__); + xenUnifiedError(VIR_ERR_NO_DOMAIN, __FUNCTION__); return NULL; } @@ -717,7 +717,7 @@ xenUnifiedDomainLookupByUUID (virConnectPtr conn, } /* Not found. */ - xenUnifiedError (conn, VIR_ERR_NO_DOMAIN, __FUNCTION__); + xenUnifiedError(VIR_ERR_NO_DOMAIN, __FUNCTION__); return NULL; } @@ -762,7 +762,7 @@ xenUnifiedDomainLookupByName (virConnectPtr conn, } /* Not found. */ - xenUnifiedError (conn, VIR_ERR_NO_DOMAIN, __FUNCTION__); + xenUnifiedError(VIR_ERR_NO_DOMAIN, __FUNCTION__); return NULL; } @@ -1160,7 +1160,7 @@ xenUnifiedDomainDumpXML (virDomainPtr dom, int flags) return xenProxyDomainDumpXML(dom, flags); } - xenUnifiedError (dom->conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + xenUnifiedError(VIR_ERR_NO_SUPPORT, __FUNCTION__); return NULL; } @@ -1178,7 +1178,7 @@ xenUnifiedDomainXMLFromNative(virConnectPtr conn, if (STRNEQ(format, XEN_CONFIG_FORMAT_XM) && STRNEQ(format, XEN_CONFIG_FORMAT_SEXPR)) { - xenUnifiedError(conn, VIR_ERR_INVALID_ARG, + xenUnifiedError(VIR_ERR_INVALID_ARG, _("unsupported config type %s"), format); return NULL; } @@ -1219,7 +1219,7 @@ xenUnifiedDomainXMLToNative(virConnectPtr conn, if (STRNEQ(format, XEN_CONFIG_FORMAT_XM) && STRNEQ(format, XEN_CONFIG_FORMAT_SEXPR)) { - xenUnifiedError(conn, VIR_ERR_INVALID_ARG, + xenUnifiedError(VIR_ERR_INVALID_ARG, _("unsupported config type %s"), format); goto cleanup; } @@ -1273,7 +1273,7 @@ xenUnifiedDomainMigratePrepare (virConnectPtr dconn, uri_in, uri_out, flags, dname, resource); - xenUnifiedError (dconn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + xenUnifiedError(VIR_ERR_NO_SUPPORT, __FUNCTION__); return -1; } @@ -1292,7 +1292,7 @@ xenUnifiedDomainMigratePerform (virDomainPtr dom, return xenDaemonDomainMigratePerform (dom, cookie, cookielen, uri, flags, dname, resource); - xenUnifiedError (dom->conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + xenUnifiedError(VIR_ERR_NO_SUPPORT, __FUNCTION__); return -1; } @@ -1316,14 +1316,14 @@ xenUnifiedDomainMigrateFinish (virConnectPtr dconn, if (flags & VIR_MIGRATE_PERSIST_DEST) { domain_xml = xenDaemonDomainDumpXML (dom, 0, NULL); if (! domain_xml) { - xenUnifiedError(dconn, VIR_ERR_MIGRATE_PERSIST_FAILED, + xenUnifiedError(VIR_ERR_MIGRATE_PERSIST_FAILED, "%s", _("failed to get XML representation of migrated domain")); goto failure; } dom_new = xenDaemonDomainDefineXML (dconn, domain_xml); if (! dom_new) { - xenUnifiedError(dconn, VIR_ERR_MIGRATE_PERSIST_FAILED, + xenUnifiedError(VIR_ERR_MIGRATE_PERSIST_FAILED, "%s", _("failed to define domain on destination host")); goto failure; } @@ -1516,7 +1516,7 @@ xenUnifiedDomainGetAutostart (virDomainPtr dom, int *autostart) return xenDaemonDomainGetAutostart(dom, autostart); } - xenUnifiedError (dom->conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + xenUnifiedError(VIR_ERR_NO_SUPPORT, __FUNCTION__); return -1; } @@ -1533,7 +1533,7 @@ xenUnifiedDomainSetAutostart (virDomainPtr dom, int autostart) return xenDaemonDomainSetAutostart(dom, autostart); } - xenUnifiedError (dom->conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + xenUnifiedError(VIR_ERR_NO_SUPPORT, __FUNCTION__); return -1; } @@ -1598,7 +1598,7 @@ xenUnifiedDomainBlockStats (virDomainPtr dom, const char *path, if (priv->opened[XEN_UNIFIED_HYPERVISOR_OFFSET]) return xenHypervisorDomainBlockStats (dom, path, stats); - xenUnifiedError (dom->conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + xenUnifiedError(VIR_ERR_NO_SUPPORT, __FUNCTION__); return -1; } @@ -1611,7 +1611,7 @@ xenUnifiedDomainInterfaceStats (virDomainPtr dom, const char *path, if (priv->opened[XEN_UNIFIED_HYPERVISOR_OFFSET]) return xenHypervisorDomainInterfaceStats (dom, path, stats); - xenUnifiedError (dom->conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + xenUnifiedError(VIR_ERR_NO_SUPPORT, __FUNCTION__); return -1; } @@ -1634,7 +1634,7 @@ xenUnifiedDomainBlockPeek (virDomainPtr dom, const char *path, return 0; } - xenUnifiedError (dom->conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + xenUnifiedError(VIR_ERR_NO_SUPPORT, __FUNCTION__); return -1; } @@ -1648,7 +1648,7 @@ xenUnifiedNodeGetCellsFreeMemory (virConnectPtr conn, unsigned long long *freeMe return xenHypervisorNodeGetCellsFreeMemory (conn, freeMems, startCell, maxCells); - xenUnifiedError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + xenUnifiedError(VIR_ERR_NO_SUPPORT, __FUNCTION__); return -1; } @@ -1667,7 +1667,7 @@ xenUnifiedNodeGetFreeMemory (virConnectPtr conn) return(freeMem); } - xenUnifiedError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + xenUnifiedError(VIR_ERR_NO_SUPPORT, __FUNCTION__); return(0); } @@ -1684,7 +1684,7 @@ xenUnifiedDomainEventRegister(virConnectPtr conn, xenUnifiedLock(priv); if (priv->xsWatch == -1) { - xenUnifiedError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + xenUnifiedError(VIR_ERR_NO_SUPPORT, __FUNCTION__); xenUnifiedUnlock(priv); return -1; } @@ -1706,7 +1706,7 @@ xenUnifiedDomainEventDeregister(virConnectPtr conn, xenUnifiedLock(priv); if (priv->xsWatch == -1) { - xenUnifiedError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + xenUnifiedError(VIR_ERR_NO_SUPPORT, __FUNCTION__); xenUnifiedUnlock(priv); return -1; } @@ -1737,7 +1737,7 @@ xenUnifiedDomainEventRegisterAny(virConnectPtr conn, xenUnifiedLock(priv); if (priv->xsWatch == -1) { - xenUnifiedError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + xenUnifiedError(VIR_ERR_NO_SUPPORT, __FUNCTION__); xenUnifiedUnlock(priv); return -1; } @@ -1759,7 +1759,7 @@ xenUnifiedDomainEventDeregisterAny(virConnectPtr conn, xenUnifiedLock(priv); if (priv->xsWatch == -1) { - xenUnifiedError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + xenUnifiedError(VIR_ERR_NO_SUPPORT, __FUNCTION__); xenUnifiedUnlock(priv); return -1; } @@ -1810,7 +1810,7 @@ xenUnifiedNodeDeviceGetPciInfo (virNodeDevicePtr dev, } if (!cap) { - xenUnifiedError(dev->conn, VIR_ERR_INVALID_ARG, + xenUnifiedError(VIR_ERR_INVALID_ARG, _("device %s is not a PCI device"), dev->name); goto out; } -- 1.6.3.3