kata-containers/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2026-08-05 02:19:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

ch-remote: Support FD-based VFIO devices

Browse Source 
Signed-off-by: Bo Chen <bchen@crusoe.ai>
Assisted-by: Claude:Opus-4.7
This commit is contained in:
Bo Chen
2026-04-24 01:14:58 +00:00
committed by Rob Bradford
parent 0419ab6f39
commit e4934de3c9
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cloud-hypervisor/src/bin/ch-remote.rs
+16 -6
View File
@@ -371,14 +371,14 @@ fn rest_api_do_command(matches: &ArgMatches, socket: &mut UnixStream) -> ApiResu
.map_err(Error::HttpApiClient) .map_err(Error::HttpApiClient)
} }
Some("add-device") => { Some("add-device") => {
let device_config = add_device_config( let (device_config, fds) = add_device_config(
matches matches
.subcommand_matches("add-device") .subcommand_matches("add-device")
.unwrap() .unwrap()
.get_one::<String>("device_config") .get_one::<String>("device_config")
.unwrap(), .unwrap(),
)?; )?;
simple_api_command(socket, "PUT", "add-device", Some(&device_config)) simple_api_command_with_fds(socket, "PUT", "add-device", Some(&device_config), &fds)
.map_err(Error::HttpApiClient) .map_err(Error::HttpApiClient)
} }
Some("remove-device") => { Some("remove-device") => {
@@ -609,7 +609,7 @@ fn dbus_api_do_command(matches: &ArgMatches, proxy: &DBusApi1ProxyBlocking<'_>)
proxy.api_vm_resize_zone(&resize_zone) proxy.api_vm_resize_zone(&resize_zone)
} }
Some("add-device") => { Some("add-device") => {
let device_config = add_device_config( let (device_config, _fds) = add_device_config(
matches matches
.subcommand_matches("add-device") .subcommand_matches("add-device")
.unwrap() .unwrap()
@@ -835,11 +835,21 @@ fn resize_zone_config(id: &str, size: &str) -> Result<String, Error> {
Ok(serde_json::to_string(&resize_zone).unwrap()) Ok(serde_json::to_string(&resize_zone).unwrap())
} }
fn add_device_config(config: &str) -> Result<String, Error> { fn add_device_config(config: &str) -> Result<(String, Vec<i32>), Error> {
let device_config = DeviceConfig::parse(config).map_err(Error::AddDeviceConfig)?; let mut device_config = DeviceConfig::parse(config).map_err(Error::AddDeviceConfig)?;
// DeviceConfig is modified on purpose here by taking the file
// descriptor out. Keeping it and sending it over to the server side
// process would not make any sense since the file descriptor may be
// represented with different values.
let fds = device_config
.fd
.take()
.map(|fd| vec![fd])
.unwrap_or_default();
let device_config = serde_json::to_string(&device_config).unwrap(); let device_config = serde_json::to_string(&device_config).unwrap();
Ok(device_config) Ok((device_config, fds))
} }
fn add_user_device_config(config: &str) -> Result<String, Error> { fn add_user_device_config(config: &str) -> Result<String, Error> {