From: Peter Krempa <pkrempa@redhat.com>
Date: Tue, 1 Dec 2020 16:55:54 +0000 (+0100)
Subject: virDomainSnapshotAlignDisks: Use virDomainDiskByName
X-Git-Tag: v7.0.0-rc1~335
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f19b05b08a6728d2d27926281b9b6624d9db0776;p=thirdparty%2Flibvirt.git

virDomainSnapshotAlignDisks: Use virDomainDiskByName

We don't need the index that virDomainDiskIndexByName returns.

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

diff --git a/src/conf/snapshot_conf.c b/src/conf/snapshot_conf.c
index 8ef9708c72..f896fd1cf2 100644
--- a/src/conf/snapshot_conf.c
+++ b/src/conf/snapshot_conf.c
@@ -663,17 +663,14 @@ virDomainSnapshotAlignDisks(virDomainSnapshotDefPtr snapdef,
     /* Double check requested disks.  */
     for (i = 0; i < snapdef->ndisks; i++) {
         virDomainSnapshotDiskDefPtr snapdisk = &snapdef->disks[i];
-        int idx = virDomainDiskIndexByName(domdef, snapdisk->name, false);
-        virDomainDiskDefPtr domdisk = NULL;
+        virDomainDiskDefPtr domdisk = virDomainDiskByName(domdef, snapdisk->name, false);
 
-        if (idx < 0) {
+        if (!domdisk) {
             virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                            _("no disk named '%s'"), snapdisk->name);
             return -1;
         }
 
-        domdisk = domdef->disks[idx];
-
         if (virHashHasEntry(map, domdisk->dst)) {
             virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                            _("disk '%s' specified twice"),