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

<feature>[kvm]: use SQLBatch for TPM state reset

See merge request zstackio/zstack!9460

Author: gitlab

plugin/kvm/src/main/java/org/zstack/kvm/tpm/KvmTpmManager.java

@@ -9,6 +9,7 @@
 import org.zstack.core.cloudbus.MessageSafe;
 import org.zstack.core.db.Q;
 import org.zstack.core.db.SQL;
+import org.zstack.core.db.SQLBatch;
 import org.zstack.core.thread.ChainTask;
 import org.zstack.core.thread.SyncTaskChain;
 import org.zstack.core.thread.ThreadFacade;
@@ -430,14 +431,19 @@ private void handle(ResetVmTpmMsg msg) {
         ResetVmTpmReply reply = new ResetVmTpmReply();
 
         String vmUuid = msg.getVmInstanceUuid();
-        SQL.New(VmHostFileVO.class)
-                .eq(VmHostFileVO_.vmInstanceUuid, vmUuid)
-                .eq(VmHostFileVO_.type, VmHostFileType.TpmState)
-                .delete();
-        SQL.New(VmHostBackupFileVO.class)
-                .eq(VmHostBackupFileVO_.resourceUuid, vmUuid)
-                .eq(VmHostBackupFileVO_.type, VmHostFileType.TpmState)
-                .delete();
+        new SQLBatch() {
+            @Override
+            protected void scripts() {
+                sql(VmHostFileVO.class)
+                        .eq(VmHostFileVO_.vmInstanceUuid, vmUuid)
+                        .eq(VmHostFileVO_.type, VmHostFileType.TpmState)
+                        .delete();
+                sql(VmHostBackupFileVO.class)
+                        .eq(VmHostBackupFileVO_.resourceUuid, vmUuid)
+                        .eq(VmHostBackupFileVO_.type, VmHostFileType.TpmState)
+                        .delete();
+            }
+        }.execute();
 
         bus.reply(msg, reply);
     }