Commit 8fb3075916 for qemu.org

commit 8fb307591625731060d399aca42373c02c7cb040
Author: Bin Meng <bin.meng@processmission.com>
Date:   Mon Jul 13 20:02:44 2026 +0800

    tests/functional/riscv64: sifive_u: Fix kernel command line

    Build the complete kernel command line before adding it to the QEMU
    arguments. This ensures the panic, noreboot and rootwait options are
    passed to the guest.

    Fixes: 7db162fa0138 ("tests/functional: Test SPI-SD adapter without SD card connected")
    Signed-off-by: Bin Meng <bin.meng@processmission.com>

    Reviewed-by: Chao Liu <chao.liu@processmission.com>
    Reviewed-by: Philippe Mathieu-Daudé <philmd@oss.qualcomm.com>
    Message-ID: <20260713120245.781959-1-bin.meng@processmission.com>
    Signed-off-by: Alistair Francis <alistair.francis@wdc.com>

diff --git a/tests/functional/riscv64/test_sifive_u.py b/tests/functional/riscv64/test_sifive_u.py
index 847f709da1..54a0f9c648 100755
--- a/tests/functional/riscv64/test_sifive_u.py
+++ b/tests/functional/riscv64/test_sifive_u.py
@@ -35,9 +35,6 @@ def do_test_riscv64_sifive_u_mmc_spi(self, connect_card):
         kernel_command_line = (self.KERNEL_COMMON_COMMAND_LINE +
                                'earlycon=sbi console=ttySIF0 '
                                'root=/dev/mmcblk0 ')
-        self.vm.add_args('-kernel', kernel_path,
-                         '-append', kernel_command_line,
-                         '-no-reboot')
         if connect_card:
             kernel_command_line += 'panic=-1 noreboot rootwait '
             self.vm.add_args('-drive', f'file={rootfs_path},if=sd,format=raw')
@@ -46,6 +43,9 @@ def do_test_riscv64_sifive_u_mmc_spi(self, connect_card):
             kernel_command_line += 'panic=0 noreboot '
             pattern = 'Cannot open root device "mmcblk0" or unknown-block(0,0)'

+        self.vm.add_args('-kernel', kernel_path,
+                         '-append', kernel_command_line,
+                         '-no-reboot')
         self.vm.launch()
         self.wait_for_console_pattern(pattern)