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