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

<feature>[kvm]: persist machine type to system tag

See merge request zstackio/zstack!9515

Author: gitlab

plugin/kvm/src/main/java/org/zstack/kvm/BootKvmStartVmExtension.java

@@ -29,6 +29,17 @@ public void startVmOnKvmSuccess(KVMHostInventory host, VmInstanceSpec spec) {
             VmSystemTags.BOOT_ORDER.delete(spec.getVmInventory().getUuid());
             VmSystemTags.CDROM_BOOT_ONCE.delete(spec.getVmInventory().getUuid());
         }
+
+        final String machineType = spec.getOsSpec().getMachineType();
+        if (StringUtils.isEmpty(machineType)) {
+            VmSystemTags.MACHINE_TYPE.delete(spec.getVmInventory().getUuid());
+        } else {
+            SystemTagCreator creator = VmSystemTags.MACHINE_TYPE.newSystemTagCreator(spec.getVmInventory().getUuid());
+            creator.setTagByTokens(map(e(VmSystemTags.MACHINE_TYPE_TOKEN, machineType)));
+            creator.inherent = false;
+            creator.recreate = true;
+            creator.create();
+        }
     }
 
     @Override

plugin/kvm/src/main/java/org/zstack/kvm/KVMHost.java

@@ -4440,6 +4440,7 @@ protected void startVm(final VmInstanceSpec spec, final NeedReplyMessage msg, fi
             String machineType = VmSystemTags.MACHINE_TYPE.getTokenByResourceUuid(cmd.getVmInstanceUuid(),
                     VmInstanceVO.class, VmSystemTags.MACHINE_TYPE_TOKEN);
             cmd.setMachineType(StringUtils.isNotEmpty(machineType) ? machineType : "pc");
+            spec.getOsSpec().setMachineType(cmd.getMachineType());
         } else {
             cmd.setMachineType(spec.getOsSpec().getMachineType());
         }