aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChen Gong <gong.chen@linux.intel.com>2011-04-01 16:33:58 +0800
committerAndi Kleen <ak@linux.intel.com>2011-04-20 09:35:55 -0700
commitb09d948160f571437d0df9a44a9f5fbed6118a10 (patch)
treeaf12578e9aa719a8306ff3951be0ee651638a0d8
parentbe49b1e170308d602f7319b0a986937f18c7238c (diff)
downloadmce-test-b09d948160f571437d0df9a44a9f5fbed6118a10.tar.gz
minor fixes for kvm SRAO test again
1) latest qemu monitor output format is changed, so update the condition check 2) it looks the starting anonymous memory addresses of simple_process can't be used as injection address. Just skip them. Signed-off-by: Chen Gong <gong.chen@linux.intel.com>
-rw-r--r--kvm/guest/guest_run.sh2
-rwxr-xr-xkvm/host/host_run.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/kvm/guest/guest_run.sh b/kvm/guest/guest_run.sh
index 74d49a4..0f5886b 100644
--- a/kvm/guest/guest_run.sh
+++ b/kvm/guest/guest_run.sh
@@ -28,7 +28,7 @@ cd GUEST_DIR
./page-types -p `pidof simple_process` -LN -b anon > guest_page
if [ -s guest_page ]; then
- ADDR_KLOG=`awk '$2 != "offset" {print "0x"$2}' guest_page | sed -n -e '1p'`
+ ADDR_KLOG=`awk 'NR > 3 {print "0x"$2}' guest_page | sed -n -e '1p'`
ADDR=`echo $ADDR_KLOG"000"`
echo "guest physical address is $ADDR" > guest_tmp
fi
diff --git a/kvm/host/host_run.sh b/kvm/host/host_run.sh
index 42f4dcd..51c9bda 100755
--- a/kvm/host/host_run.sh
+++ b/kvm/host/host_run.sh
@@ -300,7 +300,7 @@ addr_translate()
echo x-gpa2hva $GUEST_PHY > $monitor_console
cat $monitor_console > $monitor_console_output &
sleep 5
- HOST_VIRT=`awk '/address/{print $NF}' $monitor_console_output |cut -b 3-11`
+ HOST_VIRT=`awk '/qemu|QEMU/{next} {print $NF}' $monitor_console_output |cut -b 3-11`
echo "Host virtual address is $HOST_VIRT"
#Get Host physical address