Merge pull request #6799 from zhentang-tz/ovmf_msg_fix

cliping · web-flow · commit 606d2ff9e078 · 2026-04-02T15:09:22.000+08:00
[guest os booting]fix bootmenu msg
diff --git a/libvirt/tests/cfg/guest_os_booting/boot_menu/bootmenu.cfg b/libvirt/tests/cfg/guest_os_booting/boot_menu/bootmenu.cfg
@@ -38,7 +38,7 @@
         - by_ovmf:
             only q35, aarch64
             firmware_type = "ovmf"
-            check_prompt = "BdsDxe: loading Boot0000 "UiApp" from Fv"
+            check_prompt = BdsDxe: loading Boot[0-9]+ "(UiApp|BootManagerMenuApp)" from Fv
         - by_seabios:
             only x86_64
             firmware_type = "seabios"
diff --git a/libvirt/tests/src/guest_os_booting/boot_menu/bootmenu.py b/libvirt/tests/src/guest_os_booting/boot_menu/bootmenu.py
@@ -69,7 +69,7 @@ def run(test, params, env):
                     vm.serial_console.read_until_any_line_matches(
                         [check_prompt], timeout=30, internal_timeout=0.5
                     )
-                if check_not_prompt:
+                if check_not_prompt and len(check_not_prompt) >= 3:
                     time.sleep(1)
                     output = vm.serial_console.get_output()
                     output_lines = output.split("\n")

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ def run(test, params, env):`
`69`	`69`	`vm.serial_console.read_until_any_line_matches(`
`70`	`70`	`[check_prompt], timeout=30, internal_timeout=0.5`
`71`	`71`	`)`
`72`		`- if check_not_prompt:`
	`72`	`+ if check_not_prompt and len(check_not_prompt) >= 3:`
`73`	`73`	`time.sleep(1)`
`74`	`74`	`output = vm.serial_console.get_output()`
`75`	`75`	`output_lines = output.split("\n")`