Skip to content

Commit c4fb10c

Browse files
author
Zhang Wenhao
committed
<refactor>[kvm]: prepare NvRam host-file before migration
Resolves: ZSV-11524 Related: ZSV-11430 Related: ZSV-11310 Change-Id: I6e736c676b726a776f7961756b6f636f6b797369
1 parent 9f75aaf commit c4fb10c

1 file changed

Lines changed: 9 additions & 0 deletions

File tree

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,13 +162,22 @@ private void prepareNvRamToStartVmCmd(KVMAgentCommands.StartVmCmd cmd, NvRamSpec
162162
}
163163
}
164164

165+
@Override
166+
public void preMigrateVm(VmInstanceInventory inv, String destHostUuid, Completion completion) {
167+
completion.success(); // use preVmMigration instead of preMigrateVm to prevent from handle twice
168+
}
169+
165170
@Override
166171
public void preVmMigration(VmInstanceInventory vm, VmMigrationType type, String dstHostUuid, Completion completion) {
167172
if (HostMigration != type && PrimaryStorageMigration != type) {
168173
completion.success();
169174
return;
170175
}
171176

177+
prepareNvRamBeforeMigration(vm, dstHostUuid, completion);
178+
}
179+
180+
private void prepareNvRamBeforeMigration(VmInstanceInventory vm, String dstHostUuid, Completion completion) {
172181
if (dstHostUuid == null) {
173182
completion.success();
174183
return;

0 commit comments

Comments
 (0)