diff mbox series

[isar-cip-core] start-qemu: Fix inclusion of QEMU_EXTRA_ARGS

Message ID 891fa572-6c47-4ad1-8e48-1cb62b4751c7@siemens.com (mailing list archive)
State Accepted
Headers show
Series [isar-cip-core] start-qemu: Fix inclusion of QEMU_EXTRA_ARGS | expand

Commit Message

Jan Kiszka Jan. 15, 2024, 7:47 a.m. UTC 
From: Jan Kiszka <jan.kiszka@siemens.com>

This was forgotten for the riscv swupdate case, but it is actually
better done via QEMU_COMMON_OPTIONS in the first place.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 start-qemu.sh | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
diff mbox series

Patch

diff --git a/start-qemu.sh b/start-qemu.sh
index 080f939c..98af9717 100755
--- a/start-qemu.sh
+++ b/start-qemu.sh
@@ -165,6 +165,7 @@  QEMU_COMMON_OPTIONS=" \
 	-m 1G \
 	-serial mon:stdio \
 	-netdev user,id=net,hostfwd=tcp:127.0.0.1:22222-:22 \
+	${QEMU_EXTRA_ARGS} \
 	"
 
 if [ "$TPM2_ENCRYPTION" = "true" ] && [ -x /usr/bin/swtpm ]; then
@@ -199,14 +200,14 @@  if [ -n "${SECURE_BOOT}${SWUPDATE_BOOT}" ]; then
 					-drive if=pflash,format=raw,unit=0,readonly=on,file=${ovmf_code} \
 					-drive if=pflash,format=raw,file=${ovmf_vars} \
 					-drive file=${IMAGE_PREFIX}.wic,discard=unmap,if=none,id=disk,format=raw \
-					${QEMU_COMMON_OPTIONS} ${QEMU_EXTRA_ARGS} "$@"
+					${QEMU_COMMON_OPTIONS} "$@"
 			else
 				ovmf_code=${OVMF_CODE:-./build/tmp/deploy/images/qemu-amd64/OVMF/OVMF_CODE_4M.fd}
 
 				${QEMU_PATH}${QEMU} \
 					-drive file=${IMAGE_PREFIX}.wic,discard=unmap,if=none,id=disk,format=raw \
 					-drive if=pflash,format=raw,unit=0,readonly=on,file=${ovmf_code} \
-					${QEMU_COMMON_OPTIONS} ${QEMU_EXTRA_ARGS} "$@"
+					${QEMU_COMMON_OPTIONS} "$@"
 			fi
 			;;
 		arm64|aarch64|arm|armhf)
@@ -215,7 +216,7 @@  if [ -n "${SECURE_BOOT}${SWUPDATE_BOOT}" ]; then
 			${QEMU_PATH}${QEMU} \
 				-drive file=${IMAGE_PREFIX}.wic,discard=unmap,if=none,id=disk,format=raw \
 				-bios ${u_boot_bin} \
-				${QEMU_COMMON_OPTIONS} ${QEMU_EXTRA_ARGS} "$@"
+				${QEMU_COMMON_OPTIONS} "$@"
 			;;
 		rv64|riscv64)
 			opensbi_bin=${FIRMWARE_BIN:-./build/tmp/deploy/images/qemu-${QEMU_ARCH}/fw_payload.bin}
@@ -240,5 +241,5 @@  else
 			-drive file=${IMAGE_FILE},discard=unmap,if=none,id=disk,format=raw \
 			-kernel ${KERNEL_FILE} -append "${KERNEL_CMDLINE}" \
 			-initrd ${INITRD_FILE} \
-			${QEMU_COMMON_OPTIONS} ${QEMU_EXTRA_ARGS} "$@"
+			${QEMU_COMMON_OPTIONS} "$@"
 fi