From aadbcc92761cf3bbc730ccf39aa5e09d22f343db Mon Sep 17 00:00:00 2001
From: Jochen Sprickerhof <git@jochen.sprickerhof.de>
Date: Wed, 21 Dec 2022 20:09:03 +0100
Subject: Support mips* (Closes: #1)

---
 .gitlab-ci.yml |  2 ++
 debvm-create   |  4 ++--
 debvm-run      | 13 ++++++++++---
 3 files changed, 14 insertions(+), 5 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 c44b67d..cbf1a04 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
diff --git a/debvm-run b/debvm-run
index 9b26a76..96058d5 100755
--- a/debvm-run
+++ b/debvm-run
@@ -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 \
@@ -117,17 +116,25 @@ else
 	case "$VMARCH" in
 		arm64)
 			QEMU=qemu-system-aarch64
-			set -- -machine virt -cpu max "$@"
+			set -- -machine virt -cpu max -smp "$(nproc)" "$@"
 		;;
 		arm|armel|armhf)
 			QEMU=qemu-system-arm
-			set -- -machine virt -cpu max "$@"
+			set -- -machine virt -cpu max -smp "$(nproc)" "$@"
 		;;
 		ppc64el)
 			QEMU=qemu-system-ppc64
 		;;
+		mips64el)
+			QEMU="qemu-system-$VMARCH"
+			set -- -cpu 5KEc "$@"
+		;;
+		mipsel)
+			QEMU="qemu-system-$VMARCH"
+		;;
 		*)
 			QEMU="qemu-system-$VMARCH"
+			set -- -smp "$(nproc)" "$@"
 		;;
 	esac
 fi
-- 
cgit v1.2.3


From f3caaf885cf4b4f1e7489d1019f76ed517037ebe Mon Sep 17 00:00:00 2001
From: Helmut Grohne <helmut@subdivi.de>
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


From cb3bc614a76ca2155ce01e5feb0a15e639ee8a39 Mon Sep 17 00:00:00 2001
From: Helmut Grohne <helmut@subdivi.de>
Date: Fri, 23 Dec 2022 08:17:55 +0100
Subject: debvm-run: allow -smp 2 for mipsel

---
 debvm-run | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debvm-run b/debvm-run
index 419c6ca..7c6f4ff 100755
--- a/debvm-run
+++ b/debvm-run
@@ -133,7 +133,7 @@ else
 		;;
 		mipsel)
 			QEMU="qemu-system-$VMARCH"
-			MAX_SMP=1
+			MAX_SMP=2
 		;;
 		*)
 			QEMU="qemu-system-$VMARCH"
-- 
cgit v1.2.3


From 88e8a557c7f181d540365ddb8d26b32df19ae45d Mon Sep 17 00:00:00 2001
From: Helmut Grohne <helmut@subdivi.de>
Date: Fri, 23 Dec 2022 09:15:07 +0100
Subject: Revert "debvm-run: allow -smp 2 for mipsel"

This reverts commit cb3bc614a76ca2155ce01e5feb0a15e639ee8a39.

Still hangs for Jochen. Let's not investigate further.
---
 debvm-run | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debvm-run b/debvm-run
index 7c6f4ff..419c6ca 100755
--- a/debvm-run
+++ b/debvm-run
@@ -133,7 +133,7 @@ else
 		;;
 		mipsel)
 			QEMU="qemu-system-$VMARCH"
-			MAX_SMP=2
+			MAX_SMP=1
 		;;
 		*)
 			QEMU="qemu-system-$VMARCH"
-- 
cgit v1.2.3