]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
virDomainCheckpointAlignDisks: Use virDomainDiskByName
authorPeter Krempa <pkrempa@redhat.com>
Tue, 1 Dec 2020 16:55:54 +0000 (17:55 +0100)
committerPeter Krempa <pkrempa@redhat.com>
Thu, 3 Dec 2020 11:25:01 +0000 (12:25 +0100)
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>
src/conf/checkpoint_conf.c

index bd0a67375748767357ad77396c7b42e91503acd5..089488fbc66673cbfcb966c4411e727448c2cff7 100644 (file)
@@ -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"),