External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

xen: Remove virConnectPtr from virXenInotifyError

Browse Source
This commit is contained in:
Matthias Bolte 2010-04-03 01:50:56 +02:00
parent 67f34cd67b
commit 7ece483dce
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/xen/xen_inotify.c
View File

@ -44,7 +44,7 @@
#define VIR_FROM_THIS VIR_FROM_XEN_INOTIFY #define VIR_FROM_THIS VIR_FROM_XEN_INOTIFY
#define virXenInotifyError(conn, code, ...) \ #define virXenInotifyError(code, ...) \
virReportErrorHelper(NULL, VIR_FROM_XEN_INOTIFY, code, __FILE__, \ virReportErrorHelper(NULL, VIR_FROM_XEN_INOTIFY, code, __FILE__, \
__FUNCTION__, __LINE__, __VA_ARGS__) __FUNCTION__, __LINE__, __VA_ARGS__)
@ -129,7 +129,7 @@ xenInotifyXendDomainsDirLookup(virConnectPtr conn, const char *filename,
uuid_str = filename + strlen(XEND_DOMAINS_DIR) + 1; uuid_str = filename + strlen(XEND_DOMAINS_DIR) + 1;
if (virUUIDParse(uuid_str, rawuuid) < 0) { if (virUUIDParse(uuid_str, rawuuid) < 0) {
virXenInotifyError(NULL, VIR_ERR_INTERNAL_ERROR, virXenInotifyError(VIR_ERR_INTERNAL_ERROR,
_("parsing uuid %s"), uuid_str); _("parsing uuid %s"), uuid_str);
return -1; return -1;
} }
@ -154,7 +154,7 @@ xenInotifyXendDomainsDirLookup(virConnectPtr conn, const char *filename,
return 0; return 0;
} }
} }
virXenInotifyError(NULL, VIR_ERR_INTERNAL_ERROR, virXenInotifyError(VIR_ERR_INTERNAL_ERROR,
"%s", _("finding dom on config list")); "%s", _("finding dom on config list"));
return -1; return -1;
} }
@ -205,7 +205,7 @@ xenInotifyXendDomainsDirRemoveEntry(virConnectPtr conn,
int i; int i;
if (virUUIDParse(uuidstr, uuid) < 0) { if (virUUIDParse(uuidstr, uuid) < 0) {
virXenInotifyError(NULL, VIR_ERR_INTERNAL_ERROR, virXenInotifyError(VIR_ERR_INTERNAL_ERROR,
_("parsing uuid %s"), uuidstr); _("parsing uuid %s"), uuidstr);
return -1; return -1;
} }
@ -241,14 +241,14 @@ xenInotifyXendDomainsDirAddEntry(virConnectPtr conn,
xenUnifiedPrivatePtr priv = conn->privateData; xenUnifiedPrivatePtr priv = conn->privateData;
if (xenInotifyDomainLookup(conn, fname, &name, uuid) < 0) { if (xenInotifyDomainLookup(conn, fname, &name, uuid) < 0) {
virXenInotifyError(NULL, VIR_ERR_INTERNAL_ERROR, virXenInotifyError(VIR_ERR_INTERNAL_ERROR,
"%s", _("Error looking up domain")); "%s", _("Error looking up domain"));
return -1; return -1;
} }
if (xenUnifiedAddDomainInfo(priv->configInfoList, if (xenUnifiedAddDomainInfo(priv->configInfoList,
-1, name, uuid) < 0) { -1, name, uuid) < 0) {
virXenInotifyError(NULL, VIR_ERR_INTERNAL_ERROR, virXenInotifyError(VIR_ERR_INTERNAL_ERROR,
"%s", _("Error adding file to config cache")); "%s", _("Error adding file to config cache"));
VIR_FREE(name); VIR_FREE(name);
return -1; return -1;
@ -294,7 +294,7 @@ xenInotifyEvent(int watch ATTRIBUTE_UNUSED,
if( conn && conn->privateData ) { if( conn && conn->privateData ) {
priv = conn->privateData; priv = conn->privateData;
} else { } else {
virXenInotifyError(NULL, VIR_ERR_INTERNAL_ERROR, virXenInotifyError(VIR_ERR_INTERNAL_ERROR,
"%s", _("conn, or private data is NULL")); "%s", _("conn, or private data is NULL"));
return; return;
} }
@ -337,18 +337,18 @@ reread:
if (event) if (event)
xenUnifiedDomainEventDispatch(conn->privateData, event); xenUnifiedDomainEventDispatch(conn->privateData, event);
else else
virXenInotifyError(NULL, VIR_ERR_INTERNAL_ERROR, virXenInotifyError(VIR_ERR_INTERNAL_ERROR,
"%s", _("looking up dom")); "%s", _("looking up dom"));
if (xenInotifyRemoveDomainConfigInfo(conn, fname) < 0 ) { if (xenInotifyRemoveDomainConfigInfo(conn, fname) < 0 ) {
virXenInotifyError(NULL, VIR_ERR_INTERNAL_ERROR, virXenInotifyError(VIR_ERR_INTERNAL_ERROR,
"%s", _("Error adding file to config cache")); "%s", _("Error adding file to config cache"));
goto cleanup; goto cleanup;
} }
} else if (e->mask & ( IN_CREATE | IN_CLOSE_WRITE | IN_MOVED_TO) ) { } else if (e->mask & ( IN_CREATE | IN_CLOSE_WRITE | IN_MOVED_TO) ) {
virDomainEventPtr event; virDomainEventPtr event;
if (xenInotifyAddDomainConfigInfo(conn, fname) < 0 ) { if (xenInotifyAddDomainConfigInfo(conn, fname) < 0 ) {
virXenInotifyError(NULL, VIR_ERR_INTERNAL_ERROR, virXenInotifyError(VIR_ERR_INTERNAL_ERROR,
"%s", _("Error adding file to config cache")); "%s", _("Error adding file to config cache"));
goto cleanup; goto cleanup;
} }
@ -360,7 +360,7 @@ reread:
if (event) if (event)
xenUnifiedDomainEventDispatch(conn->privateData, event); xenUnifiedDomainEventDispatch(conn->privateData, event);
else else
virXenInotifyError(NULL, VIR_ERR_INTERNAL_ERROR, virXenInotifyError(VIR_ERR_INTERNAL_ERROR,
"%s", _("looking up dom")); "%s", _("looking up dom"));
} }
@ -423,7 +423,7 @@ xenInotifyOpen(virConnectPtr conn,
strcat(path, ent->d_name); strcat(path, ent->d_name);
if (xenInotifyAddDomainConfigInfo(conn, path) < 0 ) { if (xenInotifyAddDomainConfigInfo(conn, path) < 0 ) {
virXenInotifyError(NULL, VIR_ERR_INTERNAL_ERROR, virXenInotifyError(VIR_ERR_INTERNAL_ERROR,
"%s", _("Error adding file to config list")); "%s", _("Error adding file to config list"));
closedir(dh); closedir(dh);
return -1; return -1;