Merge pull request #1876 from rust-osdev/fix-ci

ci/fix: upgrade QEMU on windows

Author: nicholasbishop

.github/workflows/rust.yml

@@ -65,7 +65,7 @@ jobs:
     runs-on: windows-latest
     steps:
       - name: Install QEMU
-        run: choco install qemu --version 2023.4.24
+        run: choco install qemu --version 2025.12.24
       - name: Checkout sources
         uses: actions/checkout@v6
       - uses: Swatinem/rust-cache@v2

xtask/src/qemu.rs

@@ -312,20 +312,38 @@ pub fn run_qemu(arch: UefiArch, opt: &QemuOpt) -> Result<()> {
         UefiArch::AArch64 => "qemu-system-aarch64",
         UefiArch::IA32 | UefiArch::X86_64 => "qemu-system-x86_64",
     };
-    let mut cmd = Command::new(qemu_exe);
 
-    if platform::is_windows() {
-        // The QEMU installer for Windows does not automatically add the
-        // directory containing the QEMU executables to the PATH. Add
-        // the default directory to the PATH to make it more likely that
-        // QEMU will be found on Windows. (The directory is appended, so
-        // if a different directory on the PATH already has the QEMU
-        // binary this change won't affect anything.)
+    // The QEMU installer for Windows does not automatically add the
+    // directory containing the QEMU executables to the PATH. Add
+    // the default directory to the PATH to make it more likely that
+    // QEMU will be found on Windows. (The directory is appended, so
+    // if a different directory on the PATH already has the QEMU
+    // binary this change won't affect anything.)
+    let fn_append_win_path = |cmd: &mut Command| {
         let mut path = env::var_os("PATH").unwrap_or_default();
         path.push(r";C:\Program Files\qemu");
         cmd.env("PATH", path);
+    };
+
+    // Print the QEMU version
+    {
+        let mut cmd = Command::new(qemu_exe);
+        if platform::is_windows() {
+            fn_append_win_path(&mut cmd)
+        };
+        cmd.arg("--version");
+        let output = cmd.output()?;
+        eprintln!("QEMU:");
+        eprintln!("  binary : {qemu_exe}");
+        eprintln!("  version: {}", String::from_utf8(output.stdout)?);
     }
 
+    // Construct the actual QEMU argument
+    let mut cmd = Command::new(qemu_exe);
+    if platform::is_windows() {
+        fn_append_win_path(&mut cmd)
+    };
+
     // Disable default devices.
     // QEMU by defaults enables a ton of devices which slow down boot.
     cmd.arg("-nodefaults");