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: Cleanup improper VIR_ERR_NO_SUPPORT use

Browse Source
This commit is contained in:
Osier Yang 2011-08-23 16:53:15 +08:00
parent 172214bd30
commit 0756e5ad92
4 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/xen/xen_hypervisor.c
View File

@ -1457,7 +1457,7 @@ xenHypervisorDomainBlockStats (virDomainPtr dom,
xenUnifiedUnlock(priv); xenUnifiedUnlock(priv);
return ret; return ret;
#else #else
virXenErrorFunc(VIR_ERR_NO_SUPPORT, __FUNCTION__, virXenErrorFunc(VIR_ERR_OPERATION_INVALID, __FUNCTION__,
"block statistics not supported on this platform", "block statistics not supported on this platform",
dom->id); dom->id);
return -1; return -1;
@ -1495,7 +1495,7 @@ xenHypervisorDomainInterfaceStats (virDomainPtr dom,
return linuxDomainInterfaceStats(path, stats); return linuxDomainInterfaceStats(path, stats);
#else #else
virXenErrorFunc(VIR_ERR_NO_SUPPORT, __FUNCTION__, virXenErrorFunc(VIR_ERR_OPERATION_INVALID, __FUNCTION__,
"/proc/net/dev: Interface not found", 0); "/proc/net/dev: Interface not found", 0);
return -1; return -1;
#endif #endif

26
src/xen/xend_internal.c
View File

@ -2793,14 +2793,14 @@ xenDaemonAttachDeviceFlags(virDomainPtr domain, const char *xml,
goto cleanup; goto cleanup;
} }
} else { } else {
virXendError(VIR_ERR_NO_SUPPORT, "%s", virXendError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("unsupported device type")); _("unsupported device type"));
goto cleanup; goto cleanup;
} }
break; break;
default: default:
virXendError(VIR_ERR_NO_SUPPORT, "%s", virXendError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("unsupported device type")); _("unsupported device type"));
goto cleanup; goto cleanup;
} }
@ -2921,7 +2921,7 @@ xenDaemonUpdateDeviceFlags(virDomainPtr domain, const char *xml,
break; break;
default: default:
virXendError(VIR_ERR_NO_SUPPORT, "%s", virXendError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("unsupported device type")); _("unsupported device type"));
goto cleanup; goto cleanup;
} }
@ -3032,7 +3032,7 @@ xenDaemonDetachDeviceFlags(virDomainPtr domain, const char *xml,
if (xenFormatSxprOnePCI(dev->data.hostdev, &buf, 1) < 0) if (xenFormatSxprOnePCI(dev->data.hostdev, &buf, 1) < 0)
goto cleanup; goto cleanup;
} else { } else {
virXendError(VIR_ERR_NO_SUPPORT, "%s", virXendError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("unsupported device type")); _("unsupported device type"));
goto cleanup; goto cleanup;
} }
@ -3222,7 +3222,7 @@ xenDaemonDomainMigratePerform (virDomainPtr domain,
/* Xen doesn't support renaming domains during migration. */ /* Xen doesn't support renaming domains during migration. */
if (dname) { if (dname) {
virXendError(VIR_ERR_NO_SUPPORT, virXendError(VIR_ERR_OPERATION_INVALID,
"%s", _("xenDaemonDomainMigrate: Xen does not support" "%s", _("xenDaemonDomainMigrate: Xen does not support"
" renaming domains during migration")); " renaming domains during migration"));
return -1; return -1;
@ -3232,7 +3232,7 @@ xenDaemonDomainMigratePerform (virDomainPtr domain,
* ignores it. * ignores it.
*/ */
if (bandwidth) { if (bandwidth) {
virXendError(VIR_ERR_NO_SUPPORT, virXendError(VIR_ERR_OPERATION_INVALID,
"%s", _("xenDaemonDomainMigrate: Xen does not support" "%s", _("xenDaemonDomainMigrate: Xen does not support"
" bandwidth limits during migration")); " bandwidth limits during migration"));
return -1; return -1;
@ -3260,7 +3260,7 @@ xenDaemonDomainMigratePerform (virDomainPtr domain,
* a nice error message. * a nice error message.
*/ */
if (flags & VIR_MIGRATE_PAUSED) { if (flags & VIR_MIGRATE_PAUSED) {
virXendError(VIR_ERR_NO_SUPPORT, virXendError(VIR_ERR_OPERATION_INVALID,
"%s", _("xenDaemonDomainMigrate: xend cannot migrate paused domains")); "%s", _("xenDaemonDomainMigrate: xend cannot migrate paused domains"));
return -1; return -1;
} }
@ -3268,7 +3268,7 @@ xenDaemonDomainMigratePerform (virDomainPtr domain,
/* XXX we could easily do tunnelled & peer2peer migration too /* XXX we could easily do tunnelled & peer2peer migration too
if we want to. support these... */ if we want to. support these... */
if (flags != 0) { if (flags != 0) {
virXendError(VIR_ERR_NO_SUPPORT, virXendError(VIR_ERR_OPERATION_INVALID,
"%s", _("xenDaemonDomainMigrate: unsupported flag")); "%s", _("xenDaemonDomainMigrate: unsupported flag"));
return -1; return -1;
} }
@ -3569,7 +3569,7 @@ xenDaemonGetSchedulerType(virDomainPtr domain, int *nparams)
/* Support only xendConfigVersion >=4 */ /* Support only xendConfigVersion >=4 */
priv = (xenUnifiedPrivatePtr) domain->conn->privateData; priv = (xenUnifiedPrivatePtr) domain->conn->privateData;
if (priv->xendConfigVersion < 4) { if (priv->xendConfigVersion < 4) {
virXendError(VIR_ERR_NO_SUPPORT, virXendError(VIR_ERR_OPERATION_INVALID,
"%s", _("unsupported in xendConfigVersion < 4")); "%s", _("unsupported in xendConfigVersion < 4"));
return NULL; return NULL;
} }
@ -3645,7 +3645,7 @@ xenDaemonGetSchedulerParameters(virDomainPtr domain,
/* Support only xendConfigVersion >=4 */ /* Support only xendConfigVersion >=4 */
priv = (xenUnifiedPrivatePtr) domain->conn->privateData; priv = (xenUnifiedPrivatePtr) domain->conn->privateData;
if (priv->xendConfigVersion < 4) { if (priv->xendConfigVersion < 4) {
virXendError(VIR_ERR_NO_SUPPORT, virXendError(VIR_ERR_OPERATION_INVALID,
"%s", _("unsupported in xendConfigVersion < 4")); "%s", _("unsupported in xendConfigVersion < 4"));
return (-1); return (-1);
} }
@ -3752,7 +3752,7 @@ xenDaemonSetSchedulerParameters(virDomainPtr domain,
/* Support only xendConfigVersion >=4 and active domains */ /* Support only xendConfigVersion >=4 and active domains */
priv = (xenUnifiedPrivatePtr) domain->conn->privateData; priv = (xenUnifiedPrivatePtr) domain->conn->privateData;
if (priv->xendConfigVersion < 4) { if (priv->xendConfigVersion < 4) {
virXendError(VIR_ERR_NO_SUPPORT, virXendError(VIR_ERR_OPERATION_INVALID,
"%s", _("unsupported in xendConfigVersion < 4")); "%s", _("unsupported in xendConfigVersion < 4"));
return (-1); return (-1);
} }
@ -3871,7 +3871,7 @@ xenDaemonDomainBlockPeek (virDomainPtr domain, const char *path,
domain->name); domain->name);
else { else {
/* This call always fails for dom0. */ /* This call always fails for dom0. */
virXendError(VIR_ERR_NO_SUPPORT, virXendError(VIR_ERR_OPERATION_INVALID,
"%s", _("domainBlockPeek is not supported for dom0")); "%s", _("domainBlockPeek is not supported for dom0"));
return -1; return -1;
} }
@ -4060,7 +4060,7 @@ virDomainXMLDevID(virDomainPtr domain,
if (tmp == NULL) if (tmp == NULL)
return -1; return -1;
} else { } else {
virXendError(VIR_ERR_NO_SUPPORT, virXendError(VIR_ERR_OPERATION_INVALID,
"%s", _("hotplug of device type not supported")); "%s", _("hotplug of device type not supported"));
return -1; return -1;
} }

3
src/xen/xm_internal.c
View File

@ -1571,7 +1571,8 @@ xenXMDomainBlockPeek (virDomainPtr dom ATTRIBUTE_UNUSED,
size_t size ATTRIBUTE_UNUSED, size_t size ATTRIBUTE_UNUSED,
void *buffer ATTRIBUTE_UNUSED) void *buffer ATTRIBUTE_UNUSED)
{ {
xenXMError(VIR_ERR_NO_SUPPORT, __FUNCTION__); xenXMError(VIR_ERR_OPERATION_INVALID, "%s",
_("block peeking not implemented"));
return -1; return -1;
} }

4
src/xenxs/xen_sxpr.c
View File

@ -1865,7 +1865,7 @@ xenFormatSxprOnePCI(virDomainHostdevDefPtr def,
int detach) int detach)
{ {
if (def->managed) { if (def->managed) {
XENXS_ERROR(VIR_ERR_NO_SUPPORT, "%s", XENXS_ERROR(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("managed PCI devices not supported with XenD")); _("managed PCI devices not supported with XenD"));
return -1; return -1;
} }
@ -1915,7 +1915,7 @@ xenFormatSxprAllPCI(virDomainDefPtr def,
if (def->hostdevs[i]->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS && if (def->hostdevs[i]->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS &&
def->hostdevs[i]->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI) { def->hostdevs[i]->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI) {
if (def->hostdevs[i]->managed) { if (def->hostdevs[i]->managed) {
XENXS_ERROR(VIR_ERR_NO_SUPPORT, "%s", XENXS_ERROR(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("managed PCI devices not supported with XenD")); _("managed PCI devices not supported with XenD"));
return -1; return -1;
} }