Skip to content

Commit 2a5980b

Browse files
author
gitlab
committed
Merge branch 'zsv-ldap' into 'feature-zsv-5.0.0-vm-support-vtpm-and-secuceboot'
<fix>[kvm]: support secure boot for primary storage migration See merge request zstackio/zstack!9524
2 parents 66b4eb4 + adea700 commit 2a5980b

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@
8080
import static org.zstack.compute.vm.VmGlobalConfig.ENABLE_UEFI_SECURE_BOOT;
8181
import static org.zstack.core.Platform.operr;
8282
import static org.zstack.header.vm.VmMigrationType.HostMigration;
83+
import static org.zstack.header.vm.VmMigrationType.PrimaryStorageMigration;
8384
import static org.zstack.header.vm.additions.VmHostFileSyncReason.PostMigration;
8485
import static org.zstack.header.vm.additions.VmHostFileSyncReason.PrepareReRead;
8586
import static org.zstack.header.vm.additions.VmHostFileSyncReason.PrepareRead;
@@ -162,7 +163,7 @@ private void prepareNvRamToStartVmCmd(KVMAgentCommands.StartVmCmd cmd, NvRamSpec
162163

163164
@Override
164165
public void preVmMigration(VmInstanceInventory vm, VmMigrationType type, String dstHostUuid, Completion completion) {
165-
if (HostMigration != type) {
166+
if (HostMigration != type && PrimaryStorageMigration != type) {
166167
completion.success();
167168
return;
168169
}

0 commit comments

Comments
 (0)