External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-11 12:25:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

convert missing server entry points into unsupported errors

Browse Source 
If using a remote access, sometimes an RPC entry point is not
available, and currently we just end up with a raw:
    error: unknown procedure: xxx
error, while this should be more cleanly reported as an unsupported
entry point like for local access

* src/remote/remote_driver.c: convert missing remote entry points into
  the unsupported feature error
This commit is contained in:
Daniel Veillard 2009-12-22 17:44:03 +01:00
parent 54f868c164
commit b9daebfee4
1 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/remote/remote_driver.c
View File

@ -8530,6 +8530,27 @@ cleanup:
thiscall->err.message && thiscall->err.message &&
STRPREFIX(*thiscall->err.message, "unknown procedure")) { STRPREFIX(*thiscall->err.message, "unknown procedure")) {
rv = -2; rv = -2;
} else if (thiscall->err.domain == VIR_FROM_REMOTE &&
thiscall->err.code == VIR_ERR_RPC &&
thiscall->err.level == VIR_ERR_ERROR &&
thiscall->err.message &&
STRPREFIX(*thiscall->err.message, "unknown procedure")) {
/*
* convert missing remote entry points into the unsupported
* feature error
*/
virRaiseErrorFull(flags & REMOTE_CALL_IN_OPEN ? NULL : conn,
__FILE__, __FUNCTION__, __LINE__,
thiscall->err.domain,
VIR_ERR_NO_SUPPORT,
thiscall->err.level,
thiscall->err.str1 ? *thiscall->err.str1 : NULL,
thiscall->err.str2 ? *thiscall->err.str2 : NULL,
thiscall->err.str3 ? *thiscall->err.str3 : NULL,
thiscall->err.int1,
thiscall->err.int2,
"%s", *thiscall->err.message);
rv = -1;
} else { } else {
virRaiseErrorFull(flags & REMOTE_CALL_IN_OPEN ? NULL : conn, virRaiseErrorFull(flags & REMOTE_CALL_IN_OPEN ? NULL : conn,
__FILE__, __FUNCTION__, __LINE__, __FILE__, __FUNCTION__, __LINE__,
@ -8541,7 +8562,7 @@ cleanup:
thiscall->err.str3 ? *thiscall->err.str3 : NULL, thiscall->err.str3 ? *thiscall->err.str3 : NULL,
thiscall->err.int1, thiscall->err.int1,
thiscall->err.int2, thiscall->err.int2,
"%s", thiscall->err.message ? *thiscall->err.message : NULL); "%s", thiscall->err.message ? *thiscall->err.message : "unknown");
rv = -1; rv = -1;
} }
xdr_free((xdrproc_t)xdr_remote_error, (char *)&thiscall->err); xdr_free((xdrproc_t)xdr_remote_error, (char *)&thiscall->err);