External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2025-01-18 10:35:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

ch-remote: allow fds to be sent along with 'restore'

Browse Source 
Enable restore command the ability to send file descriptors along with
HTTP request. This is useful when restoring a VM with explicit FDs
passed to NetConfig(s).

Signed-off-by: Purna Pavan Chandra <paekkaladevi@linux.microsoft.com>
This commit is contained in:
Purna Pavan Chandra 2024-05-02 07:07:03 +00:00 committed by Rob Bradford
parent b82f25572b
commit 555c4c41ab
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/bin/ch-remote.rs
View File

@ -445,14 +445,14 @@ fn rest_api_do_command(matches: &ArgMatches, socket: &mut UnixStream) -> ApiResu
.map_err(Error::HttpApiClient) .map_err(Error::HttpApiClient)
} }
Some("restore") => { Some("restore") => {
let restore_config = restore_config( let (restore_config, fds) = restore_config(
matches matches
.subcommand_matches("restore") .subcommand_matches("restore")
.unwrap() .unwrap()
.get_one::<String>("restore_config") .get_one::<String>("restore_config")
.unwrap(), .unwrap(),
)?; )?;
simple_api_command(socket, "PUT", "restore", Some(&restore_config)) simple_api_command_with_fds(socket, "PUT", "restore", Some(&restore_config), fds)
.map_err(Error::HttpApiClient) .map_err(Error::HttpApiClient)
} }
Some("coredump") => { Some("coredump") => {
@ -661,7 +661,7 @@ fn dbus_api_do_command(matches: &ArgMatches, proxy: &DBusApi1ProxyBlocking<'_>)
proxy.api_vm_snapshot(&snapshot_config) proxy.api_vm_snapshot(&snapshot_config)
} }
Some("restore") => { Some("restore") => {
let restore_config = restore_config( let (restore_config, _fds) = restore_config(
matches matches
.subcommand_matches("restore") .subcommand_matches("restore")
.unwrap() .unwrap()
@ -849,11 +849,20 @@ fn snapshot_config(url: &str) -> String {
serde_json::to_string(&snapshot_config).unwrap() serde_json::to_string(&snapshot_config).unwrap()
} }
fn restore_config(config: &str) -> Result<String, Error> { fn restore_config(config: &str) -> Result<(String, Vec<i32>), Error> {
let restore_config = vmm::config::RestoreConfig::parse(config).map_err(Error::Restore)?; let mut restore_config = vmm::config::RestoreConfig::parse(config).map_err(Error::Restore)?;
// RestoreConfig is modified on purpose to take out the file descriptors.
// These fds are passed to the server side process via SCM_RIGHTS
let fds = match &mut restore_config.net_fds {
Some(net_fds) => net_fds
.iter_mut()
.flat_map(|net| net.fds.take().unwrap_or_default())
.collect(),
None => Vec::new(),
};
let restore_config = serde_json::to_string(&restore_config).unwrap(); let restore_config = serde_json::to_string(&restore_config).unwrap();
Ok(restore_config) Ok((restore_config, fds))
} }
fn coredump_config(destination_url: &str) -> String { fn coredump_config(destination_url: &str) -> String {