From 028f04593a82410cf7c22ad3666f1a89531ef8a9 Mon Sep 17 00:00:00 2001
From: Alexander von Gluck IV <kallisti5@unixzen.com>
Date: Wed, 24 Aug 2022 14:36:15 -0500
Subject: [PATCH] tests/qemu-boot-test: Update for riscv64

* Better testing of the riscv64 arch by providing
  more supported hardware
* Partially based on x512's research in the forums
* Example usage:
  ../src/tests/qemu-boot-test riscv64 \
    kernel:.../u-boot.bin haiku-mmc.image

Change-Id: I9fe9d3c63bd7683818fc28fad2de64545bcd4804
---
 src/tests/qemu-boot-test | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/tests/qemu-boot-test b/src/tests/qemu-boot-test
index 78875715e1..203c7aa057 100755
--- a/src/tests/qemu-boot-test
+++ b/src/tests/qemu-boot-test
@@ -108,7 +108,14 @@ case "$ARCH" in
 	echo "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
 	echo "+++ Testing $PLATFORM boot..."
 	cp $IMAGE $TEST_FILE
-	$EMULATOR -device ati-vga -drive file=$TEST_FILE,format=raw,if=virtio
+	$EMULATOR -device ati-vga \
+		-global virtio-mmio.force-legacy=false \
+		-device virtio-tablet-device,bus=virtio-mmio-bus.0 \
+		-device virtio-keyboard-device,bus=virtio-mmio-bus.1 \
+		-device virtio-blk-device,drive=x0,bus=virtio-mmio-bus.2 \
+		-device virtio-net-device,netdev=usernet,bus=virtio-mmio-bus.3 \
+		-drive file=$TEST_FILE,format=raw,if=none,id=x0 \
+		-netdev user,id=usernet
 	check_logs $TEST_SERIALLOG
 	rm -f $TEST_FILE $TEST_SERIALLOG
 	;;