make it easier

Author: kuqin12

Platforms/QemuSbsaPkg/Plugins/QemuRunner/QemuRunner.py

@@ -11,6 +11,7 @@
 import os
 import re
 import datetime
+import threading
 from pathlib import Path
 from edk2toolext.environment.plugintypes import uefi_helper_plugin
 from edk2toollib import utility_functions
@@ -43,6 +44,24 @@ def QueryQemuVersion(exec):
         return ver_str.split('.')
 
 
+    @staticmethod
+    def RunThread(env):
+        ''' Runs TPM in a separate thread '''
+        tpm_path = env.GetValue("TPM_DEV")
+        if tpm_path is None:
+            logging.critical("TPM Path Invalid")
+            return
+
+        tpm_cmd = "swtpm"
+        tpm_args = f"socket --tpmstate dir={"/".join(tpm_path.rsplit("/", 1)[:-1])} --ctrl type=unixio,path={tpm_path} --tpm2 --log level=20"
+
+        # Start the TPM emulator in a separate thread
+        ret = utility_functions.RunCmd(tpm_cmd, tpm_args)
+        if ret != 0:
+            logging.critical("Failed to start TPM emulator.")
+            return
+
+
     @staticmethod
     def Runner(env):
         ''' Runs QEMU '''
@@ -109,10 +128,16 @@ def Runner(env):
                 code_fd + ",readonly=on"
 
         tpm_dev = env.GetValue("TPM_DEV")
+        thread = None
         if tpm_dev is not None:
             args += f" -chardev socket,id=chrtpm,path={tpm_dev}"
             args += " -tpmdev emulator,id=tpm0,chardev=chrtpm"
 
+            # also spawn the TPM emulator on a different thread
+            logging.critical("Starting TPM emulator in a different thread.")
+            thread = threading.Thread(target=QemuRunner.RunThread, args=(env,))
+            thread.start()
+
         # Add XHCI USB controller and mouse
         args += " -device qemu-xhci,id=usb"
         args += " -device usb-tablet,id=input0,bus=usb.0,port=1"  # add a usb mouse
@@ -179,4 +204,8 @@ def Runner(env):
             # Linux version of QEMU will mess with the print if its run failed, let's just restore it anyway
             utility_functions.RunCmd('stty', 'sane', capture=False)
 
+        if thread is not None:
+            logging.critical("Terminate TPM emulator by using Crtl + C now!")
+            thread.join()
+
         return ret