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

virDomainCheckpointAlignDisks: 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/checkpoint_conf.c b/src/conf/checkpoint_conf.c
index bd0a673757..089488fbc6 100644
--- a/src/conf/checkpoint_conf.c
+++ b/src/conf/checkpoint_conf.c
@@ -315,17 +315,14 @@ virDomainCheckpointAlignDisks(virDomainCheckpointDefPtr chkdef)
     /* Double check requested disks.  */
     for (i = 0; i < chkdef->ndisks; i++) {
         virDomainCheckpointDiskDefPtr chkdisk = &chkdef->disks[i];
-        int idx = virDomainDiskIndexByName(domdef, chkdisk->name, false);
-        virDomainDiskDefPtr domdisk;
+        virDomainDiskDefPtr domdisk = virDomainDiskByName(domdef, chkdisk->name, false);
 
-        if (idx < 0) {
+        if (!domdisk) {
             virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                            _("no disk named '%s'"), chkdisk->name);
             return -1;
         }
 
-        domdisk = domdef->disks[idx];
-
         if (virHashHasEntry(map, domdisk->dst)) {
             virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                            _("disk '%s' specified twice"),