diff options
| author | Helmut Grohne <helmut@subdivi.de> | 2022-12-23 10:23:16 +0100 |
|---|---|---|
| committer | Helmut Grohne <helmut@subdivi.de> | 2022-12-23 10:23:16 +0100 |
| commit | a6b2f6ea32ca96dcca10ff9ff647d5153ab4519f (patch) | |
| tree | a229106423b3e80b451a362f29849d6a05ed9dd6 /debvm-run | |
| parent | c100114c51d2f5e9e8ed2efd58d065b0dd3b34f8 (diff) | |
| parent | a2dbdff591b22d2d85cf0e41b517c41c2bb7ba3f (diff) | |
| download | debvm-a6b2f6ea32ca96dcca10ff9ff647d5153ab4519f.tar.gz | |
Merge branch main into branch dns
This allows using the newly added DEBVER variable.
Diffstat (limited to 'debvm-run')
| -rwxr-xr-x | debvm-run | 16 |
1 files changed, 15 insertions, 1 deletions
@@ -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 "$@" |