<fix>[host]: filter out disks of type loop and rom

build/deploydb.sh

@@ -42,6 +42,7 @@ mkdir -p ${flyway_sql}
 eval "rm -f ${flyway_sql}/*"
 cp ${base}/../conf/db/V0.6__schema.sql ${flyway_sql}
 cp ${base}/../conf/db/upgrade/* ${flyway_sql}
+cp ${base}/../conf/db/zsv/* ${flyway_sql}
 
 if [[ ! -n $host ]] || [[ ! -n $port ]];then
   url="jdbc:mysql://localhost:3306/zstack"

compute/src/main/java/org/zstack/compute/legacy/ComputeLegacyGlobalProperty.java

@@ -10,4 +10,11 @@ public class ComputeLegacyGlobalProperty {
      */
     @GlobalProperty(name="legacyCpuTopologyFix", defaultValue = "false")
     public static boolean cpuTopologyFix;
+    /**
+     * if enableNvRamTypeVolume = true, NvRam type volume will be created if UEFI is enabled;
+     * if enableNvRamTypeVolume = false, NvRam type volume will not be created, NvRam & TpmState will save in host
+     * (not in Primary storage);
+     */
+    @GlobalProperty(name="enable.nv.ram.type.volume", defaultValue = "false")
+    public static boolean enableNvRamTypeVolume;
 }

compute/src/main/java/org/zstack/compute/vm/InstantiateVmFromNewCreatedStruct.java

@@ -3,6 +3,7 @@
 import org.zstack.header.configuration.VmCustomSpecificationStruct;
 import org.zstack.header.host.CpuArchitecture;
 import org.zstack.header.vm.*;
+import org.zstack.header.vm.devices.VmDevicesSpec;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -32,6 +33,7 @@ public class InstantiateVmFromNewCreatedStruct {
     private List<DiskAO> dataDisks;
     private List<DiskAO> deprecatedDataVolumeSpecs = new ArrayList<>();
     private VmCustomSpecificationStruct vmCustomSpecification;
+    private VmDevicesSpec devicesSpec;
 
     public List<String> getCandidatePrimaryStorageUuidsForRootVolume() {
         return candidatePrimaryStorageUuidsForRootVolume;
@@ -87,6 +89,14 @@ public void setVmCustomSpecification(VmCustomSpecificationStruct vmCustomSpecifi
         this.vmCustomSpecification = vmCustomSpecification;
     }
 
+    public VmDevicesSpec getDevicesSpec() {
+        return devicesSpec;
+    }
+
+    public void setDevicesSpec(VmDevicesSpec devicesSpec) {
+        this.devicesSpec = devicesSpec;
+    }
+
     public List<String> getRootVolumeSystemTags() {
         return rootVolumeSystemTags;
     }
@@ -167,6 +177,7 @@ public static InstantiateVmFromNewCreatedStruct fromMessage(InstantiateNewCreate
         struct.setDataDisks(msg.getDataDisks());
         struct.setDeprecatedDataVolumeSpecs(msg.getDeprecatedDataVolumeSpecs());
         struct.setVmCustomSpecification(msg.getVmCustomSpecification());
+        struct.setDevicesSpec(msg.getDevicesSpec());
         return struct;
     }
 
@@ -187,6 +198,7 @@ public static InstantiateVmFromNewCreatedStruct fromMessage(CreateVmInstanceMsg
         struct.setDataDisks(msg.getDataDisks());
         struct.setDeprecatedDataVolumeSpecs(msg.getDeprecatedDataVolumeSpecs());
         struct.setVmCustomSpecification(msg.getVmCustomSpecification());
+        struct.setDevicesSpec(msg.getDevicesSpec());
         return struct;
     }
 

compute/src/main/java/org/zstack/compute/vm/VmCascadeExtension.java

@@ -472,9 +472,9 @@ public void done(ErrorCodeList errorCodeList) {
                                 .flatMap(List::stream).map(VmCdRomInventory::getUuid)
                                 .collect(Collectors.toList());
                         dbf.removeByPrimaryKeys(cdRomUuids, VmCdRomVO.class);
-                        dbf.removeByPrimaryKeys(vminvs.stream().map(p -> p.getInventory().getUuid())
-                                        .collect(Collectors.toList()),
-                                VmInstanceVO.class);
+
+                        List<String> vmUuidList = transform(vminvs, p -> p.getInventory().getUuid());
+                        dbf.removeByPrimaryKeys(vmUuidList, VmInstanceVO.class);
                     }
 
                     completion.success();

compute/src/main/java/org/zstack/compute/vm/VmDeleteVolumeFlow.java

@@ -49,7 +49,9 @@ public void run(final FlowTrigger trigger, Map data) {
         final boolean templated = isTemplated(spec.getVmInventory().getUuid());
 
         /* data volume must be detached anyway no matter if it is going to be deleted */
-        if (spec.getVmInventory().getAllVolumes().size() > 1) {
+        boolean anyDataVolume = spec.getVmInventory().getAllVolumes().stream()
+                .anyMatch(arg -> VolumeType.Data.toString().equals(arg.getType()));
+        if (anyDataVolume) {
             detachDataVolumes(spec);
         }
 
@@ -60,7 +62,12 @@ public void run(final FlowTrigger trigger, Map data) {
             return;
         }
 
-        List<String> volumeTypes = Arrays.asList(VolumeType.Root.toString(), VolumeType.Memory.toString(), VolumeType.Cache.toString());
+        List<String> volumeTypes = Arrays.asList(
+                VolumeType.Root.toString(),
+                VolumeType.Memory.toString(),
+                VolumeType.Cache.toString(),
+                VolumeType.NvRam.toString()
+        );
         List<VolumeDeletionStruct> ctx = transformAndRemoveNull(spec.getVmInventory().getAllVolumes(), arg -> {
             if (VolumeType.Data.toString().equals(arg.getType()) && !deleteDataDisk && !templated) {
                 return null;

compute/src/main/java/org/zstack/compute/vm/VmExpungeNvRamVolumeFlow.java

@@ -0,0 +1,83 @@
+package org.zstack.compute.vm;
+
+import org.springframework.beans.factory.annotation.Autowire;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Configurable;
+import org.zstack.core.asyncbatch.While;
+import org.zstack.core.cloudbus.CloudBus;
+import org.zstack.core.cloudbus.CloudBusCallBack;
+import org.zstack.core.db.Q;
+import org.zstack.header.core.WhileDoneCompletion;
+import org.zstack.header.core.workflow.FlowTrigger;
+import org.zstack.header.core.workflow.NoRollbackFlow;
+import org.zstack.header.errorcode.ErrorCodeList;
+import org.zstack.header.message.MessageReply;
+import org.zstack.header.vm.VmInstanceConstant;
+import org.zstack.header.vm.VmInstanceSpec;
+import org.zstack.header.volume.ExpungeVolumeMsg;
+import org.zstack.header.volume.VolumeConstant;
+import org.zstack.header.volume.VolumeType;
+import org.zstack.header.volume.VolumeVO;
+import org.zstack.header.volume.VolumeVO_;
+import org.zstack.utils.Utils;
+import org.zstack.utils.logging.CLogger;
+
+import java.util.List;
+import java.util.Map;
+
+import static org.zstack.core.Platform.multiErr;
+
+@Configurable(preConstruction = true, autowire = Autowire.BY_TYPE)
+public class VmExpungeNvRamVolumeFlow extends NoRollbackFlow {
+    private static final CLogger logger = Utils.getLogger(VmExpungeNvRamVolumeFlow.class);
+
+    @Autowired
+    protected CloudBus bus;
+
+    @Override
+    @SuppressWarnings("rawtypes")
+    public void run(FlowTrigger trigger, Map data) {
+        final VmInstanceSpec spec = (VmInstanceSpec) data.get(VmInstanceConstant.Params.VmInstanceSpec.toString());
+        String vmUuid = spec.getVmInventory().getUuid();
+
+        List<VolumeVO> volumes = Q.New(VolumeVO.class)
+                .eq(VolumeVO_.vmInstanceUuid, vmUuid)
+                .eq(VolumeVO_.type, VolumeType.NvRam)
+                .list();
+        if (volumes.isEmpty()) {
+            trigger.next();
+            return;
+        }
+
+        new While<>(volumes).each((vol, c) -> {
+            ExpungeVolumeMsg msg = new ExpungeVolumeMsg();
+            msg.setVolumeUuid(vol.getUuid());
+            bus.makeTargetServiceIdByResourceUuid(msg, VolumeConstant.SERVICE_ID, vol.getUuid());
+            bus.send(msg, new CloudBusCallBack(c) {
+                @Override
+                public void run(MessageReply reply) {
+                    if (!reply.isSuccess()) {
+                        logger.warn(String.format("failed to expunge the NvRam volume[uuid:%s] of the vm[uuid:%s, name:%s]: %s",
+                                vol.getUuid(), spec.getVmInventory().getUuid(),
+                                spec.getVmInventory().getName(), reply.getError()));
+
+                        c.addError(reply.getError()
+                                .withOpaque("volume.uuid", vol.getUuid()));
+                    }
+
+                    c.done();
+                }
+            });
+        }).run(new WhileDoneCompletion(trigger) {
+            @Override
+            public void done(ErrorCodeList errorCodeList) {
+                if (!errorCodeList.getCauses().isEmpty()) {
+                    trigger.fail(multiErr(errorCodeList.getCauses(), "failed to expunge the NvRam volumes"));
+                    return;
+                }
+
+                trigger.next();
+            }
+        });
+    }
+}

compute/src/main/java/org/zstack/compute/vm/VmGlobalConfig.java

@@ -113,6 +113,7 @@ public class VmGlobalConfig {
     @GlobalConfigDef(defaultValue = "false", type = Boolean.class, description = "sync clock after vm resume")
     public static GlobalConfig VM_CLOCK_SYNC_AFTER_VM_RESUME = new GlobalConfig(CATEGORY, "vm.clock.sync.after.vm.resume");
 
+    @BindResourceConfig(value = {VmInstanceVO.class, ClusterVO.class})
     @GlobalConfigValidation(validValues = {"true", "false"})
     public static GlobalConfig ENABLE_UEFI_SECURE_BOOT = new GlobalConfig(CATEGORY, "enable.uefi.secure.boot");
 
@@ -133,4 +134,9 @@ public class VmGlobalConfig {
     @GlobalConfigValidation(validValues = {"None", "AuthenticAMD"})
     @BindResourceConfig(value = {VmInstanceVO.class})
     public static GlobalConfig VM_CPUID_VENDOR = new GlobalConfig(CATEGORY, "vm.cpuid.vendor");
+
+    @GlobalConfigDef(defaultValue = "true", type = Boolean.class, description = "whether reset TPM state after VM clone")
+    @GlobalConfigValidation(validValues = {"true", "false"})
+    @BindResourceConfig(value = {VmInstanceVO.class, ClusterVO.class})
+    public static GlobalConfig RESET_TPM_AFTER_VM_CLONE = new GlobalConfig(CATEGORY, "reset.tpm.after.vm.clone");
 }

compute/src/main/java/org/zstack/compute/vm/VmInstanceApiInterceptor.java

@@ -1012,7 +1012,8 @@ private void validateRootDiskOffering(ImageMediaType imgFormat, APICreateVmInsta
                 }
 
                 if (msg.getRootDiskSize() <= 0) {
-                    throw new ApiMessageInterceptionException(operr("Unexpected root disk settings"));
+                    throw new ApiMessageInterceptionException(operr("Unexpected root disk settings")
+                            .withException("DiskAO[0].size is mandatory when image format is ISO"));
                 }
             }
         }

compute/src/main/java/org/zstack/compute/vm/VmInstanceBase.java

@@ -2593,7 +2593,7 @@ protected void scripts() {
 
                             sql(VmNicVO.class).eq(VmNicVO_.vmInstanceUuid, self.getUuid()).hardDelete();
                             sql(VolumeVO.class).eq(VolumeVO_.vmInstanceUuid, self.getUuid())
-                                    .eq(VolumeVO_.type, VolumeType.Root)
+                                    .in(VolumeVO_.type, list(VolumeType.Root, VolumeType.NvRam))
                                     .hardDelete();
                             sql(VmCdRomVO.class).eq(VmCdRomVO_.vmInstanceUuid, self.getUuid()).hardDelete();
                             sql(VmInstanceVO.class).eq(VmInstanceVO_.uuid, self.getUuid()).hardDelete();
@@ -7705,6 +7705,7 @@ private VmInstanceSpec buildVmInstanceSpecFromStruct(InstantiateVmFromNewCreated
         spec.setDataDisks(struct.getDataDisks());
         spec.setDeprecatedDisksSpecs(struct.getDeprecatedDataVolumeSpecs());
         spec.setVmCustomSpecification(struct.getVmCustomSpecification());
+        spec.setDevicesSpec(struct.getDevicesSpec());
 
         List<CdRomSpec> cdRomSpecs = buildVmCdRomSpecsForNewCreated(spec);
         spec.setCdRomSpecs(cdRomSpecs);

compute/src/main/java/org/zstack/compute/vm/VmInstanceManagerImpl.java

@@ -1214,16 +1214,22 @@ public void setup() {
 
                 flow(new Flow() {
                     String __name__ = "call-after-persist-vm-extensions";
+                    List<VmInstanceCreateExtensionPoint> done = new ArrayList<>();
+
                     @Override
                     public void run(FlowTrigger trigger, Map data) {
-                        pluginRgty.getExtensionList(VmInstanceCreateExtensionPoint.class).forEach(
-                                extensionPoint -> extensionPoint.afterPersistVmInstanceVO(finalVo));
+                        for (VmInstanceCreateExtensionPoint extension : pluginRgty.getExtensionList(VmInstanceCreateExtensionPoint.class)) {
+                            done.add(extension);
+                            extension.afterPersistVmInstanceVO(finalVo, msg);
+                        }
                         trigger.next();
                     }
 
                     @Override
                     public void rollback(FlowRollback trigger, Map data) {
-                        // do nothing
+                        Collections.reverse(done);
+                        CollectionUtils.safeForEach(done,
+                                extension -> extension.afterRollbackPersistVmInstanceVO(finalVo, msg));
                         trigger.rollback();
                     }
                 });
@@ -1315,7 +1321,7 @@ public void run(FlowTrigger trigger, Map data) {
                                 smsg.setRootDiskOfferingUuid(rootDisk.getDiskOfferingUuid());
                             } else if (rootDisk.getSize() > 0) {
                                 dvo = new DiskOfferingVO();
-                                dvo.setUuid(Platform.getUuid());
+                                dvo.setUuid(getUuid());
                                 dvo.setAccountUuid(msg.getAccountUuid());
                                 dvo.setDiskSize(rootDisk.getSize());
                                 dvo.setName("for-create-vm-" + finalVo.getUuid());
@@ -1352,6 +1358,7 @@ public void run(FlowTrigger trigger, Map data) {
                         smsg.setDataDisks(msg.getDataDisks());
                         smsg.setDeprecatedDataVolumeSpecs(msg.getDeprecatedDataVolumeSpecs());
                         smsg.setVmCustomSpecification(msg.getVmCustomSpecification());
+                        smsg.setDevicesSpec(msg.getDevicesSpec());
                         bus.makeTargetServiceIdByResourceUuid(smsg, VmInstanceConstant.SERVICE_ID, finalVo.getUuid());
                         bus.send(smsg, new CloudBusCallBack(smsg) {
                             @Override
@@ -1380,7 +1387,7 @@ public void rollback(FlowRollback chain, Map data) {
                         }
                         DestroyVmInstanceMsg dmsg = new DestroyVmInstanceMsg();
                         dmsg.setVmInstanceUuid(finalVo.getUuid());
-                        dmsg.setDeletionPolicy(VmInstanceDeletionPolicyManager.VmInstanceDeletionPolicy.Direct);
+                        dmsg.setDeletionPolicy(VmInstanceDeletionPolicy.Direct);
                         bus.makeTargetServiceIdByResourceUuid(dmsg, VmInstanceConstant.SERVICE_ID, finalVo.getUuid());
                         bus.send(dmsg, new CloudBusCallBack(null) {
                             @Override

compute/src/main/java/org/zstack/compute/vm/VmInstanceUtils.java

@@ -44,6 +44,7 @@ public static CreateVmInstanceMsg fromAPICreateVmInstanceMsg(APICreateVmInstance
         cmsg.setGuestOsType(msg.getGuestOsType());
         cmsg.setArchitecture(msg.getArchitecture());
         cmsg.setStrategy(msg.getStrategy());
+        cmsg.setDevicesSpec(msg.getDevicesSpec());
         if (CollectionUtils.isNotEmpty(msg.getDataDiskOfferingUuids()) || CollectionUtils.isNotEmpty(msg.getDataDiskSizes())) {
             cmsg.setPrimaryStorageUuidForDataVolume(getPSUuidForDataVolume(msg.getSystemTags()));
         }

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

@@ -0,0 +1,33 @@
+package org.zstack.compute.vm.devices;
+
+import org.zstack.header.core.Completion;
+import org.zstack.utils.Utils;
+import org.zstack.utils.logging.CLogger;
+
+public class DummyTpmEncryptedResourceKeyBackend implements TpmEncryptedResourceKeyBackend {
+    private static final CLogger logger = Utils.getLogger(DummyTpmEncryptedResourceKeyBackend.class);
+
+    @Override
+    public void attachKeyProviderToTpm(String tpmUuid, String keyProviderUuid) {
+        logger.debug("ignore attach key provider to TPM request for TPM uuid " + tpmUuid +
+                " and key provider uuid " + keyProviderUuid);
+    }
+
+    @Override
+    public void detachKeyProviderFromTpm(String tpmUuid) {
+        logger.debug("ignore detach key provider from TPM request for TPM uuid " + tpmUuid);
+    }
+
+    @Override
+    public String findKeyProviderUuidByTpm(String tpmUuid) {
+        return null;
+    }
+
+    @Override
+    public void cloneEncryptedResourceKey(CloneEncryptedResourceKeyContext context, Completion completion) {
+        // do nothing
+        logger.debug("ignore clone encrypted resource key request for TPM uuid "
+                + context.srcTpmUuid + " -> " + context.dstTpmUuid);
+        completion.success();
+    }
+}