Bump QEMU to 6.1.0, enable virtfs
Update to latest stable version and also enable virtfs, aka virtio-9p.
This is a feature for sharing files between the host and emulated guest,
e.g. useful as a replacement for packaging files during build as ext4
images (which has problems on our CI).
Test: make test
Change-Id: I6b9bf94c90154ae80241684c632e2555cf5874a5
diff --git a/aarch64/build_qemu.sh b/aarch64/build_qemu.sh
index a375d92..88078ed 100755
--- a/aarch64/build_qemu.sh
+++ b/aarch64/build_qemu.sh
@@ -16,7 +16,7 @@
source "$(dirname "${BASH_SOURCE[0]}")/../common.inc"
-QEMU_VERSION="qemu-5.2.0"
+QEMU_VERSION="qemu-6.1.0"
OUT_DIR="$1"
TOOLCHAIN_DIR="$2"
@@ -39,6 +39,7 @@
--objcc="${OBJCC}" \
--static \
--target-list=aarch64-softmmu \
+ --enable-virtfs \
--disable-gtk \
--disable-vnc \
--disable-vhost-net \
diff --git a/aarch64/run_qemu.sh b/aarch64/run_qemu.sh
index d8dda2f..68aca8b 100755
--- a/aarch64/run_qemu.sh
+++ b/aarch64/run_qemu.sh
@@ -208,7 +208,7 @@
CMD+=(-m "${RAM}")
CMD+=(-L "${ROM_DIR}")
CMD+=(-kernel "${KERNEL}")
-CMD+=(-drive file="${ROOTFS}",readonly,if=virtio,format=raw)
+CMD+=(-drive file="${ROOTFS}",readonly=on,if=virtio,format=raw)
CMD+=(-object rng-random,filename=/dev/urandom,id=rng0)
CMD+=(-device virtio-rng-pci,rng=rng0)
CMD+=(-nographic -nodefaults -serial stdio)
@@ -218,7 +218,7 @@
# Note: Due to a bug in older versions of Bash, use '${array[@]+"${array[@]}"}'
# to expand potentially empty arrays. '${array[@]}' is treated as undefined.
for MOUNT in ${EXTRA_RO_MOUNTS[@]+"${EXTRA_RO_MOUNTS[@]}"}; do
- CMD+=(-drive "file=${MOUNT},readonly,if=virtio,format=raw")
+ CMD+=(-drive "file=${MOUNT},readonly=on,if=virtio,format=raw")
done
if [ "${GDB}" -eq 1 ]; then
