From: Peter Krempa <pkrempa@redhat.com>
Date: Wed, 14 Aug 2019 15:51:23 +0000 (+0200)
Subject: util: storagefile: Don't report errors from virStorageSourceUpdatePhysicalSize
X-Git-Tag: v5.7.0-rc1~215
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b074363136ddcf1599c36f11b9f5a5fe45c5b3e5;p=thirdparty%2Flibvirt.git

util: storagefile: Don't report errors from virStorageSourceUpdatePhysicalSize

virStorageSourceUpdatePhysicalSize is called only from
qemuDomainStorageUpdatePhysical and all callers of it reset the libvirt
error if -1 is returned.

Don't bother setting the error in the first place.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
index d3596a29e8..7288e18b16 100644
--- a/src/util/virstoragefile.c
+++ b/src/util/virstoragefile.c
@@ -3748,7 +3748,7 @@ virStorageSourceNewFromBacking(virStorageSourcePtr parent)
  * To be called for domain storage source reporting as the volume code does
  * not set/use the 'type' field for the voldef->source.target
  *
- * Returns 0 on success, -1 on error.
+ * Returns 0 on success, -1 on error. No libvirt errors are reported.
  */
 int
 virStorageSourceUpdatePhysicalSize(virStorageSourcePtr src,
@@ -3765,11 +3765,8 @@ virStorageSourceUpdatePhysicalSize(virStorageSourcePtr src,
         break;
 
     case VIR_STORAGE_TYPE_BLOCK:
-        if ((end = lseek(fd, 0, SEEK_END)) == (off_t) -1) {
-            virReportSystemError(errno, _("failed to seek to end of '%s'"),
-                                 src->path);
+        if ((end = lseek(fd, 0, SEEK_END)) == (off_t) -1)
             return -1;
-        }
 
         src->physical = end;
         break;
@@ -3782,12 +3779,7 @@ virStorageSourceUpdatePhysicalSize(virStorageSourcePtr src,
     case VIR_STORAGE_TYPE_VOLUME:
     case VIR_STORAGE_TYPE_NONE:
     case VIR_STORAGE_TYPE_LAST:
-        virReportError(VIR_ERR_INTERNAL_ERROR,
-                       _("cannot retrieve physical for path '%s' type '%s'"),
-                       NULLSTR(src->path),
-                       virStorageTypeToString(actual_type));
         return -1;
-        break;
     }
 
     return 0;