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

<feature>[kvm]: add os spec machine type support

See merge request zstackio/zstack!9514

Author: gitlab

compute/src/main/java/org/zstack/compute/vm/devices/VmTpmExtensions.java

@@ -13,15 +13,20 @@
 import org.zstack.header.vm.VmInstanceCreateExtensionPoint;
 import org.zstack.header.vm.VmInstanceSpec;
 import org.zstack.header.vm.VmInstanceVO;
+import org.zstack.header.vm.VmMachineType;
 import org.zstack.header.vm.devices.VmDevicesSpec;
 import org.zstack.resourceconfig.ResourceConfig;
 import org.zstack.resourceconfig.ResourceConfigFacade;
+import org.zstack.utils.Utils;
+import org.zstack.utils.logging.CLogger;
 
 import static org.zstack.compute.vm.VmGlobalConfig.ENABLE_UEFI_SECURE_BOOT;
 import static org.zstack.header.vm.VmInstanceConstant.NV_RAM_DEFAULT_SIZE;
 
 public class VmTpmExtensions implements VmInstanceCreateExtensionPoint,
         BuildVmSpecExtensionPoint {
+    private static final CLogger logger = Utils.getLogger(VmTpmExtensions.class);
+
     @Autowired
     private VmTpmManager vmTpmManager;
     @Autowired
@@ -115,5 +120,11 @@ public void afterBuildVmSpec(VmInstanceSpec spec) {
             tpmSpec.setEnable(true);
             tpmSpec.setTpmUuid(tpmUuid);
         }
+
+        if (needRegisterNvRam && spec.getOsSpec().getMachineType() == null) {
+            spec.getOsSpec().setMachineType(VmMachineType.q35.toString());
+            logger.debug(String.format(
+                    "auto-set machineType to q35 for VM[uuid:%s] because NvRam/TPM registration is needed", vmUuid));
+        }
     }
 }

header/src/main/java/org/zstack/header/vm/VmInstanceSpec.java

@@ -406,6 +406,7 @@ public void setCandidatePrimaryStorageUuidsForDataVolume(List<String> candidateP
     private VmCustomSpecificationStruct vmCustomSpecification;
     private VmDevicesSpec devicesSpec;
     private DiskAO nvRamSpec;
+    private OperatingSystemBootingSpec osSpec = new OperatingSystemBootingSpec();
 
     public DiskAO getRootDisk() {
         return rootDisk;
@@ -455,6 +456,14 @@ public void setNvRamSpec(DiskAO nvRamSpec) {
         this.nvRamSpec = nvRamSpec;
     }
 
+    public OperatingSystemBootingSpec getOsSpec() {
+        return osSpec;
+    }
+
+    public void setOsSpec(OperatingSystemBootingSpec osSpec) {
+        this.osSpec = osSpec;
+    }
+
     public boolean isSkipIpAllocation() {
         return skipIpAllocation;
     }
@@ -924,4 +933,19 @@ public String getVolumeFormatFromImage() {
             return ImageConstant.QCOW2_FORMAT_STRING;
         }
     }
+
+    public static class OperatingSystemBootingSpec implements Serializable {
+        /**
+         * @see VmMachineType
+         */
+        private String machineType;
+
+        public String getMachineType() {
+            return machineType;
+        }
+
+        public void setMachineType(String machineType) {
+            this.machineType = machineType;
+        }
+    }
 }

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

@@ -101,9 +101,6 @@
 import javax.persistence.TypedQuery;
 import java.io.IOException;
 import java.net.URI;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.util.Base64;
 import java.net.URISyntaxException;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
@@ -4439,9 +4436,14 @@ protected void startVm(final VmInstanceSpec spec, final NeedReplyMessage msg, fi
             cmd.setChassisAssetTag(NetworkGlobalProperty.CHASSIS_ASSET_TAG);
         }
 
-        String machineType = VmSystemTags.MACHINE_TYPE.getTokenByResourceUuid(cmd.getVmInstanceUuid(),
-                VmInstanceVO.class, VmSystemTags.MACHINE_TYPE_TOKEN);
-        cmd.setMachineType(StringUtils.isNotEmpty(machineType) ? machineType : "pc");
+        if (spec.getOsSpec().getMachineType() == null) {
+            String machineType = VmSystemTags.MACHINE_TYPE.getTokenByResourceUuid(cmd.getVmInstanceUuid(),
+                    VmInstanceVO.class, VmSystemTags.MACHINE_TYPE_TOKEN);
+            cmd.setMachineType(StringUtils.isNotEmpty(machineType) ? machineType : "pc");
+        } else {
+            cmd.setMachineType(spec.getOsSpec().getMachineType());
+        }
+        String machineType = cmd.getMachineType();
 
         if (KVMSystemTags.VM_PREDEFINED_PCI_BRIDGE_NUM.hasTag(spec.getVmInventory().getUuid())) {
             cmd.setPredefinedPciBridgeNum(Integer.valueOf(KVMSystemTags.VM_PREDEFINED_PCI_BRIDGE_NUM.getTokenByResourceUuid(spec.getVmInventory().getUuid(), KVMSystemTags.VM_PREDEFINED_PCI_BRIDGE_NUM_TOKEN)));