From 58b2ade1e6a575eb773f7b8c4e07fec170517568 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Sat, 2 Nov 2024 14:27:37 +0100 Subject: [PATCH] board/common: don't regenerate disk image when starting qemu This fixes an annoying problem with `make run` when set to boot with a qcow2 disk image. By default the disk image was recreated every time the qemu.sh script was called. Also, add image check to enforce regen if broken. Signed-off-by: Joachim Wiberg --- board/common/qemu/qemu.sh | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/board/common/qemu/qemu.sh b/board/common/qemu/qemu.sh index add2c419..3d3f8391 100755 --- a/board/common/qemu/qemu.sh +++ b/board/common/qemu/qemu.sh @@ -273,8 +273,16 @@ gdb_args() run_qemu() { if [ "$CONFIG_QEMU_ROOTFS_VSCSI" = "y" ]; then - qemu-img create -f qcow2 -o backing_file=$CONFIG_QEMU_ROOTFS -F raw $CONFIG_QEMU_ROOTFS.qcow2 > /dev/null + if ! qemu-img check "${CONFIG_QEMU_ROOTFS}.qcow2"; then + rm -f "${CONFIG_QEMU_ROOTFS}.qcow2" + fi + if [ ! -f "${CONFIG_QEMU_ROOTFS}.qcow2" ]; then + echo "Creating qcow2 disk image for Qemu ..." + qemu-img create -f qcow2 -o backing_file="$CONFIG_QEMU_ROOTFS" \ + -F raw "${CONFIG_QEMU_ROOTFS}.qcow2" > /dev/null + fi fi + local qemu read qemu <