Skip to content

qemu: Handle /usr/libexec/qemu-kvm for RHEL systems #120

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 4, 2025
Merged

qemu: Handle /usr/libexec/qemu-kvm for RHEL systems #120

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 16 additions & 5 deletions crates/kit/src/qemu.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ use std::process::{Child, Command, Output, Stdio};
use std::sync::Arc;
use std::time::Duration;

use camino::Utf8PathBuf;
use camino::{Utf8Path, Utf8PathBuf};
use cap_std_ext::cmdext::CapStdExtCommandExt;
use color_eyre::eyre::{eyre, Context};
use color_eyre::Result;
Expand Down Expand Up @@ -382,10 +382,21 @@ fn spawn(
config.memory_mb
);

let qemu = std::env::var("QEMU_BIN").ok().unwrap_or_else(|| {
let arch = std::env::consts::ARCH;
format!("qemu-system-{arch}")
});
let qemu = std::env::var("QEMU_BIN")
.ok()
.map(Ok)
.unwrap_or_else(|| -> Result<_> {
// RHEL only supports non-emulated, and qemu is an implementation detail
// of higher level virt.
let libexec_qemu = Utf8Path::new("/usr/libexec/qemu-kvm");
if libexec_qemu.try_exists()? {
Ok(libexec_qemu.to_string())
} else {
let arch = std::env::consts::ARCH;
Ok(format!("qemu-system-{arch}"))
}
})
.context("Checking for qemu")?;
Comment on lines +385 to +399
Copy link

@gemini-code-assist gemini-code-assist bot Nov 3, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

While the functional-style chain with map(Ok).unwrap_or_else is correct, it can be a bit dense and harder to read for logic involving fallbacks and potential errors. Refactoring this into an immediately-invoked closure with a more traditional if/else structure makes the sequence of checks clearer and improves overall readability.

Suggested change
let qemu = std::env::var("QEMU_BIN")
.ok()
.map(Ok)
.unwrap_or_else(|| -> Result<_> {
// RHEL only supports non-emulated, and qemu is an implementation detail
// of higher level virt.
let libexec_qemu = Utf8Path::new("/usr/libexec/qemu-kvm");
if libexec_qemu.try_exists()? {
Ok(libexec_qemu.to_string())
} else {
let arch = std::env::consts::ARCH;
Ok(format!("qemu-system-{arch}"))
}
})
.context("Checking for qemu")?;
let qemu = (|| -> Result<_> {
if let Some(qemu_bin) = std::env::var("QEMU_BIN").ok() {
Ok(qemu_bin)
} else {
// RHEL only supports non-emulated, and qemu is an implementation detail
// of higher level virt.
let libexec_qemu = Utf8Path::new("/usr/libexec/qemu-kvm");
if libexec_qemu.try_exists()? {
Ok(libexec_qemu.to_string())
} else {
let arch = std::env::consts::ARCH;
Ok(format!("qemu-system-{arch}"))
}
}
})()
.context("Checking for qemu")?;


let mut cmd = Command::new(qemu);
// SAFETY: This API is safe to call in a forked child.
Expand Down