From 1c98a5b3b36f7e9abe1e62dcfe49cc0fa298379f Mon Sep 17 00:00:00 2001 From: Johannes Schauer Marin Rodrigues 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 +++++------- debian/control | 3 ++- 2 files changed, 7 insertions(+), 8 deletions(-) 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" ;; diff --git a/debian/control b/debian/control index 60112be..0d63dff 100644 --- a/debian/control +++ b/debian/control @@ -13,11 +13,12 @@ Package: debvm Architecture: all Depends: ${misc:Depends}, + dpkg-dev, e2fsprogs, genext2fs, mmdebstrap (>= 1.3.0), passwd, - qemu-kvm | qemu-system-arm | qemu-system-mips | qemu-system-misc | qemu-system-ppc | qemu-system-sparc | qemu-system-x86, + qemu-kvm (>> 1:8.0) | qemu-system-any # Required for -device virtio-net-pci,netdev=net0 ipxe-qemu, Recommends: -- cgit v1.2.3