From 1f768f1dae33667b5486678f6282a2fe3a530b66 Mon Sep 17 00:00:00 2001
From: Helmut Grohne <helmut@subdivi.de>
Date: Sat, 29 Mar 2025 12:48:17 +0100
Subject: debvm-run: re-enable qemu detection for pre-trixie

Fixes: 1c98a5b3b36f ("qemu-system-${debarch} as well as qemu-system-any")
---
 bin/debvm-run | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'bin')

diff --git a/bin/debvm-run b/bin/debvm-run
index 588a153..4e94b8f 100755
--- a/bin/debvm-run
+++ b/bin/debvm-run
@@ -366,7 +366,7 @@ set -- \
 # Translate KERNELARCH (a Debian architecture) to a Debian CPU name.
 # This utilizes the QEMU Debian package symlink mapping that ensures that
 # calling qemu-system-${DEB_HOST_ARCH_CPU} will run the QEMU binary providing
-# the correct emulator for that CPU.
+# the correct emulator for that CPU in trixie and later.
 KERNELARCHCPU="$(dpkg-architecture --force --host-arch "$KERNELARCH" --query DEB_HOST_ARCH_CPU)"
 QEMU="qemu-system-$KERNELARCHCPU"
 CPU=
@@ -375,6 +375,7 @@ MAX_SMP=
 
 case "$KERNELARCHCPU" in
 	amd64)
+		QEMU=qemu-system-x86_64
 		MACHINE="type=q35"
 	;;
 	arm)
@@ -383,6 +384,7 @@ case "$KERNELARCHCPU" in
 		MAX_SMP=8
 	;;
 	arm64)
+		QEMU=qemu-system-aarch64
 		CPU=max,pauth-impdef=on
 		MACHINE="type=virt,gic-version=max"
 	;;
@@ -391,6 +393,9 @@ case "$KERNELARCHCPU" in
 		MAX_SMP=1
 		: "${TRANSPORT:=device}"
 	;;
+	loong64)
+		QEMU=qemu-system-loongarch64
+	;;
 	mips64el)
 		CPU=5KEc
 		MAX_SMP=1
@@ -399,8 +404,12 @@ case "$KERNELARCHCPU" in
 		MAX_SMP=1
 	;;
 	powerpc)
+		QEMU=qemu-system-ppc
 		MAX_SMP=1
 	;;
+	ppc64el)
+		QEMU=qemu-system-ppc64
+	;;
 	riscv64)
 		MACHINE="type=virt"
 	;;
-- 
cgit v1.2.3