diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2022-08-23 00:13:35 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2022-08-23 18:32:15 -0400 |
| commit | 0c415915cf69f4d7e45c0a05bd8a8c4648f7f85c (patch) | |
| tree | 40207f96a88843c38ff3dca9a286ba5d0dca3e73 /lib | |
| parent | 9ca87ce77ce2085446342bdfa01b32b7a80c1496 (diff) | |
Add arm support
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/common.sh | 17 | ||||
| -rw-r--r-- | lib/libktest.sh | 4 |
2 files changed, 15 insertions, 6 deletions
diff --git a/lib/common.sh b/lib/common.sh index e8e2ab5..a43a816 100644 --- a/lib/common.sh +++ b/lib/common.sh @@ -105,6 +105,17 @@ parse_arch() QEMU_PACKAGE=qemu-system-x86 QEMU_BIN=qemu-system-x86_64 ;; + aarch64) + ktest_arch=aarch64 + DEBIAN_ARCH=arm64 + ARCH_TRIPLE= + + KERNEL_ARCH=arm64 + BITS=64 + + QEMU_PACKAGE=qemu-system-arm + QEMU_BIN=qemu-system-aarch64 + ;; mips) DEBIAN_ARCH=mips ARCH_TRIPLE=mips-linux-gnu @@ -184,11 +195,7 @@ checkdep() local dep=$1 local package=$dep - if [[ $# -ge 2 ]]; then - package=$2 - else - package=$dep - fi + [[ $# -ge 2 ]] && package=$2 local found=0 diff --git a/lib/libktest.sh b/lib/libktest.sh index 282870c..186f96c 100644 --- a/lib/libktest.sh +++ b/lib/libktest.sh @@ -285,7 +285,6 @@ start_vm() local kernelargs=() kernelargs+=(mitigations=off) - kernelargs+=(console=hvc0) kernelargs+=(root=/dev/sda rw log_buf_len=8M) kernelargs+=("ktest.dir=$ktest_dir") kernelargs+=(ktest.env=$(readlink -f "$ktest_out/vm/env")) @@ -300,6 +299,9 @@ start_vm() x86|x86_64) qemu_cmd+=(-cpu host -machine type=q35,accel=kvm,nvdimm=on) ;; + aarch64) + qemu_cmd+=(-cpu host -machine type=virt,gic-version=max,accel=kvm) + ;; mips) qemu_cmd+=(-cpu 24Kf -machine malta) ktest_cpus=1 |