temp

.github/workflows/check.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
-    - run: sudo apt-get install gcc-multilib qemu-system-x86
+    - run: sudo apt-get install -qq gcc-multilib qemu-user
     - run: cargo fmt --check
     - run: cargo fetch --quiet --locked
     - run: cargo --quiet xtask

xtask/src/main.rs

@@ -193,20 +193,6 @@ fn show_asm(target: &Target) -> Result<()> {
     Ok(())
 }
 
-fn find_qemu_binary(target: &str) -> Result<String> {
-    let prefixes = ["qemu", "qemu-system"];
-    for prefix in prefixes {
-        let name = format!("{prefix}-{target}");
-        let Ok(output) = run_command(Command::new(name.as_str()).arg("--help")) else {
-            continue;
-        };
-        if output.status.success() {
-            return Ok(name);
-        }
-    }
-    Err(anyhow!("did not find qemu binary for target {target}"))
-}
-
 fn qemu_test(target: &Target) -> Result<()> {
     let output = run_command(cargo_with_target(target, "test").args([
         "--no-run",
@@ -224,8 +210,7 @@ fn qemu_test(target: &Target) -> Result<()> {
         .strip_suffix(')')
         .context("unexpected output")?;
 
-    let qemu = find_qemu_binary(target.qemu)?;
-    run_command(Command::new(qemu).arg(test_binary_path))?;
+    run_command(Command::new(format!("qemu-{}", target.qemu)).arg(test_binary_path))?;
 
     Ok(())
 }