diff options
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rwxr-xr-x | debvm-create | 4 | ||||
| -rwxr-xr-x | debvm-run | 16 |
3 files changed, 19 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ed0fc32..b2ce36c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -63,6 +63,8 @@ arch_test: - arm64 - armhf - i386 + - mips64el + - mipsel - ppc64el - s390x before_script: diff --git a/debvm-create b/debvm-create index 51310a5..4ca4340 100755 --- a/debvm-create +++ b/debvm-create @@ -96,10 +96,10 @@ case "$ARCHITECTURE" in KERNEL_SUFFIX=-686-pae ;; mips64el) - KERNEL_SUFFIX=-mips64r2el + KERNEL_SUFFIX=-5kc-malta ;; mipsel) - KERNEL_SUFFIX=-mips32r2el + KERNEL_SUFFIX=-4kc-malta ;; ppc64el) KERNEL_SUFFIX=-powerpc64le @@ -93,7 +93,6 @@ set -- \ -no-user-config \ -name "debvm-run $IMAGE" \ -m 1G \ - -smp "$(nproc)" \ -kernel "$KERNELTMP" \ -initrd "$INITRDTMP" \ -object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0 \ @@ -101,6 +100,7 @@ set -- \ -device "virtio-net-pci,netdev=net0" \ "$@" +MAX_SMP= if test "$ARCHITECTURE" = "$VMARCH"; then QEMU=kvm # While kvm will fall back gracefully, the following options can only @@ -126,11 +126,25 @@ else ppc64el) QEMU=qemu-system-ppc64 ;; + mips64el) + QEMU="qemu-system-$VMARCH" + MAX_SMP=1 + set -- -cpu 5KEc "$@" + ;; + mipsel) + QEMU="qemu-system-$VMARCH" + MAX_SMP=1 + ;; *) QEMU="qemu-system-$VMARCH" ;; esac fi +if test "$MAX_SMP" -gt 1; then + NPROC=$(nproc) + test "$NPROC" -gt "$MAX_SMP" && NPROC=$MAX_SMP + set -- -smp "$NPROC" "$@" +fi if test -z "$GRAPHICAL"; then set -- -nographic "$@" |