Skip to content

GitLab

"...composable_kernel.git" did not exist on "87c7888ea4da3ebb32e683f653d03c97c1c3caef"
Commit 360bfc3f authored by Antoine Kaufmann's avatar Antoine Kaufmann
Browse files

experiments: use qemu-img from our compiled qemu

parent 81636e5f
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
experiments/common-functions.sh
View file @ 360bfc3f
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
EHSIM_BASE="$(readlink -f $(dirname ${BASH_SOURCE[0]})/..)" EHSIM_BASE="$(readlink -f $(dirname ${BASH_SOURCE[0]})/..)"
QEMU_CMD="$EHSIM_BASE/qemu/x86_64-softmmu/qemu-system-x86_64" QEMU_CMD="$EHSIM_BASE/qemu/x86_64-softmmu/qemu-system-x86_64"
QEMU_IMG="$EHSIM_BASE/qemu/qemu-img"
GEM5_BASE="$EHSIM_BASE/gem5" GEM5_BASE="$EHSIM_BASE/gem5"
NS3_BASE="$EHSIM_BASE/ns-3" NS3_BASE="$EHSIM_BASE/ns-3"
...@@ -57,9 +58,9 @@ run_qemu() { ...@@ -57,9 +58,9 @@ run_qemu() {
rm -f $img_a $img_b rm -f $img_a $img_b
echo Creating disk for qemu $1 echo Creating disk for qemu $1
if [ -z "$4" ]; then if [ -z "$4" ]; then
qemu-img create -f qcow2 -o backing_file=$QEMU_IMAGE $img_a $QEMU_IMG create -f qcow2 -o backing_file=$QEMU_IMAGE $img_a
else else
qemu-img create -f qcow2 -o backing_file="$EHSIM_BASE/images/output-$4/$4" $img_a $QEMU_IMG create -f qcow2 -o backing_file="$EHSIM_BASE/images/output-$4/$4" $img_a
fi fi
cp $3 $img_b cp $3 $img_b
echo Starting qemu $1 echo Starting qemu $1
...@@ -251,4 +252,4 @@ cleanup() { ...@@ -251,4 +252,4 @@ cleanup() {
date >>$OUTDIR/endtime date >>$OUTDIR/endtime
} }
trap "cleanup" SIGINT trap "cleanup" SIGINT
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment