git.annexia.org
/
qemu-sanity-check.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Set console on ARM and s390.
[qemu-sanity-check.git]
/
qemu-sanity-check.in
diff --git
a/qemu-sanity-check.in
b/qemu-sanity-check.in
index
5066ebc
..
79372ed
100644
(file)
--- a/
qemu-sanity-check.in
+++ b/
qemu-sanity-check.in
@@
-29,6
+29,7
@@
timeout=10m
accel=kvm:tcg
cpu=
memory=768
accel=kvm:tcg
cpu=
memory=768
+console=ttyS0
machine=
# Both libguestfs and virt-manager choose cpu=host when we think that
machine=
# Both libguestfs and virt-manager choose cpu=host when we think that
@@
-43,10
+44,14
@@
fi
# using -m|--machine and --cpu options.
case "$canonical_arch" in
arm*)
# using -m|--machine and --cpu options.
case "$canonical_arch" in
arm*)
+ console=ttyAMA0
machine=virt ;;
aarch*)
machine=virt ;;
aarch*)
+ console=ttyAMA0
if [ "$cpu" = "" ]; then cpu=cortex-a57; fi
machine=virt ;;
if [ "$cpu" = "" ]; then cpu=cortex-a57; fi
machine=virt ;;
+ s390*)
+ console=ttysclp0 ;;
esac
# Handle command line parsing.
esac
# Handle command line parsing.
@@
-200,7
+205,7
@@
argv[$((i++))]="$kernel"
argv[$((i++))]="-initrd"
argv[$((i++))]="$initrd"
argv[$((i++))]="-append"
argv[$((i++))]="-initrd"
argv[$((i++))]="$initrd"
argv[$((i++))]="-append"
-argv[$((i++))]="console=
ttyS0
oops=panic panic=-1"
+argv[$((i++))]="console=
$console
oops=panic panic=-1"
if [ "$verbose" = "yes" ]; then
echo "${argv[@]}"
if [ "$verbose" = "yes" ]; then
echo "${argv[@]}"