From f3caaf885cf4b4f1e7489d1019f76ed517037ebe Mon Sep 17 00:00:00 2001 From: Helmut Grohne Date: Fri, 23 Dec 2022 08:16:54 +0100 Subject: debvm-run: reenable smp for ppc64el Fixes: aadbcc92761c ("Support mips* (Closes: #1)") --- debvm-run | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/debvm-run b/debvm-run index 96058d5..419c6ca 100755 --- a/debvm-run +++ b/debvm-run @@ -100,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 @@ -116,28 +117,34 @@ else case "$VMARCH" in arm64) QEMU=qemu-system-aarch64 - set -- -machine virt -cpu max -smp "$(nproc)" "$@" + set -- -machine virt -cpu max "$@" ;; arm|armel|armhf) QEMU=qemu-system-arm - set -- -machine virt -cpu max -smp "$(nproc)" "$@" + set -- -machine virt -cpu max "$@" ;; 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" - set -- -smp "$(nproc)" "$@" ;; 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 "$@" -- cgit v1.2.3