NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

storage: Fix incorrect error codes

Browse Source 
Commit 0376f4a69b intended to fix incorrect use of VIR_ERR_NO_SUPPORT,
but replacing it with VIR_ERR_OPERATION_INVALID is not proper either.
This commit is contained in:
Osier Yang
2011-09-01 15:24:59 +08:00
parent fd038a337b
commit ffafede112
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/storage/storage_backend.c
View File

@@ -387,7 +387,7 @@ virStorageBackendCreateRaw(virConnectPtr conn ATTRIBUTE_UNUSED,
virCheckFlags(0, -1); virCheckFlags(0, -1);
if (vol->target.encryption != NULL) { if (vol->target.encryption != NULL) {
virStorageReportError(VIR_ERR_OPERATION_INVALID, virStorageReportError(VIR_ERR_CONFIG_UNSUPPORTED,
"%s", _("storage pool does not support encrypted " "%s", _("storage pool does not support encrypted "
"volumes")); "volumes"));
goto cleanup; goto cleanup;
@@ -461,7 +461,7 @@ virStorageGenerateQcowEncryption(virConnectPtr conn,
conn->secretDriver->lookupByUUID == NULL || conn->secretDriver->lookupByUUID == NULL ||
conn->secretDriver->defineXML == NULL || conn->secretDriver->defineXML == NULL ||
conn->secretDriver->setValue == NULL) { conn->secretDriver->setValue == NULL) {
virStorageReportError(VIR_ERR_OPERATION_INVALID, "%s", virStorageReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("secret storage not supported")); _("secret storage not supported"));
goto cleanup; goto cleanup;
} }
@@ -740,7 +740,7 @@ virStorageBackendCreateQemuImg(virConnectPtr conn,
if (vol->target.format != VIR_STORAGE_FILE_QCOW && if (vol->target.format != VIR_STORAGE_FILE_QCOW &&
vol->target.format != VIR_STORAGE_FILE_QCOW2) { vol->target.format != VIR_STORAGE_FILE_QCOW2) {
virStorageReportError(VIR_ERR_OPERATION_INVALID, virStorageReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("qcow volume encryption unsupported with " _("qcow volume encryption unsupported with "
"volume format %s"), type); "volume format %s"), type);
return -1; return -1;
@@ -748,7 +748,7 @@ virStorageBackendCreateQemuImg(virConnectPtr conn,
enc = vol->target.encryption; enc = vol->target.encryption;
if (enc->format != VIR_STORAGE_ENCRYPTION_FORMAT_QCOW && if (enc->format != VIR_STORAGE_ENCRYPTION_FORMAT_QCOW &&
enc->format != VIR_STORAGE_ENCRYPTION_FORMAT_DEFAULT) { enc->format != VIR_STORAGE_ENCRYPTION_FORMAT_DEFAULT) {
virStorageReportError(VIR_ERR_OPERATION_INVALID, virStorageReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("unsupported volume encryption format %d"), _("unsupported volume encryption format %d"),
vol->target.encryption->format); vol->target.encryption->format);
return -1; return -1;
@@ -880,13 +880,13 @@ virStorageBackendCreateQcowCreate(virConnectPtr conn ATTRIBUTE_UNUSED,
return -1; return -1;
} }
if (vol->backingStore.path != NULL) { if (vol->backingStore.path != NULL) {
virStorageReportError(VIR_ERR_OPERATION_INVALID, "%s", virStorageReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("copy-on-write image not supported with " _("copy-on-write image not supported with "
"qcow-create")); "qcow-create"));
return -1; return -1;
} }
if (vol->target.encryption != NULL) { if (vol->target.encryption != NULL) {
virStorageReportError(VIR_ERR_OPERATION_INVALID, virStorageReportError(VIR_ERR_CONFIG_UNSUPPORTED,
"%s", _("encrypted volumes not supported with " "%s", _("encrypted volumes not supported with "
"qcow-create")); "qcow-create"));
return -1; return -1;

2
src/storage/storage_backend_disk.c
View File

@@ -574,7 +574,7 @@ virStorageBackendDiskCreateVol(virConnectPtr conn ATTRIBUTE_UNUSED,
}; };
if (vol->target.encryption != NULL) { if (vol->target.encryption != NULL) {
virStorageReportError(VIR_ERR_OPERATION_INVALID, virStorageReportError(VIR_ERR_CONFIG_UNSUPPORTED,
"%s", _("storage pool does not support encrypted " "%s", _("storage pool does not support encrypted "
"volumes")); "volumes"));
return -1; return -1;

2
src/storage/storage_backend_fs.c
View File

@@ -866,7 +866,7 @@ _virStorageBackendFileSystemVolBuild(virConnectPtr conn,
if (inputvol) { if (inputvol) {
if (vol->target.encryption != NULL) { if (vol->target.encryption != NULL) {
virStorageReportError(VIR_ERR_OPERATION_INVALID, virStorageReportError(VIR_ERR_CONFIG_UNSUPPORTED,
"%s", _("storage pool does not support " "%s", _("storage pool does not support "
"building encrypted volumes from " "building encrypted volumes from "
"other volumes")); "other volumes"));

2
src/storage/storage_backend_logical.c
View File

@@ -584,7 +584,7 @@ virStorageBackendLogicalCreateVol(virConnectPtr conn,
const char **cmdargv = cmdargvnew; const char **cmdargv = cmdargvnew;
if (vol->target.encryption != NULL) { if (vol->target.encryption != NULL) {
virStorageReportError(VIR_ERR_OPERATION_INVALID, virStorageReportError(VIR_ERR_CONFIG_UNSUPPORTED,
"%s", _("storage pool does not support encrypted " "%s", _("storage pool does not support encrypted "
"volumes")); "volumes"));
return -1; return -1;