From: Peter Krempa <pkrempa@redhat.com>
Date: Mon, 7 Dec 2020 12:19:18 +0000 (+0100)
Subject: qemuDomainGetStorageSourceByDevstr: Avoid logged errors
X-Git-Tag: v7.0.0-rc1~273
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a0a2eb12abc5ba5b5c324042d28af48184af81ea;p=thirdparty%2Flibvirt.git

qemuDomainGetStorageSourceByDevstr: Avoid logged errors

'virStorageFileChainLookup' reports an error when the lookup of the
backing chain entry is unsuccessful. Since we possibly use it multiple
times when looking up backing for 'disk->mirror' the function can report
error which won't be actually reported.

Replace the call to virStorageFileChainLookup by lookup in the chain by
index.

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

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index fc24b551e5..13559ae0d6 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -9950,7 +9950,7 @@ qemuDomainGetStorageSourceByDevstr(const char *devstr,
                                    virDomainDefPtr def)
 {
     virDomainDiskDefPtr disk = NULL;
-    virStorageSourcePtr src = NULL;
+    virStorageSourcePtr n;
     g_autofree char *target = NULL;
     unsigned int idx;
 
@@ -9969,13 +9969,20 @@ qemuDomainGetStorageSourceByDevstr(const char *devstr,
     if (idx == 0)
         return disk->src;
 
-    if ((src = virStorageFileChainLookup(disk->src, NULL, NULL, idx, NULL)))
-        return src;
+    for (n = disk->src; virStorageSourceIsBacking(n); n = n->backingStore) {
+        if (n->id == idx)
+            return n;
+    }
 
-    if (disk->mirror &&
-        (src = virStorageFileChainLookup(disk->mirror, NULL, NULL, idx, NULL)))
-        return src;
+    if (disk->mirror) {
+        for (n = disk->mirror; virStorageSourceIsBacking(n); n = n->backingStore) {
+            if (n->id == idx)
+                return n;
+        }
+    }
 
+    virReportError(VIR_ERR_INVALID_ARG,
+                   _("failed to find disk '%s'"), devstr);
     return NULL;
 }