[libvirt] [PATCH 1/1] Fix error code for storage operations
Many volume operations will fail if the volume in question is being allocated. These operations were returning VIR_ERR_INTERNAL_ERROR when they should be returning VIR_ERR_OPERATION_INVALID. --- src/storage/storage_driver.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index 4f35be0..997b876 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -1486,7 +1486,7 @@ storageVolumeCreateXMLFrom(virStoragePoolPtr obj, } if (origvol->building) { - virStorageReportError(VIR_ERR_INTERNAL_ERROR, + virStorageReportError(VIR_ERR_OPERATION_INVALID, _("volume '%s' is still being allocated."), origvol->name); goto cleanup; @@ -1667,7 +1667,7 @@ storageVolumeUpload(virStorageVolPtr obj, } if (vol->building) { - virStorageReportError(VIR_ERR_INTERNAL_ERROR, + virStorageReportError(VIR_ERR_OPERATION_INVALID, _("volume '%s' is still being allocated."), vol->name); goto out; @@ -1876,7 +1876,7 @@ storageVolumeWipe(virStorageVolPtr obj, } if (vol->building) { - virStorageReportError(VIR_ERR_INTERNAL_ERROR, + virStorageReportError(VIR_ERR_OPERATION_INVALID, _("volume '%s' is still being allocated."), vol->name); goto out; @@ -1936,7 +1936,7 @@ storageVolumeDelete(virStorageVolPtr obj, } if (vol->building) { - virStorageReportError(VIR_ERR_INTERNAL_ERROR, + virStorageReportError(VIR_ERR_OPERATION_INVALID, _("volume '%s' is still being allocated."), vol->name); goto cleanup; -- 1.7.4.4
于 2011年07月15日 21:47, Dave Allan 写道:
Many volume operations will fail if the volume in question is being allocated. These operations were returning VIR_ERR_INTERNAL_ERROR when they should be returning VIR_ERR_OPERATION_INVALID. --- src/storage/storage_driver.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index 4f35be0..997b876 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -1486,7 +1486,7 @@ storageVolumeCreateXMLFrom(virStoragePoolPtr obj, }
if (origvol->building) { - virStorageReportError(VIR_ERR_INTERNAL_ERROR, + virStorageReportError(VIR_ERR_OPERATION_INVALID, _("volume '%s' is still being allocated."), origvol->name); goto cleanup; @@ -1667,7 +1667,7 @@ storageVolumeUpload(virStorageVolPtr obj, }
if (vol->building) { - virStorageReportError(VIR_ERR_INTERNAL_ERROR, + virStorageReportError(VIR_ERR_OPERATION_INVALID, _("volume '%s' is still being allocated."), vol->name); goto out; @@ -1876,7 +1876,7 @@ storageVolumeWipe(virStorageVolPtr obj, }
if (vol->building) { - virStorageReportError(VIR_ERR_INTERNAL_ERROR, + virStorageReportError(VIR_ERR_OPERATION_INVALID, _("volume '%s' is still being allocated."), vol->name); goto out; @@ -1936,7 +1936,7 @@ storageVolumeDelete(virStorageVolPtr obj, }
if (vol->building) { - virStorageReportError(VIR_ERR_INTERNAL_ERROR, + virStorageReportError(VIR_ERR_OPERATION_INVALID, _("volume '%s' is still being allocated."), vol->name); goto cleanup;
ACK Osier
On 07/15/2011 07:54 AM, Osier Yang wrote:
于 2011年07月15日 21:47, Dave Allan 写道:
Many volume operations will fail if the volume in question is being allocated. These operations were returning VIR_ERR_INTERNAL_ERROR when they should be returning VIR_ERR_OPERATION_INVALID. --- src/storage/storage_driver.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)
ACK
Pushed. -- Eric Blake eblake@redhat.com +1-801-349-2682 Libvirt virtualization library http://libvirt.org
On Fri, Jul 15, 2011 at 08:40:09AM -0600, Eric Blake wrote:
On 07/15/2011 07:54 AM, Osier Yang wrote:
于 2011年07月15日 21:47, Dave Allan 写道:
Many volume operations will fail if the volume in question is being allocated. These operations were returning VIR_ERR_INTERNAL_ERROR when they should be returning VIR_ERR_OPERATION_INVALID. --- src/storage/storage_driver.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)
ACK
Pushed.
Thanks Dave
participants (3)
-
Dave Allan -
Eric Blake -
Osier Yang