Merge branch 'zsv-ldap' into 'feature-zsv-5.0.0-vm-support-vtpm-and-secuceboot'

<fix>[kvm]: fix NVRAM migration handler duplicate call

See merge request zstackio/zstack!9565

Author: gitlab

plugin/kvm/src/main/java/org/zstack/kvm/efi/KvmSecureBootExtensions.java

@@ -81,8 +81,6 @@
 
 import static org.zstack.compute.vm.VmGlobalConfig.ENABLE_UEFI_SECURE_BOOT;
 import static org.zstack.core.Platform.operr;
-import static org.zstack.header.vm.VmMigrationType.HostMigration;
-import static org.zstack.header.vm.VmMigrationType.PrimaryStorageMigration;
 import static org.zstack.header.vm.additions.VmHostFileSyncReason.PostMigration;
 import static org.zstack.header.vm.additions.VmHostFileSyncReason.BeforeHaStart;
 import static org.zstack.header.vm.additions.VmHostFileSyncReason.PrepareReRead;
@@ -168,17 +166,12 @@ private void prepareNvRamToStartVmCmd(KVMAgentCommands.StartVmCmd cmd, NvRamSpec
 
     @Override
     public void preMigrateVm(VmInstanceInventory inv, String destHostUuid, Completion completion) {
-        completion.success(); // use preVmMigration instead of preMigrateVm to prevent from handle twice
+        prepareNvRamBeforeMigration(inv, destHostUuid, completion);
     }
 
     @Override
     public void preVmMigration(VmInstanceInventory vm, VmMigrationType type, String dstHostUuid, Completion completion) {
-        if (HostMigration != type && PrimaryStorageMigration != type) {
-            completion.success();
-            return;
-        }
-
-        prepareNvRamBeforeMigration(vm, dstHostUuid, completion);
+        completion.success(); // use preMigrateVm instead of preVmMigration to prevent from handle twice
     }
 
     private void prepareNvRamBeforeMigration(VmInstanceInventory vm, String dstHostUuid, Completion completion) {