Enable virtIO for macOS in CI

.github/workflows/ci.yaml

@@ -74,7 +74,7 @@ jobs:
       - name: Install dependencies (via Homebrew)
         # 'expect' is only a dependency for CI testing
         run: |
-          brew install llvm qemu dtc make expect
+          brew install llvm qemu dtc make dosfstools expect
           echo "/usr/local/opt/llvm/bin:$PATH" >> $GITHUB_PATH
       - name: Install Zig
         run: |

ci/examples.sh

@@ -151,16 +151,10 @@ simulate_zig "release" "ReleaseSafe"
 build_zig "release" "ReleaseSmall"
 simulate_zig "release" "ReleaseSmall"
 
-# The setup for virtIO block does not currently work on macOS due to
-# Linux-specific utilities not being available.
-# if [ "$(uname)" == "Linux" ]; then
-
-# build_virtio "qemu_virt_aarch64" "debug"
-# build_virtio "qemu_virt_aarch64" "release"
+build_virtio "qemu_virt_aarch64" "debug"
+build_virtio "qemu_virt_aarch64" "release"
 # build_virtio "odroidc4" "debug"
 # build_virtio "odroidc4" "release"
 
-# fi
-
 echo ""
 echo "CI|INFO: Passed all VMM tests"

examples/virtio/README.md

@@ -26,6 +26,40 @@ The example currently works on the following platforms:
 * QEMU virt AArch64
 * HardKernel Odroid-C4
 
+## Dependencies
+
+In addition to the dependencies outlined in the top-level README, the following dependencies
+are needed:
+* Zig (for cross-compiling for Linux user-space)
+* mkfs.fat
+
+### Linux
+
+Zig can be installed manually or via a package manager, see
+[here](https://github.com/ziglang/zig/wiki/Install-Zig-from-a-Package-Manager).
+
+You may already have `mkfs.fat`, if not and you use `apt` try the following command:
+```sh
+sudo apt-get install dosfstools
+```
+
+### macOS
+
+Zig can be installed manually or via a package manager, see
+[here](https://github.com/ziglang/zig/wiki/Install-Zig-from-a-Package-Manager).
+
+To install `mkfs.fat` run:
+```sh
+brew install dosfstools
+```
+
+### Nix
+
+The top-level `shell.nix` has everything necessary:
+```sh
+nix-shell ../../shell.nix
+```
+
 ## Building
 
 ```sh
@@ -59,10 +93,10 @@ serial device.
 When you boot the example, you will see different coloured output for each guest.
 The Linux logs will be interleaving like so:
 ```
-Starting klogd: OKStarting klogd: 
+Starting klogd: OKStarting klogd:
 OK
 Running sysctl: Running sysctl: OK
-OKSaving random seed: 
+OKSaving random seed:
 Saving random seed: [    4.070358] random: crng init done
 [    4.103992] random: crng init done
 OK
@@ -71,7 +105,7 @@ Starting network: OK
 OK
 
 Welcome to Buildroot
-buildroot login: 
+buildroot login:
 Welcome to Buildroot
 buildroot login:
 ```

shell.nix

@@ -22,6 +22,8 @@ in
         llvm.lld
         llvm.libllvm
         llvm.libclang
+        dosfstools
+        util-linux
         # expect is only needed for CI testing but we include it for
         # completeness
         expect