virt_mask_windows judges the whole console, to the boot's last word

tests/common/qemu.rs

@@ -538,6 +538,10 @@ pub fn ceiling_verdict(
 /// Collect console output until `done` reads true of the whole capture, or the
 /// guest stops making progress.
 ///
+/// The capture runs past the line that made `done` true to the end of that
+/// line's drain, which can fall inside anything the guest says in more than
+/// one line.
+///
 /// The shape [`QemuInstance::drain_serial`] cannot have: its caller passes a
 /// number of seconds, and a number of seconds is a claim about the host. Here
 /// the wait ends when the guest goes quiet or wedges, so a guest with a twelfth

tests/toyos.rs

@@ -1426,15 +1426,19 @@ const VIRT_CPUS: u32 = 8;
 
 /// The windows on AArch64: `tests/virtsmpcase` on [`VIRT_CPUS`] CPUs of a
 /// `mask-windows` kernel, whose every hook checks the state it finds, judged
-/// once the case's job `unmap_touch` has ended.
+/// on the whole console once the case's job `unmap_touch` has ended and the
+/// boot has said its last word.
 fn virt_mask_windows(profile: qemu::Profile) -> Result<(), String> {
     let mut qemu = boot_virt_smp(BootOptions {
         profile,
         smp: VIRT_CPUS,
         kernel_features: toyos_build::build::MASK_WINDOWS_KERNEL,
         ..Default::default()
     });
-    mask_windows(&judge_virt_job(&mut qemu, "unmap_touch", UNMAP_TOUCH_SAID)?, VIRT_CPUS)
+    let mut serial = judge_virt_job(&mut qemu, "unmap_touch", UNMAP_TOUCH_SAID)?;
+    // To the boot's last word, said after every census and its windows: the drain that took the job's end can stop between the two.
+    await_marker(&mut qemu, &mut serial, power::SHUTTING_DOWN, "the boot's last word")?;
+    mask_windows(&serial, VIRT_CPUS)
 }
 
 /// Boot `tests/virtsmpcase` as `options` say.