Blame SOURCES/libvirt-virStorageFileGetMetadataRecurse-Remove-impossible-error-report.patch

fbe740
From cf65fbfb12a209e760b8b2f2b16acfd8b33e8bee Mon Sep 17 00:00:00 2001
fbe740
Message-Id: <cf65fbfb12a209e760b8b2f2b16acfd8b33e8bee@dist-git>
fbe740
From: Peter Krempa <pkrempa@redhat.com>
fbe740
Date: Fri, 28 Feb 2020 10:24:29 +0100
fbe740
Subject: [PATCH] virStorageFileGetMetadataRecurse: Remove impossible error
fbe740
 report
fbe740
MIME-Version: 1.0
fbe740
Content-Type: text/plain; charset=UTF-8
fbe740
Content-Transfer-Encoding: 8bit
fbe740
fbe740
We call virStorageFileSupportsBackingChainTraversal which already checks
fbe740
that the 'storageFileRead' callback is non-NULL, which in turn means
fbe740
that virStorageFileRead will not return -2.
fbe740
fbe740
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
fbe740
Reviewed-by: Eric Blake <eblake@redhat.com>
fbe740
(cherry picked from commit 84df98f29e031d3b1e68e7e3c0d2651ccba14106)
fbe740
fbe740
https://bugzilla.redhat.com/show_bug.cgi?id=1798148
fbe740
Message-Id: <bb902dffc6692251cf12a14fcf5b25a62054a20b.1582881363.git.pkrempa@redhat.com>
fbe740
Reviewed-by: Ján Tomko <jtomko@redhat.com>
fbe740
---
fbe740
 src/util/virstoragefile.c | 9 +--------
fbe740
 1 file changed, 1 insertion(+), 8 deletions(-)
fbe740
fbe740
diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
fbe740
index 6b83fc0e24..1f18320756 100644
fbe740
--- a/src/util/virstoragefile.c
fbe740
+++ b/src/util/virstoragefile.c
fbe740
@@ -5003,15 +5003,8 @@ virStorageFileGetMetadataRecurse(virStorageSourcePtr src,
fbe740
         goto cleanup;
fbe740
 
fbe740
     if ((headerLen = virStorageFileRead(src, 0, VIR_STORAGE_MAX_HEADER,
fbe740
-                                        &buf)) < 0) {
fbe740
-        if (headerLen == -2)
fbe740
-            virReportError(VIR_ERR_INTERNAL_ERROR,
fbe740
-                           _("storage file reading is not supported for "
fbe740
-                             "storage type %s (protocol: %s)"),
fbe740
-                           virStorageTypeToString(src->type),
fbe740
-                           virStorageNetProtocolTypeToString(src->protocol));
fbe740
+                                        &buf)) < 0)
fbe740
         goto cleanup;
fbe740
-    }
fbe740
 
fbe740
     if (virStorageFileGetMetadataInternal(src, buf, headerLen,
fbe740
                                           &backingFormat) < 0)
fbe740
-- 
fbe740
2.25.1
fbe740