From f4d32db4a246fe342f4a8963cfe2f3b601509fa1 Mon Sep 17 00:00:00 2001
From: Travis Geiselbrecht <geist@foobox.com>
Date: Mon, 5 Sep 2022 21:54:47 -0700
Subject: [PATCH] WIP fat test tweaks, do-qemuarm tweaks

---
 lib/fs/fat/test/mkblk | 16 +++++++++-------
 scripts/do-qemuarm    |  4 +++-
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/lib/fs/fat/test/mkblk b/lib/fs/fat/test/mkblk
index 01c434af..5d941287 100755
--- a/lib/fs/fat/test/mkblk
+++ b/lib/fs/fat/test/mkblk
@@ -1,24 +1,26 @@
 #!/bin/bash
 
+set -e
 set -x
 
 # create a largeish file (crosses at least one sector)
 dd if=/dev/zero of=largefile bs=1024 count=512
 
 # create a 12 bit fat, 1K clusters, 2MB
-rm blk.bin.fat12
-mkfs.fat -C blk.bin.fat12 -S 512 -s 2 -n FAT12 2000
+rm -f blk.bin.fat12
+mkfs.fat -C blk.bin.fat12 -v -S 512 -s 2 -n FAT12 2000
 
 # create a 16 bit fat, 2K clusters, 16MB
-rm blk.bin.fat16
-mkfs.fat -C blk.bin.fat16 -S 512 -s 4 -n FAT16 16384
+rm -f blk.bin.fat16
+mkfs.fat -C blk.bin.fat16 -v -S 512 -s 4 -n FAT16 16384
 
 # create a 32 bit fat, 4K clusters, 4GB
-rm blk.bin.fat32
-mkfs.fat -C blk.bin.fat32 -S 512 -n FAT32 4194304
+rm -f blk.bin.fat32
+mkfs.fat -v -C blk.bin.fat32 -S 512 -n FAT32 4194304
+#mkfs.fat blk.bin.fat32 -v -S 512 -s 8 -n FAT32
 
 # create a huge 32 bit fat, 32K clusters, 2TB
-rm blk.bin.fat32.huge
+rm -f blk.bin.fat32.huge
 #mkfs.fat -v -C blk.bin.fat32.huge -S 512 -n FAT32 2147483648
 
 for i in blk.bin.*; do
diff --git a/scripts/do-qemuarm b/scripts/do-qemuarm
index d5ea9a1d..71563ed6 100755
--- a/scripts/do-qemuarm
+++ b/scripts/do-qemuarm
@@ -26,7 +26,7 @@ function HELP {
 DO_NET=0
 DO_NET_TAP=0
 DO_DISK=0
-DO_DISK_IMAGE=""
+DISK_IMAGE=""
 DO_64BIT=0
 DO_VIRT=0
 DO_CORTEX_M3=0
@@ -92,6 +92,8 @@ ARGS=" -cpu $CPU -m $MEMSIZE -smp $SMP -machine $MACHINE -kernel build-${PROJECT
 
 if (( $DO_DISK )); then
     ARGS+=" -drive if=none,file=${DISK_IMAGE},id=blk,format=raw"
+    # valid options are writeback, none, writethrough, directsync, unsafe
+    #ARGS+=",cache=none"
     ARGS+=" -device virtio-blk-device,drive=blk"
 fi