Update validate.sh to login and execute command in QEMU

Signed-off-by: Teoh Suh Haw <suh.haw.teoh@intel.com>

Author: elvin03

validate.sh

@@ -44,8 +44,9 @@ run_qemu_boot_test() {
   fi
 
   BIOS="/usr/share/OVMF/OVMF_CODE_4M.fd"
-  TIMEOUT=30
-  SUCCESS_STRING="login:"
+  TIMEOUT=60
+  LOGIN_SUCCESS_STRING="login:"
+  UNAME_SUCCESS_STRING="Linux"
   LOGFILE="qemu_serial.log"
 
   ORIGINAL_DIR=$(pwd)
@@ -84,44 +85,87 @@ run_qemu_boot_test() {
   #create log file ,boot image into qemu , return the pass or fail after boot sucess
   sudo bash -c "
     LOGFILE=\"$LOGFILE\"
-    SUCCESS_STRING=\"$SUCCESS_STRING\"
+    LOGIN_SUCCESS_STRING=\"$LOGIN_SUCCESS_STRING\"
+    UNAME_SUCCESS_STRING=\"$UNAME_SUCCESS_STRING\"
     IMAGE=\"$IMAGE\"
     RAW_IMAGE=\"$RAW_IMAGE\"
     ORIGINAL_DIR=\"$ORIGINAL_DIR\"
     
-    touch \"\$LOGFILE\" && chmod 666 \"\$LOGFILE\"    
+    touch \"\$LOGFILE\" && chmod 666 \"\$LOGFILE\"
+    
+    # Create a named pipe for sending commands to QEMU
+    mkfifo qemu_input
+    
+    # Copy OVMF vars to writable location
+    cp /usr/share/OVMF/OVMF_VARS_4M.fd ./OVMF_VARS_4M.fd
+    
+    # Start QEMU with proper console configuration
     nohup qemu-system-x86_64 \\
         -m 2048 \\
         -enable-kvm \\
         -cpu host \\
         -drive if=none,file=\"\$IMAGE\",format=raw,id=nvme0 \\
         -device nvme,drive=nvme0,serial=deadbeef \\
         -drive if=pflash,format=raw,readonly=on,file=/usr/share/OVMF/OVMF_CODE_4M.fd \\
-        -drive if=pflash,format=raw,file=/usr/share/OVMF/OVMF_VARS_4M.fd \\
+        -drive if=pflash,format=raw,file=./OVMF_VARS_4M.fd \\
         -nographic \\
-        -serial mon:stdio \\
-        > \"\$LOGFILE\" 2>&1 &
+        -monitor none \\
+        -serial file:\"\$LOGFILE\" \\
+        -netdev user,id=net0 \\
+        -device virtio-net-pci,netdev=net0 \\
+        < qemu_input &
 
     qemu_pid=\$!
     echo \"QEMU launched as root with PID \$qemu_pid\"
     echo \"Current working dir: \$(pwd)\"
 
-    # Wait for SUCCESS_STRING or timeout
-    timeout=30
+    # Wait for login prompt
+    timeout=60
     elapsed=0
-    while ! grep -q \"\$SUCCESS_STRING\" \"\$LOGFILE\" && [ \$elapsed -lt \$timeout ]; do
+    while ! grep -q \"\$LOGIN_SUCCESS_STRING\" \"\$LOGFILE\" && [ \$elapsed -lt \$timeout ]; do
       sleep 1
       elapsed=\$((elapsed + 1))
     done
-    echo \"\$elapsed\"
-    kill \$qemu_pid
+    
+    if grep -q \"\$LOGIN_SUCCESS_STRING\" \"\$LOGFILE\"; then
+      echo \"Login prompt detected after \$elapsed seconds\"
+      
+      # Send login sequence
+      {
+        echo \"user\"
+        sleep 2
+        echo \"user\"
+        sleep 2
+        echo \"uname -a\"
+        sleep 2
+        echo \"exit\"
+        sleep 1
+      } > qemu_input &
+      
+      # Wait for uname output
+      uname_timeout=30
+      uname_elapsed=0
+      while ! grep -q \"\$UNAME_SUCCESS_STRING\" \"\$LOGFILE\" && [ \$uname_elapsed -lt \$uname_timeout ]; do
+        sleep 1
+        uname_elapsed=\$((uname_elapsed + 1))
+      done
+      
+      echo \"Waiting completed after \$uname_elapsed seconds\"
+    fi
+    
+    # Clean up and kill QEMU
+    kill \$qemu_pid 2>/dev/null || true
+    rm -f qemu_input OVMF_VARS_4M.fd
+    
+    echo \"=== QEMU Output ===\"
     cat \"\$LOGFILE\"
+    echo \"=== End Output ===\"
 
-    if grep -q \"\$SUCCESS_STRING\" \"\$LOGFILE\"; then
-      echo \"Boot success!\"
+    if grep -q \"\$UNAME_SUCCESS_STRING\" \"\$LOGFILE\"; then
+      echo \"Login and uname command executed successfully!\"
       result=0
     else
-      echo \"Boot failed or timed out\"
+      echo \"Failed to login or execute uname command\"
       result=1
     fi
     
@@ -149,8 +193,9 @@ run_qemu_boot_test_iso() {
   fi
 
   BIOS="/usr/share/OVMF/OVMF_CODE_4M.fd"
-  TIMEOUT=30
-  SUCCESS_STRING="login:"
+  TIMEOUT=60
+  LOGIN_SUCCESS_STRING="login:"
+  UNAME_SUCCESS_STRING="Linux"
   LOGFILE="qemu_serial_iso.log"
 
   ORIGINAL_DIR=$(pwd)
@@ -184,45 +229,86 @@ run_qemu_boot_test_iso() {
   #create log file ,boot ISO image into qemu , return the pass or fail after boot sucess
   sudo bash -c "
     LOGFILE=\"$LOGFILE\"
-    SUCCESS_STRING=\"$SUCCESS_STRING\"
+    LOGIN_SUCCESS_STRING=\"$LOGIN_SUCCESS_STRING\"
+    UNAME_SUCCESS_STRING=\"$UNAME_SUCCESS_STRING\"
     IMAGE=\"$IMAGE\"
-    RAW_IMAGE=\"$RAW_IMAGE\"
     ORIGINAL_DIR=\"$ORIGINAL_DIR\"
     
-    touch \"\$LOGFILE\" && chmod 666 \"\$LOGFILE\"    
+    touch \"\$LOGFILE\" && chmod 666 \"\$LOGFILE\"
+    
+    # Create a named pipe for sending commands to QEMU
+    mkfifo qemu_input_iso
+    
+    # Copy OVMF vars to writable location
+    cp /usr/share/OVMF/OVMF_VARS_4M.fd ./OVMF_VARS_4M_iso.fd
+    
+    # Start QEMU with ISO using CD-ROM drive
     nohup qemu-system-x86_64 \\
         -m 2048 \\
         -enable-kvm \\
         -cpu host \\
-        -drive if=none,file=\"\$IMAGE\",format=raw,id=nvme0 \\
-        -device nvme,drive=nvme0,serial=deadbeef \\
+        -cdrom \"\$IMAGE\" \\
         -drive if=pflash,format=raw,readonly=on,file=/usr/share/OVMF/OVMF_CODE_4M.fd \\
-        -drive if=pflash,format=raw,file=/usr/share/OVMF/OVMF_VARS_4M.fd \\
+        -drive if=pflash,format=raw,file=./OVMF_VARS_4M_iso.fd \\
         -nographic \\
-        -serial mon:stdio \\
-        > \"\$LOGFILE\" 2>&1 &
+        -monitor none \\
+        -serial file:\"\$LOGFILE\" \\
+        -netdev user,id=net0 \\
+        -device virtio-net-pci,netdev=net0 \\
+        < qemu_input_iso &
 
     qemu_pid=\$!
     echo \"QEMU launched as root with PID \$qemu_pid\"
     echo \"Current working dir: \$(pwd)\"
 
-    # Wait for SUCCESS_STRING or timeout
-    timeout=30
+    # Wait for login prompt
+    timeout=60
     elapsed=0
-    while ! grep -q \"\$SUCCESS_STRING\" \"\$LOGFILE\" && [ \$elapsed -lt \$timeout ]; do
+    while ! grep -q \"\$LOGIN_SUCCESS_STRING\" \"\$LOGFILE\" && [ \$elapsed -lt \$timeout ]; do
       sleep 1
       elapsed=\$((elapsed + 1))
     done
-    echo \"\$elapsed\"
-    kill \$qemu_pid
+    
+    if grep -q \"\$LOGIN_SUCCESS_STRING\" \"\$LOGFILE\"; then
+      echo \"Login prompt detected after \$elapsed seconds\"
+      
+      # Send login sequence
+      {
+        echo \"user\"
+        sleep 2
+        echo \"user\"
+        sleep 2
+        echo \"uname -a\"
+        sleep 2
+        echo \"exit\"
+        sleep 1
+      } > qemu_input_iso &
+      
+      # Wait for uname output
+      uname_timeout=30
+      uname_elapsed=0
+      while ! grep -q \"\$UNAME_SUCCESS_STRING\" \"\$LOGFILE\" && [ \$uname_elapsed -lt \$uname_timeout ]; do
+        sleep 1
+        uname_elapsed=\$((uname_elapsed + 1))
+      done
+      
+      echo \"Waiting completed after \$uname_elapsed seconds\"
+    fi
+    
+    # Clean up and kill QEMU
+    kill \$qemu_pid 2>/dev/null || true
+    rm -f qemu_input_iso OVMF_VARS_4M_iso.fd
+    
+    echo \"=== QEMU ISO Output ===\"
     cat \"\$LOGFILE\"
+    echo \"=== End Output ===\"
 
-    if grep -q \"\$SUCCESS_STRING\" \"\$LOGFILE\"; then
-      echo \"Boot success!\"
+    if grep -q \"\$UNAME_SUCCESS_STRING\" \"\$LOGFILE\"; then
+      echo \"Login and uname command executed successfully!\"
       result=0
     else
-      echo \"Boot failed or timed out\"
-      result=0 #setting return value 0 instead of 1 until fully debugged ERRRORRR
+      echo \"Failed to login or execute uname command\"
+      result=1
     fi
     
     # Return to original directory