From eaff886b15d425cbf6c50418d15e18497b53f869 Mon Sep 17 00:00:00 2001
From: Ivan Andreyev <i.andreyev@yadro.com>
Date: Wed, 5 May 2021 13:13:29 +0000
Subject: [PATCH] FIX: log serial output to file

---
 run    | 10 ++++++++--
 vm.xml |  1 +
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/run b/run
index ba06855..22a9d07 100755
--- a/run
+++ b/run
@@ -379,7 +379,8 @@ make_xml(){
     xml ed --inplace --update "/domain/@type" -v "$3" "$xml"
     xml ed --inplace --update "/domain/os/kernel" -v "$5" "$xml"
     xml ed --inplace --update "/domain/os/initrd" -v "$6" "$xml"
-    IFS='|' read -ra vdefs <<<"$7"
+    xml ed --inplace --update "/domain/devices/serial/log/@file" -v "$7" "$xml"
+    IFS='|' read -ra vdefs <<<"$8"
     local vidx=1
     local sidx=1
     for vdef in "${vdefs[@]}"; do
@@ -425,7 +426,7 @@ make_xml(){
         fi
     done
 
-    IFS='|' read -ra idefs <<<"$8"
+    IFS='|' read -ra idefs <<<"$9"
     local ifix=0
     for idef in "${idefs[@]}"; do
         IFS=':' read -ra i <<<"$idef"
@@ -686,6 +687,8 @@ else
     DOM_TYPE=qemu
 fi
 
+SERIAL_LOG='/tmp/'$VMNAME'.log'
+
 notify "Prepare VM config"
 XML_NAME=$(make_xml "$VMNAME"                         \
                     "$HV_ARCH"                        \
@@ -693,6 +696,7 @@ XML_NAME=$(make_xml "$VMNAME"                         \
                     "$POOL"                           \
                     "$KERNEL_PATH"                    \
                     "$INITRAMFS_PATH"                 \
+                    "$SERIAL_LOG"                     \
                     "$(join_by '|' "${VOLUMES[@]}")"  \
                     "$(join_by '|' "${IFACES[@]}")"   \
                     "${KOPT[@]}")
@@ -782,7 +786,9 @@ else
       sleep 1
       state=$(virsh domstate "$VMNAME")
   done
+  ssh $HOST -C "cat $SERIAL_LOG"
 fi
+ssh $HOST -C "rm $SERIAL_LOG"
 ktest::lock
 log virsh vol-download $PORT_LIST_VOL "$TAKEN_PORTS" $POOL
 sed -i -- "/$CHANNEL_PORT/d" $TAKEN_PORTS
diff --git a/vm.xml b/vm.xml
index 482e931..df292c1 100644
--- a/vm.xml
+++ b/vm.xml
@@ -14,6 +14,7 @@
     <devices>
       <serial type='pty'>
         <target port='0'/>
+        <log file="/tmp/serial.log" append="off"/>
       </serial>
       <channel type="tcp">
           <source mode="bind" host="0.0.0.0" service="TBD"/>