1 files changed, 2 insertions, 10 deletions
diff --git a/debvm-run b/debvm-run
index bc206ac..7e81b79 100755
--- a/debvm-run
+++ b/debvm-run
@@ -64,14 +64,6 @@ if command -v elf-arch >/dev/null 2>&1; then
 	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" \
 	"$@"