From 1c98a5b3b36f7e9abe1e62dcfe49cc0fa298379f Mon Sep 17 00:00:00 2001
From: Johannes Schauer Marin Rodrigues <josch@mister-muffin.de>
Date: Tue, 18 Apr 2023 13:29:02 +0200
Subject: bin/debvm-run: qemu (>> 1:8.0) provides symlinks for
 qemu-system-${debarch} as well as qemu-system-any

---
 bin/debvm-run | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'bin/debvm-run')

diff --git a/bin/debvm-run b/bin/debvm-run
index f3811ad..909d2a2 100755
--- a/bin/debvm-run
+++ b/bin/debvm-run
@@ -270,7 +270,11 @@ set -- \
 	-object rng-random,filename=/dev/urandom,id=rng0 \
 	"$@"
 
-QEMU="qemu-system-$KERNELARCH"
+# 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.
+QEMU="qemu-system-$(dpkg-architecture --force --host-arch $KERNELARCH --query DEB_HOST_ARCH_CPU)"
 CPU=
 MACHINE=
 MAX_SMP=
@@ -279,7 +283,6 @@ RNG_DEV=virtio-rng-pci,rng=rng0
 
 case "$KERNELARCH" in
 	amd64)
-		QEMU=qemu-system-x86_64
 		MACHINE="type=q35"
 	;;
 	arm|armel|armhf)
@@ -288,7 +291,6 @@ case "$KERNELARCH" in
 		MAX_SMP=8
 	;;
 	arm64)
-		QEMU=qemu-system-aarch64
 		CPU=max,pauth-impdef=on
 		MACHINE="type=virt,gic-version=max"
 	;;
@@ -306,12 +308,8 @@ case "$KERNELARCH" 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


From fb5708a5518bbbde2f55847cb8f1cc0b433cb178 Mon Sep 17 00:00:00 2001
From: Helmut Grohne <helmut@subdivi.de>
Date: Mon, 19 Jun 2023 14:12:07 +0200
Subject: debvm-run: make shellcheck happy

Fixes: 1c98a5b3b36f ("bin/debvm-run: qemu (>> 1:8.0) provides symlinks for qemu-system-${debarch} as well as qemu-system-any")
---
 bin/debvm-run | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'bin/debvm-run')

diff --git a/bin/debvm-run b/bin/debvm-run
index 909d2a2..d09d8c7 100755
--- a/bin/debvm-run
+++ b/bin/debvm-run
@@ -274,7 +274,7 @@ set -- \
 # 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.
-QEMU="qemu-system-$(dpkg-architecture --force --host-arch $KERNELARCH --query DEB_HOST_ARCH_CPU)"
+QEMU="qemu-system-$(dpkg-architecture --force --host-arch "$KERNELARCH" --query DEB_HOST_ARCH_CPU)"
 CPU=
 MACHINE=
 MAX_SMP=
-- 
cgit v1.2.3


From e36f7f1d7b8b2e41154dd07981129bace2293403 Mon Sep 17 00:00:00 2001
From: Helmut Grohne <helmut@subdivi.de>
Date: Mon, 19 Jun 2023 14:16:31 +0200
Subject: debvm-run: match on DEB_HOTS_ARCH_CPU rather than DEB_HOST_ARCH

This way we loose unnecessary detail such as libc, kernel and abi. For
one thing this simplifies the arm* match. For another, this makes us
stop think about arm64ilp32 or x32.
---
 bin/debvm-run | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'bin/debvm-run')

diff --git a/bin/debvm-run b/bin/debvm-run
index d09d8c7..406da39 100755
--- a/bin/debvm-run
+++ b/bin/debvm-run
@@ -274,18 +274,19 @@ set -- \
 # 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.
-QEMU="qemu-system-$(dpkg-architecture --force --host-arch "$KERNELARCH" --query DEB_HOST_ARCH_CPU)"
+KERNELARCHCPU="$(dpkg-architecture --force --host-arch "$KERNELARCH" --query DEB_HOST_ARCH_CPU)"
+QEMU="qemu-system-$KERNELARCHCPU"
 CPU=
 MACHINE=
 MAX_SMP=
 NIC_DEV=virtio-net-pci,netdev=net0
 RNG_DEV=virtio-rng-pci,rng=rng0
 
-case "$KERNELARCH" in
+case "$KERNELARCHCPU" in
 	amd64)
 		MACHINE="type=q35"
 	;;
-	arm|armel|armhf)
+	arm)
 		CPU=max
 		MACHINE="type=virt"
 		MAX_SMP=8
-- 
cgit v1.2.3