Script: Add serial log to file support

Signed-off-by: Wei Liu <[email protected]>

Author: liuw1

sh_script/test/conftest.py

@@ -66,6 +66,7 @@ def __init__(self):
         self._threads: Dict[str, threading.Thread] = {}
         self._host_procs: Dict[str, subprocess.Popen] = {}
         self.ssh = None
+        self.serial_log_type = "stdio"
         # clear dmesg
         self.clear_dmesg()
         # terminate all tds & socat before test execution
@@ -117,7 +118,7 @@ def start_test_payload(self, bios_img=None, type=None, device=None):
         Start migration td
         """
         LOG.debug(f"Starting launch test td payload")
-        arg=f"sudo bash {self.mig_td_script} -q {self.qemu} -m {bios_img} -t {type}"
+        arg=f"sudo bash {self.mig_td_script} -q {self.qemu} -m {bios_img} -t {type} -l {self.serial_log_type}"
 
         if device == "serial":
             arg=arg + " -s"
@@ -138,7 +139,7 @@ def start_mig_td(self, bios_img=None, type=None, no_device=False, device=None):
         """
         Start migration td
         """
-        arg=f"sudo bash {self.mig_td_script} -q {self.qemu} -m {bios_img} -t {type}"
+        arg=f"sudo bash {self.mig_td_script} -q {self.qemu} -m {bios_img} -t {type} -l {self.serial_log_type}"
         if no_device:
             arg=arg + " -n"
         if device == "serial":
@@ -157,7 +158,7 @@ def start_mig_td(self, bios_img=None, type=None, no_device=False, device=None):
 
     # type has src dst
     def start_user_td(self, is_pre_binding=False, type=None, hash=None):
-        command = f"sudo bash {self.user_td_script} -q {self.qemu} -i {self.guest_img} -k {self.kernel_img} -o {self.user_td_bios_img} -t {type}"
+        command = f"sudo bash {self.user_td_script} -q {self.qemu} -i {self.guest_img} -k {self.kernel_img} -o {self.user_td_bios_img} -t {type} -l {self.serial_log_type}"
         if is_pre_binding:
             command += f" -g true -m {hash}"
         """

sh_script/test/mig-td.sh

@@ -11,6 +11,7 @@ GUEST_CID=18
 MIGTD=""
 VIRTIO_SERIAL=false
 MIGTD_TYPE=""
+LOG_TYPE="file"
 DEST_IP="127.0.0.1"
 
 usage() {
@@ -21,19 +22,21 @@ Usage: $(basename "$0") [OPTION]...
   -t <src|dst>              Must set migtd type, src or dst
   -s                        Use virtio serial, default is vsock
   -i <dest_ip>              IP of destination
+  -l <stdio|file>           Serial log type  
   -h                        Show this help
 EOM
 }
 
 process_args() {
-    while getopts "i:m:t:q:hsn" option; do
+    while getopts "i:m:t:q:l:hsn" option; do
         case "${option}" in
             i) DEST_IP=$OPTARG;;
             m) MIGTD=$OPTARG;;
             t) MIGTD_TYPE=$OPTARG;;
             s) VIRTIO_SERIAL=true;;
             n) NO_DEVICE=true;;
             q) QEMU_EXEC=$OPTARG;;
+            l) LOG_TYPE=$OPTARG;;
             h) usage
                exit 0
                ;;
@@ -62,6 +65,19 @@ process_args() {
             error "Invalid ${MIGTD_TYPE}, must be [src|dst]"
             ;;
     esac
+
+
+    case ${LOG_TYPE} in
+        "stdio")
+            echo "LOG_TYPE is set to stdio. Proceeding with standard I/O logging."
+            ;;
+        "file")
+            echo "LOG_TYPE is set to file. Proceeding with file logging."
+            ;;
+        *)
+            error "Invalid LOG_TYPE '${LOG_TYPE}', must be [stdio|file]"
+            ;;
+    esac
 }
 
 error() {
@@ -82,9 +98,14 @@ QEMU_CMD="${QEMU_EXEC} \
 -name migtd-${MIGTD_TYPE},process=migtd-${MIGTD_TYPE},debug-threads=on \
 -no-hpet \
 -nographic -vga none -nic none \
--serial mon:stdio \
 -pidfile /var/run/migtd-${MIGTD_TYPE}.pid"
 
+    if [[ ${LOG_TYPE} == stdio ]]; then
+        QEMU_CMD+=" -serial mon:stdio  "
+    else
+        QEMU_CMD+=" -serial migtd${MIGTD_TYPE}.log "
+    fi
+
     QEMU_VERSION=`${QEMU_EXEC} --version | grep -oP 'version \K[^\s]+'`
     if [ "$(printf '%s\n' "8.0.0" "${QEMU_VERSION}" | sort -V | head -n1)" == "8.0.0" ]; then
         QEMU_CMD+=" -object memory-backend-ram,id=ram1,size=32M,private=on "
@@ -106,6 +127,8 @@ QEMU_CMD="${QEMU_EXEC} \
         fi
     fi
 
+    
+
     eval "${QEMU_CMD}"
 }
 

sh_script/test/user-td.sh

@@ -20,6 +20,7 @@ TELNET_PORT=9088
 INCOMING_PORT=6666
 PRE_BINDING="false"
 SERVTD_HASH=""
+LOG_TYPE="file"
 
 
 usage() {
@@ -36,12 +37,13 @@ Usage: $(basename "$0") [OPTION]...
   -t <src|dst>              Must set userTD type, src or dst
   -g [true|false]           Use pre-binding or not, default is "false"
   -m [MigTD hash]           Hash of MigTD SERVTD_INFO_HASH, shall be provided if "-g" is true
+  -l [stdio|file]           Serial log type  
   -h                        Show this help
 EOM
 }
 
 process_args() {
-    while getopts "i:k:b:o:p:q:a:r:t:g:m:h" option; do
+    while getopts "i:k:b:o:p:q:a:r:t:g:m:l:h" option; do
         case "${option}" in
             i) GUEST_IMG=$OPTARG;;
             k) KERNEL=$OPTARG;;
@@ -54,6 +56,7 @@ process_args() {
             t) TD_TYPE=$OPTARG;;
             g) PRE_BINDING=$OPTARG;;
             m) SERVTD_HASH=$OPTARG;;
+            l) LOG_TYPE=$OPTARG;;  
             h) usage
                exit 0
                ;;
@@ -127,6 +130,18 @@ process_args() {
                 ;;
         esac
     fi
+
+    case ${LOG_TYPE} in
+        "stdio")
+            echo "LOG_TYPE is set to stdio. Proceeding with standard I/O logging."
+            ;;
+        "file")
+            echo "LOG_TYPE is set to file. Proceeding with file logging."
+            ;;
+        *)
+            error "Invalid LOG_TYPE '${LOG_TYPE}', must be [stdio|file]"
+            ;;
+    esac
 }
 
 error() {
@@ -150,7 +165,14 @@ QEMU_CMD="${QEMU_EXEC} \
 -monitor unix:/tmp/qmp-sock-${TD_TYPE},server,nowait \
 -monitor telnet:127.0.0.1:${TELNET_PORT},server,nowait \
 -device virtio-serial,romfile= \
--device virtconsole,chardev=mux -serial chardev:mux -monitor chardev:mux"
+-device virtconsole,chardev=mux -monitor chardev:mux"
+
+if [[ ${LOG_TYPE} == stdio ]]; then
+        QEMU_CMD+=" -serial chardev:mux "
+    else
+        QEMU_CMD+=" -serial usertd${MIGTD_TYPE}.log "
+    fi
+    
 OBJ_SUBCOMMAND=" -object tdx-guest,id=tdx0,sept-ve-disable=on,debug=off"
 
     QEMU_VERSION=`${QEMU_EXEC} --version | grep -oP 'version \K[^\s]+'`