External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-22 11:22:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

nodeinfo: Fix incorrect error codes

Browse Source 
Introduced by 5e495c8b, except the ones for checking if numa
is supported by host, all the NO_SUPPORT are changed back. For
the ones about numa checking, change them into INTERNAL_ERROR.
This commit is contained in:
Osier Yang 2011-09-01 14:43:03 +08:00
parent 6af0c3e82b
commit 03388b6424
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/nodeinfo.c
View File

@ -629,7 +629,7 @@ int nodeGetInfo(virConnectPtr conn ATTRIBUTE_UNUSED, virNodeInfoPtr nodeinfo) {
} }
#else #else
/* XXX Solaris will need an impl later if they port QEMU driver */ /* XXX Solaris will need an impl later if they port QEMU driver */
nodeReportError(VIR_ERR_OPERATION_INVALID, "%s", nodeReportError(VIR_ERR_NO_SUPPORT, "%s",
_("node info not implemented on this platform")); _("node info not implemented on this platform"));
return -1; return -1;
#endif #endif
@ -658,7 +658,7 @@ int nodeGetCPUStats(virConnectPtr conn ATTRIBUTE_UNUSED,
return ret; return ret;
} }
#else #else
nodeReportError(VIR_ERR_OPERATION_INVALID, "%s", nodeReportError(VIR_ERR_NO_SUPPORT, "%s",
_("node CPU stats not implemented on this platform")); _("node CPU stats not implemented on this platform"));
return -1; return -1;
#endif #endif
@ -688,7 +688,7 @@ int nodeGetMemoryStats(virConnectPtr conn ATTRIBUTE_UNUSED,
# if HAVE_NUMACTL # if HAVE_NUMACTL
if (numa_available() < 0) { if (numa_available() < 0) {
# endif # endif
nodeReportError(VIR_ERR_OPERATION_INVALID, nodeReportError(VIR_ERR_INTERNAL_ERROR,
"%s", _("NUMA not supported on this host")); "%s", _("NUMA not supported on this host"));
return -1; return -1;
# if HAVE_NUMACTL # if HAVE_NUMACTL
@ -724,7 +724,7 @@ int nodeGetMemoryStats(virConnectPtr conn ATTRIBUTE_UNUSED,
return ret; return ret;
} }
#else #else
nodeReportError(VIR_ERR_OPERATION_INVALID, "%s", nodeReportError(VIR_ERR_NO_SUPPORT, "%s",
_("node memory stats not implemented on this platform")); _("node memory stats not implemented on this platform"));
return -1; return -1;
#endif #endif
@ -818,7 +818,7 @@ nodeGetCellsFreeMemory(virConnectPtr conn ATTRIBUTE_UNUSED,
int maxCell; int maxCell;
if (numa_available() < 0) { if (numa_available() < 0) {
nodeReportError(VIR_ERR_OPERATION_INVALID, nodeReportError(VIR_ERR_INTERNAL_ERROR,
"%s", _("NUMA not supported on this host")); "%s", _("NUMA not supported on this host"));
goto cleanup; goto cleanup;
} }
@ -856,7 +856,7 @@ nodeGetFreeMemory(virConnectPtr conn ATTRIBUTE_UNUSED)
int n; int n;
if (numa_available() < 0) { if (numa_available() < 0) {
nodeReportError(VIR_ERR_OPERATION_INVALID, nodeReportError(VIR_ERR_INTERNAL_ERROR,
"%s", _("NUMA not supported on this host")); "%s", _("NUMA not supported on this host"));
goto cleanup; goto cleanup;
} }
@ -885,14 +885,14 @@ int nodeGetCellsFreeMemory(virConnectPtr conn ATTRIBUTE_UNUSED,
int startCell ATTRIBUTE_UNUSED, int startCell ATTRIBUTE_UNUSED,
int maxCells ATTRIBUTE_UNUSED) int maxCells ATTRIBUTE_UNUSED)
{ {
nodeReportError(VIR_ERR_OPERATION_INVALID, "%s", nodeReportError(VIR_ERR_NO_SUPPORT, "%s",
_("NUMA memory information not available on this platform")); _("NUMA memory information not available on this platform"));
return -1; return -1;
} }
unsigned long long nodeGetFreeMemory(virConnectPtr conn ATTRIBUTE_UNUSED) unsigned long long nodeGetFreeMemory(virConnectPtr conn ATTRIBUTE_UNUSED)
{ {
nodeReportError(VIR_ERR_OPERATION_INVALID, "%s", nodeReportError(VIR_ERR_NO_SUPPORT, "%s",
_("NUMA memory information not available on this platform")); _("NUMA memory information not available on this platform"));
return 0; return 0;
} }