Commit 1c05d7e94d for qemu.org

commit 1c05d7e94da04129ea16147074fe73158fb85ff9
Author: Emmanuel Blot <emmanuel.blot@free.fr>
Date:   Fri Jul 31 12:45:15 2026 +0200

    tests/functional: aspeed: optionally check the device tree model on boot

    Add an optional 'dt_model' argument to do_test_arm_aspeed_openbmc().
    When
    provided, the helper also waits for the kernel's "Machine model: ..."
    line,
    letting a test confirm the booted image actually matches the expected
    board
    device tree rather than only the SoC revision.

    Signed-off-by: Emmanuel Blot <emmanuel.blot@free.fr>
    Reviewed-by: Cédric Le Goater <clg@redhat.com>
    Link: https://lore.kernel.org/qemu-devel/20260731-sanmiguel-bmc-locator-v2-16-1266926ba769@free.fr
    Signed-off-by: Cédric Le Goater <clg@redhat.com>

diff --git a/tests/functional/aspeed.py b/tests/functional/aspeed.py
index 076da1036c..08af6b4839 100644
--- a/tests/functional/aspeed.py
+++ b/tests/functional/aspeed.py
@@ -8,7 +8,8 @@
 class AspeedTest(LinuxKernelTest):

     def do_test_arm_aspeed_openbmc(self, machine, image, uboot='2019.04',
-                                   cpu_id='0x0', soc='AST2500 rev A1'):
+                                   cpu_id='0x0', soc='AST2500 rev A1',
+                                   dt_model=None):
         self.set_machine(machine)
         self.vm.set_console()
         self.vm.add_args('-drive', f'file={image},if=mtd,format=raw',
@@ -19,6 +20,8 @@ def do_test_arm_aspeed_openbmc(self, machine, image, uboot='2019.04',
         self.wait_for_console_pattern('## Loading kernel from FIT Image')
         self.wait_for_console_pattern('Starting kernel ...')
         self.wait_for_console_pattern(f'Booting Linux on physical CPU {cpu_id}')
+        if dt_model:
+            self.wait_for_console_pattern(f'Machine model: {dt_model}')
         self.wait_for_console_pattern(f'ASPEED {soc}')
         self.wait_for_console_pattern('/init as init process')
         self.wait_for_boot_complete()