Merge branch 'ZSTAC-25932@@2' into 'master'

[BugFix: ZSTACK-25932]

See merge request zstackio/zstack!6098

Author: gitlab

compute/src/main/java/org/zstack/compute/vm/VmInstanceBase.java

@@ -2679,6 +2679,7 @@ protected List<ImageInventory> getImageCandidatesForVm(ImageMediaType type) {
                     " from ImageVO img, ImageBackupStorageRefVO ref, BackupStorageVO bs, BackupStorageZoneRefVO bsRef" +
                     " where ref.imageUuid = img.uuid" +
                     " and img.mediaType = :imgType" +
+                    " and img.state = :state" +
                     " and img.status = :status" +
                     " and img.system = :system" +
                     " and bs.uuid = ref.backupStorageUuid" +
@@ -2690,6 +2691,7 @@ protected List<ImageInventory> getImageCandidatesForVm(ImageMediaType type) {
             if (type != null) {
                 q.setParameter("imgType", type);
             }
+            q.setParameter("state", ImageState.Enabled);
             q.setParameter("status", ImageStatus.Ready);
             q.setParameter("system", false);
             q.setParameter("bsTypes", hostAllocatorMgr.getBackupStorageTypesByPrimaryStorageTypeFromMetrics(ps.getType()));
@@ -2699,6 +2701,7 @@ protected List<ImageInventory> getImageCandidatesForVm(ImageMediaType type) {
                     " from ImageVO img, ImageBackupStorageRefVO ref, BackupStorageVO bs, BackupStorageZoneRefVO bsRef" +
                     " where ref.imageUuid = img.uuid" +
                     " and img.mediaType = :imgType" +
+                    " and img.state = :state" +
                     " and img.status = :status" +
                     " and img.system = :system" +
                     " and bs.uuid = ref.backupStorageUuid" +
@@ -2710,6 +2713,7 @@ protected List<ImageInventory> getImageCandidatesForVm(ImageMediaType type) {
             if (type != null) {
                 q.setParameter("imgType", type);
             }
+            q.setParameter("state", ImageState.Enabled);
             q.setParameter("status", ImageStatus.Ready);
             q.setParameter("system", false);
             q.setParameter("bsUuids", bsUuids);