summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlias Apalodimas <ilias.apalodimas@linaro.org>2020-03-12 12:11:15 +0200
committerIlias Apalodimas <ilias.apalodimas@linaro.org>2020-03-12 12:11:15 +0200
commit6eb7f57ae52ce69470235f19289964dde939f843 (patch)
tree96505776305ac3179b23311eaaea1f45c5405524
parented102db1155309c3b60c742cd35dfabc3b88db4a (diff)
scripts: qemu: Fxi x86_64
New args added for x86_64 with ovmf. Console changed to stdio, so users can stop runing with ctrl^c Signed-off-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
-rwxr-xr-xqemu/run_qemu.sh15
1 files changed, 9 insertions, 6 deletions
diff --git a/qemu/run_qemu.sh b/qemu/run_qemu.sh
index eb96d05..62b2815 100755
--- a/qemu/run_qemu.sh
+++ b/qemu/run_qemu.sh
@@ -21,28 +21,29 @@ print_help () {
[ $# -lt 2 ] && print_help
# common args
-common_args+=' -nographic -m 4096 -smp 2 -show-cursor'
+common_args+=' -m 4096 -smp 2 -show-cursor'
+common_args+=' -serial stdio '
# setup RNG
common_args+=' -device virtio-rng-pci '
# setup common network
common_args+=' -device virtio-net-pci,netdev=net0,mac=52:54:00:12:34:02 '
common_args+=' -netdev tap,id=net0,ifname=tap0,script=no,downscript=no '
-# cetup common image arguments
-common_args+=" -drive id=disk0,file=$disk_image,if=none,format=raw "
-common_args+=' -device virtio-blk-device,drive=disk0 '
-
case "$arch" in
x86_64)
extra_args+=' -cpu host -enable-kvm '
if [ "$firmware" = 'ovmf' ]; then
- extra_args+=" -drive if=pflash,format=raw,file=$ovmf_file "
+ ovmf_file='ovmf.qcow2'
+ extra_args+=" -drive file=$disk_image,id=hd,format=raw "
+ extra_args+=" -drive if=pflash,format=qcow2,file=$ovmf_file "
else
echo "U-Boot on x86-64 not supported"
exit 1
fi
;;
aarch64)
+ extra_args+=' -device virtio-blk-device,drive=disk0 '
+ extra_args+=" -drive id=disk0,file=$disk_image,if=none,format=raw "
extra_args+=' -cpu cortex-a57 '
if [ "$firmware" = 'ovmf' ]; then
@@ -58,6 +59,8 @@ case "$arch" in
fi
;;
arm)
+ extra_args+=' -device virtio-blk-device,drive=disk0 '
+ extra_args+=" -drive id=disk0,file=$disk_image,if=none,format=raw "
extra_args+=' -cpu cortex-a15 '
if [ "$firmware" = 'ovmf' ]; then