From 9478cb54d873222d6fba7e8972f3e1a54fa44ad0 Mon Sep 17 00:00:00 2001
From: Johannes Schauer Marin Rodrigues <josch@mister-muffin.de>
Date: Wed, 21 Dec 2022 20:17:25 +0100
Subject: debvm-run: if mmdebstrap failed, the image file might exist but have
 zero size -- test for that

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

(limited to 'debvm-run')

diff --git a/debvm-run b/debvm-run
index ce27280..3ccbf14 100755
--- a/debvm-run
+++ b/debvm-run
@@ -44,6 +44,7 @@ while test "$#" -gt 0; do
 done
 
 test -f "$IMAGE" || die "image '$IMAGE' not found"
+test -s "$IMAGE" || die "image '$IMAGE' is empty"
 
 cleanup() {
 	set +x
-- 
cgit v1.2.3


From bfaa3d124fab6164cdd78101d98a39d5ff74d361 Mon Sep 17 00:00:00 2001
From: Johannes Schauer Marin Rodrigues <josch@mister-muffin.de>
Date: Wed, 21 Dec 2022 20:17:55 +0100
Subject: debvm-run: on arm64 there is no default machine -- set one

---
 debvm-run | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'debvm-run')

diff --git a/debvm-run b/debvm-run
index 3ccbf14..aa09ccb 100755
--- a/debvm-run
+++ b/debvm-run
@@ -105,6 +105,11 @@ if test "$ARCHITECTURE" = "$VMARCH"; then
 	if test -w /dev/kvm; then
 		set -- -enable-kvm -cpu host "$@"
 	fi
+	case "$VMARCH" in
+		arm64)
+			set -- -machine type=virt,gic-version=host "$@"
+		;;
+	esac
 else
 	case "$VMARCH" in
 		arm64)
-- 
cgit v1.2.3


From 6f422d6b4ea1fa9424f086297ad4166a3ddd4822 Mon Sep 17 00:00:00 2001
From: Johannes Schauer Marin Rodrigues <josch@mister-muffin.de>
Date: Wed, 21 Dec 2022 20:19:52 +0100
Subject: debvm-run: run qemu with -no-user-config

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

(limited to 'debvm-run')

diff --git a/debvm-run b/debvm-run
index aa09ccb..bc206ac 100755
--- a/debvm-run
+++ b/debvm-run
@@ -90,6 +90,7 @@ KERNEL_CMDLINE=root=/dev/$DISKDEV
 NETDEV="user,id=net0"
 
 set -- \
+	-no-user-config \
 	-m 1G \
 	-smp "$(nproc)" \
 	-kernel "$KERNELTMP" \
-- 
cgit v1.2.3


From 7bf0476dc5e8a09e524b3116627d57aa5edbfd2b Mon Sep 17 00:00:00 2001
From: Johannes Schauer Marin Rodrigues <josch@mister-muffin.de>
Date: Wed, 21 Dec 2022 20:24:30 +0100
Subject: attach the disk via virtio interface for some speed gain and to unify
 the device node to be vda always

---
 debvm-create | 10 +---------
 debvm-run    | 12 ++----------
 2 files changed, 3 insertions(+), 19 deletions(-)

(limited to 'debvm-run')

diff --git a/debvm-create b/debvm-create
index d827e5c..f34328e 100755
--- a/debvm-create
+++ b/debvm-create
@@ -122,15 +122,7 @@ set -- \
 	"$@"
 
 # unless we set up a fstab, / will be read-only
-case "$ARCHITECTURE" in
-	amd64|i386|ppc64el)
-		DISKDEV=sda
-	;;
-	*)
-		DISKDEV=vda
-	;;
-esac
-set -- "--customize-hook=echo '/dev/$DISKDEV / ext4 defaults 0 1' >"'"$1/etc/fstab"' "$@"
+set -- "--customize-hook=echo '/dev/vda / ext4 defaults 0 1' >"'"$1/etc/fstab"' "$@"
 
 # set up a hostname
 set -- \
diff --git a/debvm-run b/debvm-run
index bc206ac..7e81b79 100755
--- a/debvm-run
+++ b/debvm-run
@@ -63,14 +63,6 @@ if command -v elf-arch >/dev/null 2>&1; then
 	/sbin/debugfs "$IMAGE" -R "cat /bin/true" > "$KERNELTMP"
 	VMARCH=$(elf-arch "$KERNELTMP")
 fi
-case "$VMARCH" in
-	amd64|i386|ppc64el)
-		DISKDEV=sda
-	;;
-	*)
-		DISKDEV=vda
-	;;
-esac
 case "$VMARCH" in
 	mips*|ppc64el)
 		KERNELLINK=vmlinux
@@ -86,7 +78,7 @@ INITRDNAME=$(/sbin/debugfs "$IMAGE" -R "stat initrd.img" | sed 's/Fast link dest
 test -n "$KERNELNAME" || die "failed to discover kernel image"
 test -n "$INITRDNAME" || die "failed to discover initrd image"
 
-KERNEL_CMDLINE=root=/dev/$DISKDEV
+KERNEL_CMDLINE=root=/dev/vda
 NETDEV="user,id=net0"
 
 set -- \
@@ -95,7 +87,7 @@ set -- \
 	-smp "$(nproc)" \
 	-kernel "$KERNELTMP" \
 	-initrd "$INITRDTMP" \
-	-drive "media=disk,format=raw,discard=unmap,file=$IMAGE" \
+	-drive "media=disk,format=raw,discard=unmap,file=$IMAGE,if=virtio" \
 	-device "virtio-net-pci,netdev=net0" \
 	"$@"
 
-- 
cgit v1.2.3